diff --git a/vmm/src/cpu.rs b/vmm/src/cpu.rs index 44848ee93..66cde477b 100644 --- a/vmm/src/cpu.rs +++ b/vmm/src/cpu.rs @@ -122,9 +122,6 @@ pub enum Error { /// Failed to translate guest virtual address. TranslateVirtualAddress(hypervisor::HypervisorCpuError), - /// CPU hotplug/unplug not supported - ResizingNotSupported, - #[cfg(all(feature = "amx", target_arch = "x86_64"))] /// "Failed to setup AMX. AmxEnable(anyhow::Error), @@ -1134,7 +1131,7 @@ impl CpuManager { } if !self.dynamic { - return Err(Error::ResizingNotSupported); + return Ok(false); } match desired_vcpus.cmp(&self.present_vcpus()) { diff --git a/vmm/src/memory_manager.rs b/vmm/src/memory_manager.rs index 0dfbbe939..6309e55d3 100644 --- a/vmm/src/memory_manager.rs +++ b/vmm/src/memory_manager.rs @@ -307,9 +307,6 @@ pub enum Error { /// Failed to allocate MMIO address AllocateMmioAddress, - - /// Memory resizing not supported - ResizingNotSupported, } const ENABLE_FLAG: usize = 0; @@ -1618,7 +1615,7 @@ impl MemoryManager { HotplugMethod::VirtioMem => { if desired_ram >= self.boot_ram { if !self.dynamic { - return Err(Error::ResizingNotSupported); + return Ok(region); } self.virtio_mem_resize(DEFAULT_MEMORY_ZONE, desired_ram - self.boot_ram)?; @@ -1628,7 +1625,7 @@ impl MemoryManager { HotplugMethod::Acpi => { if desired_ram > self.current_ram { if !self.dynamic { - return Err(Error::ResizingNotSupported); + return Ok(region); } region =