External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-06-30 23:12:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: Don't error if live resizing is not possible

Browse Source 
The introduction of a error if live resizing is not possible is a
regression compared to the original behaviour where the new size would
be stored in the config and reflected in the next boot. This behaviour
was also inconsistent with the effect of resizing with no VM booted.

Instead of generating an error allow the code to go ahead and update the
config so that the new size will be available upon the reboot.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2022-03-31 14:36:37 +01:00
parent 4af04d8f49
commit 7fd76eff05
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vmm/src/cpu.rs
View File

@ -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()) {

7
vmm/src/memory_manager.rs
View File

@ -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 =