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

build: Consolidate sev_snp feature usage

Browse Source 
Since igvm is a required feature of sev_snp and also sev_snp is x86-64
only the cfg attributes at build time can be consolidated & simplified.

Signed-off-by: Rob Bradford <rbradford@meta.com>
This commit is contained in:
Rob Bradford
2026-06-12 16:22:11 +01:00
committed by Bo Chen
parent bf3bc325e2
commit 3b9229e434
7 changed files with 29 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hypervisor/src/kvm/mod.rs
View File

@@ -576,9 +576,9 @@ pub struct KvmVm {
fd: Arc<VmFd>,
#[cfg(target_arch = "x86_64")]
msrs: Vec<MsrEntry>,
#[cfg(all(feature = "sev_snp", target_arch = "x86_64"))]
#[cfg(feature = "sev_snp")]
sev_fd: Option<x86_64::sev::SevFd>,
#[cfg(all(feature = "sev_snp", target_arch = "x86_64"))]
#[cfg(feature = "sev_snp")]
snp_guest_policy: std::sync::OnceLock<u64>,
dirty_log_slots: RwLock<HashMap<u32, KvmDirtyLogSlot>>,
memory_slots: Option<Arc<RwLock<HashMap<u32, KvmMemorySlot>>>>,
@@ -700,7 +700,7 @@ impl KvmVm {
/// let vm = hypervisor.create_vm(HypervisorVmConfig::default()).expect("new VM fd creation failed");
/// ```
impl vm::Vm for KvmVm {
#[cfg(all(feature = "sev_snp", target_arch = "x86_64"))]
#[cfg(feature = "sev_snp")]
fn sev_snp_init(&self, guest_policy: igvm_defs::SnpPolicy) -> vm::Result<()> {
self.sev_fd
.as_ref()
@@ -713,7 +713,7 @@ impl vm::Vm for KvmVm {
Ok(())
}
#[cfg(all(feature = "sev_snp", target_arch = "x86_64"))]
#[cfg(feature = "sev_snp")]
fn import_isolated_pages(
&self,
page_type: u32,
@@ -751,7 +751,7 @@ impl vm::Vm for KvmVm {
Ok(())
}
#[cfg(all(feature = "sev_snp", target_arch = "x86_64"))]
#[cfg(feature = "sev_snp")]
fn complete_isolated_import(
&self,
snp_id_block: igvm_defs::IGVM_VHS_SNP_ID_BLOCK,

5
hypervisor/src/mshv/mod.rs
View File

@@ -447,10 +447,7 @@ pub struct MshvVcpu {
#[cfg(target_arch = "x86_64")]
msrs: Vec<MsrEntry>,
vm_ops: Option<Arc<dyn vm::VmOps>>,
#[cfg_attr(
all(not(target_arch = "x86_64"), not(feature = "sev_snp")),
expect(dead_code)
)]
#[cfg_attr(not(target_arch = "x86_64"), expect(dead_code))]
vm_fd: Arc<VmFd>,
#[cfg(feature = "sev_snp")]
ghcb: Option<Ghcb>,