kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: Make sev_snp depend on igvm

Browse Source 
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>
This commit is contained in:
Ruben Hakobyan
2026-06-10 08:19:52 -07:00
committed by Rob Bradford
parent 57b02c765f
commit e9b47ebacd
2 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vmm/Cargo.toml
+1 -1
View File
@@ -35,7 +35,7 @@ pvmemcontrol = ["devices/pvmemcontrol"]
sev_snp = [ sev_snp = [
"arch/sev_snp", "arch/sev_snp",
"hypervisor/sev_snp", "hypervisor/sev_snp",
"igvm_defs", "igvm",
"virtio-devices/sev_snp", "virtio-devices/sev_snp",
] ]
tdx = ["arch/tdx", "hypervisor/tdx"] tdx = ["arch/tdx", "hypervisor/tdx"]
vmm/src/vm.rs
+3 -14
View File
@@ -928,7 +928,6 @@ impl Vm {
console_resize_pipe, console_resize_pipe,
original_termios, original_termios,
snapshot, snapshot,
#[cfg(feature = "igvm")]
igvm_file, igvm_file,
); );
} }
@@ -1007,7 +1006,7 @@ impl Vm {
console_resize_pipe: Option<&Arc<File>>, console_resize_pipe: Option<&Arc<File>>,
original_termios: &Arc<Mutex<Option<termios>>>, original_termios: &Arc<Mutex<Option<termios>>>,
snapshot: Option<&Snapshot>, snapshot: Option<&Snapshot>,
#[cfg(feature = "igvm")] igvm_file: Option<IgvmFile>, igvm_file: Option<IgvmFile>,
) -> Result<Option<thread::JoinHandle<Result<EntryPoint>>>> { ) -> Result<Option<thread::JoinHandle<Result<EntryPoint>>>> {
// Create boot vCPUs before SEV-SNP initialization // Create boot vCPUs before SEV-SNP initialization
cpu_manager cpu_manager
@@ -1017,27 +1016,17 @@ impl Vm {
.map_err(Error::CpuManager)?; .map_err(Error::CpuManager)?;
// Extract guest policy from IGVM if available, otherwise use default. // Extract guest policy from IGVM if available, otherwise use default.
#[cfg(feature = "igvm")]
let guest_policy = igvm_file let guest_policy = igvm_file
.as_ref() .as_ref()
.and_then(igvm_loader::extract_guest_policy) .and_then(igvm_loader::extract_guest_policy)
.unwrap_or_else(Self::get_default_sev_snp_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) vm.sev_snp_init(guest_policy)
.map_err(Error::InitializeSevSnpVm)?; .map_err(Error::InitializeSevSnpVm)?;
// Load payload for SEV-SNP (IGVM parser needs cpu_manager for cpuid) // Load payload for SEV-SNP (IGVM parser needs cpu_manager for cpuid)
let load_payload_handle = if snapshot.is_none() { let load_payload_handle = if snapshot.is_none() {
Self::load_payload_async( Self::load_payload_async(memory_manager, config, cpu_manager, igvm_file)?
memory_manager,
config,
#[cfg(feature = "igvm")]
cpu_manager,
#[cfg(feature = "igvm")]
igvm_file,
)?
} else { } else {
None None
}; };
@@ -1382,7 +1371,7 @@ impl Vm {
#[allow(unused_mut)] #[allow(unused_mut)]
let mut hv_config: hypervisor::HypervisorVmConfig = let mut hv_config: hypervisor::HypervisorVmConfig =
vm_config.as_ref().lock().unwrap().deref().into(); 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 { if let Some(ref igvm) = igvm_file {
hv_config.vmsa_features = igvm_loader::extract_sev_features(igvm); hv_config.vmsa_features = igvm_loader::extract_sev_features(igvm);
} }