Merge "always add swiotlb size to memory size for protected VMs" into main
diff --git a/libs/hypervisor_props/src/lib.rs b/libs/hypervisor_props/src/lib.rs
index 6665bc5..14614fd 100644
--- a/libs/hypervisor_props/src/lib.rs
+++ b/libs/hypervisor_props/src/lib.rs
@@ -37,8 +37,3 @@
pub fn version() -> Result<Option<String>> {
Ok(hypervisorproperties::hypervisor_version()?)
}
-
-/// Returns if the hypervisor is pKVM
-pub fn is_pkvm() -> Result<bool> {
- Ok(version()?.unwrap_or_default().starts_with("kvm") && is_protected_vm_supported()?)
-}
diff --git a/virtualizationmanager/src/crosvm.rs b/virtualizationmanager/src/crosvm.rs
index 4787abc..852d7de 100644
--- a/virtualizationmanager/src/crosvm.rs
+++ b/virtualizationmanager/src/crosvm.rs
@@ -934,11 +934,8 @@
let swiotlb_size_mib = 2 * virtio_pci_device_count as u32;
command.arg("--swiotlb").arg(swiotlb_size_mib.to_string());
- // b/346770542 for consistent "usable" memory across protected and non-protected VMs under
- // pKVM.
- if hypervisor_props::is_pkvm()? {
- memory_mib = memory_mib.map(|m| m.saturating_add(swiotlb_size_mib));
- }
+ // b/346770542 for consistent "usable" memory across protected and non-protected VMs.
+ memory_mib = memory_mib.map(|m| m.saturating_add(swiotlb_size_mib));
// Workaround to keep crash_dump from trying to read protected guest memory.
// Context in b/238324526.