Create td-shim-interface crate for publishig

Signed-off-by: OuyangHang33 <hank.ouyang@intel.com>
OuyangHang33 · Feb 26, 2024 · 9b1947b · 9b1947b
1 parent 9b4e454
commit 9b1947b
Show file tree

Hide file tree

Showing 60 changed files with 831 additions and 194 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,6 +19,7 @@ members = [
     "tests/test-td-paging",
     "tests/test-td-payload",
     "xtask",
+    "td-shim-interface",
 ]
 
 # the profile used for debug build of `td-shim` and `td-payload`

diff --git a/sh_script/fuzzing.sh b/sh_script/fuzzing.sh
@@ -8,7 +8,7 @@ readonly script_name=${0##*/}
 
 fuzz_folder=(
     "td-loader"
-    "td-uefi-pi"
+    "td-shim-interface/src"
     "td-shim"
 )
 

diff --git a/sh_script/rudra.sh b/sh_script/rudra.sh
@@ -25,7 +25,7 @@ paths=(
     "td-paging"
     "td-payload"
     "td-shim"
-    "td-uefi-pi"
+    "td-shim-interface/src"
     "td-shim-tools"
     "tdx-tdcall"
 )

diff --git a/td-layout/Cargo.toml b/td-layout/Cargo.toml
@@ -12,7 +12,7 @@ edition = "2018"
 [dependencies]
 scroll = { version = "0.10", default-features = false, features = ["derive"]}
 log = "0.4.13"
-td-uefi-pi =  { path = "../td-uefi-pi" }
+td-shim-interface =  { path = "../td-shim-interface" }
 
 [dev-dependencies]
 memoffset = "0.6"
diff --git a/td-payload/Cargo.toml b/td-payload/Cargo.toml
@@ -23,7 +23,7 @@ serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
 spin = "0.9"
 td-logger =  { path = "../td-logger" }
 td-shim = { path = "../td-shim", default-features = false }
-td-uefi-pi =  { path = "../td-uefi-pi" }
+td-shim-interface =  { path = "../td-shim-interface" }
 td-exception =  { path = "../td-exception" }
 td-paging =  { path = "../td-paging" }
 x86 = "0.47.0"

diff --git a/td-payload/src/acpi.rs b/td-payload/src/acpi.rs
@@ -6,7 +6,7 @@ use alloc::vec::Vec;
 use scroll::Pread;
 use spin::Once;
 use td_shim::TD_ACPI_TABLE_HOB_GUID;
-use td_uefi_pi::{
+use td_shim_interface::td_uefi_pi::{
     hob as hob_lib,
     pi::hob::{GuidExtension, Header, HOB_TYPE_END_OF_HOB_LIST, HOB_TYPE_GUID_EXTENSION},
 };

diff --git a/td-payload/src/bin/example/main.rs b/td-payload/src/bin/example/main.rs
@@ -26,8 +26,8 @@ use td_payload as _;
 use td_payload::println;
 use td_shim::e820::{E820Entry, E820Type};
 use td_shim::{TD_ACPI_TABLE_HOB_GUID, TD_E820_TABLE_HOB_GUID};
-use td_uefi_pi::hob;
-use td_uefi_pi::pi;
+use td_shim_interface::td_uefi_pi::hob;
+use td_shim_interface::td_uefi_pi::pi;
 use zerocopy::FromBytes;
 
 #[macro_use]

diff --git a/td-payload/src/hob.rs b/td-payload/src/hob.rs
@@ -5,7 +5,7 @@
 use core::mem::size_of;
 use scroll::Pread;
 use spin::Once;
-use td_uefi_pi::{
+use td_shim_interface::td_uefi_pi::{
     hob::check_hob_integrity,
     pi::hob::{HandoffInfoTable, HOB_TYPE_HANDOFF},
 };

diff --git a/td-payload/src/mm/mod.rs b/td-payload/src/mm/mod.rs
@@ -11,7 +11,7 @@ use td_shim::{
     e820::{E820Entry, E820Type},
     TD_E820_TABLE_HOB_GUID,
 };
-use td_uefi_pi::{
+use td_shim_interface::td_uefi_pi::{
     hob as hob_lib,
     pi::hob::{GuidExtension, Header, HOB_TYPE_END_OF_HOB_LIST, HOB_TYPE_GUID_EXTENSION},
 };