Extend TdInfo struct to add vcpu_index field

Signed-off-by: OuyangHang33 <[email protected]>
confidential-containers · Jun 17, 2024 · f1b9358 · f1b9358
1 parent ac333c7
commit f1b9358
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/td-shim/src/bin/td-shim/td/tdx.rs b/td-shim/src/bin/td-shim/td/tdx.rs
@@ -41,7 +41,7 @@ pub fn get_num_vcpus() -> u32 {
     let td_info = tdx::tdcall_get_td_info().expect("Fail to get TDINFO");
 
     log::info!("gpaw - {:?}\n", td_info.gpaw);
-    log::info!("num_vcpus - {:?}\n", td_info.num_vcpus);
+    log::info!("num_vcpus - {:?} \n", td_info.num_vcpus);
 
     td_info.num_vcpus
 }

diff --git a/tdx-tdcall/src/tdx.rs b/tdx-tdcall/src/tdx.rs
@@ -37,7 +37,8 @@ pub struct TdInfo {
     pub attributes: u64,
     pub max_vcpus: u32,
     pub num_vcpus: u32,
-    pub rsvd: [u64; 3],
+    pub vcpu_index: u32,
+    pub rsvd: [u32; 5],
 }
 
 /// Virtualization exception information returned from TDG.VP.VEINFO.GET leaf
@@ -504,6 +505,7 @@ pub fn tdcall_get_td_info() -> Result<TdInfo, TdCallError> {
         attributes: args.rdx,
         max_vcpus: (args.r8 >> 32) as u32,
         num_vcpus: args.r8 as u32,
+        vcpu_index: args.r9 as u32,
         ..Default::default()
     };