tdx-tdcall: minor cleanups

confidential-containers · Feb 5, 2022 · 5315d7f · 5315d7f
1 parent 11ed64c
commit 5315d7f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -94,7 +94,7 @@ integration-check-%:
 	cargo xcheck --target ${TOPDIR}/devtools/rustc-targets/x86_64-custom.json -p $(patsubst integration-check-%,%,$@) ${BUILD_TYPE_FLAG}
 
 integration-test-%:
-	cargo xtest --target ${TOPDIR}/devtools/rustc-targets/x86_64-custom.json -p $(patsubst integration-test-%,%,$@) ${BUILD_TYPE_FLAG}
+	cargo xtest --target ./x86_64-custom.json -p $(patsubst integration-test-%,%,$@) ${BUILD_TYPE_FLAG}
 
 integration-clean-%:
 	cargo clean --target ${TOPDIR}/devtools/rustc-targets/x86_64-custom.json -p $(patsubst integration-clean-%,%,$@) ${BUILD_TYPE_FLAG}

diff --git a/td-shim-ld/src/lib.rs b/td-shim-ld/src/lib.rs
@@ -22,10 +22,7 @@ use td_layout::metadata::*;
 use td_layout::runtime::{
     TD_PAYLOAD_BASE, TD_PAYLOAD_PARAM_BASE, TD_PAYLOAD_PARAM_SIZE, TD_PAYLOAD_SIZE,
 };
-use uefi_pi::{
-    fv::*,
-    pi::{fv::*, hob::*},
-};
+use uefi_pi::pi::fv::*;
 
 const MAX_IPL_CONTENT_SIZE: usize =
     TD_SHIM_IPL_SIZE as usize - size_of::<IplFvHeaderByte>() - size_of::<ResetVectorHeader>();

diff --git a/tdx-tdcall/.gitignore b/tdx-tdcall/.gitignore