From e9b47ebacdc8d7ce14dc8344cb7673e1205b290d Mon Sep 17 00:00:00 2001
From: Ruben Hakobyan <hruben@meta.com>
Date: Wed, 10 Jun 2026 08:19:52 -0700
Subject: [PATCH] vmm: Make sev_snp depend on igvm

Currently both kvm and mshv require an IGVM file to boot a SEV-SNP VM.
This is already configured in the top-level cloud-hypervisor
Cargo.toml where sev_snp depends on igvm.

Add a similar dependency in the vmm crate which helps simplify some of
the in-code cfg blocks by removing the ones that are within a sev_snp
cfg block.

Signed-off-by: Ruben Hakobyan <hruben@meta.com>
---
 vmm/Cargo.toml |  2 +-
 vmm/src/vm.rs  | 17 +++--------------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/vmm/Cargo.toml b/vmm/Cargo.toml
index fe5901b0e..1e4c8a61f 100644
--- a/vmm/Cargo.toml
+++ b/vmm/Cargo.toml
@@ -35,7 +35,7 @@ pvmemcontrol = ["devices/pvmemcontrol"]
 sev_snp = [
   "arch/sev_snp",
   "hypervisor/sev_snp",
-  "igvm_defs",
+  "igvm",
   "virtio-devices/sev_snp",
 ]
 tdx = ["arch/tdx", "hypervisor/tdx"]
diff --git a/vmm/src/vm.rs b/vmm/src/vm.rs
index 1cbc20a30..3843b65e1 100644
--- a/vmm/src/vm.rs
+++ b/vmm/src/vm.rs
@@ -928,7 +928,6 @@ impl Vm {
                 console_resize_pipe,
                 original_termios,
                 snapshot,
-                #[cfg(feature = "igvm")]
                 igvm_file,
             );
         }
@@ -1007,7 +1006,7 @@ impl Vm {
         console_resize_pipe: Option<&Arc<File>>,
         original_termios: &Arc<Mutex<Option<termios>>>,
         snapshot: Option<&Snapshot>,
-        #[cfg(feature = "igvm")] igvm_file: Option<IgvmFile>,
+        igvm_file: Option<IgvmFile>,
     ) -> Result<Option<thread::JoinHandle<Result<EntryPoint>>>> {
         // Create boot vCPUs before SEV-SNP initialization
         cpu_manager
@@ -1017,27 +1016,17 @@ impl Vm {
             .map_err(Error::CpuManager)?;
 
         // Extract guest policy from IGVM if available, otherwise use default.
-        #[cfg(feature = "igvm")]
         let guest_policy = igvm_file
             .as_ref()
             .and_then(igvm_loader::extract_guest_policy)
             .unwrap_or_else(Self::get_default_sev_snp_guest_policy);
-        #[cfg(not(feature = "igvm"))]
-        let guest_policy = Self::get_default_sev_snp_guest_policy();
 
         vm.sev_snp_init(guest_policy)
             .map_err(Error::InitializeSevSnpVm)?;
 
         // Load payload for SEV-SNP (IGVM parser needs cpu_manager for cpuid)
         let load_payload_handle = if snapshot.is_none() {
-            Self::load_payload_async(
-                memory_manager,
-                config,
-                #[cfg(feature = "igvm")]
-                cpu_manager,
-                #[cfg(feature = "igvm")]
-                igvm_file,
-            )?
+            Self::load_payload_async(memory_manager, config, cpu_manager, igvm_file)?
         } else {
             None
         };
@@ -1382,7 +1371,7 @@ impl Vm {
             #[allow(unused_mut)]
             let mut hv_config: hypervisor::HypervisorVmConfig =
                 vm_config.as_ref().lock().unwrap().deref().into();
-            #[cfg(all(feature = "igvm", feature = "sev_snp"))]
+            #[cfg(feature = "sev_snp")]
             if let Some(ref igvm) = igvm_file {
                 hv_config.vmsa_features = igvm_loader::extract_sev_features(igvm);
             }