Create ACPI CPU information from IGVM parameters

Signed-off-by: Jon Lange <jlange@microsoft.com>
coconut-svsm · Dec 4, 2023 · f678413 · f678413
1 parent 3f4e345
commit f678413
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/config.rs b/src/config.rs
@@ -54,7 +54,7 @@ impl<'a> SvsmConfig<'a> {
     pub fn load_cpu_info(&self) -> Result<Vec<ACPICPUInfo>, SvsmError> {
         match self {
             SvsmConfig::FirmwareConfig(fw_cfg) => load_acpi_cpu_info(fw_cfg),
-            &SvsmConfig::IgvmConfig(_) => todo!(),
+            SvsmConfig::IgvmConfig(igvm_params) => igvm_params.load_cpu_info(),
         }
     }
     pub fn should_launch_fw(&self) -> bool {

diff --git a/src/igvm_params.rs b/src/igvm_params.rs
@@ -6,6 +6,7 @@
 
 extern crate alloc;
 
+use crate::acpi::tables::ACPICPUInfo;
 use crate::address::{PhysAddr, VirtAddr};
 use crate::error::SvsmError;
 use crate::error::SvsmError::Firmware;
@@ -112,4 +113,16 @@ impl IgvmParams<'_> {
 
         Ok(regions)
     }
+
+    pub fn load_cpu_info(&self) -> Result<Vec<ACPICPUInfo>, SvsmError> {
+        let mut cpus: Vec<ACPICPUInfo> = Vec::new();
+        for i in 0..self.igvm_param_page.cpu_count {
+            let cpu = ACPICPUInfo {
+                apic_id: i,
+                enabled: true,
+            };
+            cpus.push(cpu);
+        }
+        Ok(cpus)
+    }
 }