External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-10-01 11:05:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: memory_manager: Only send the GED notification for the ACPI method

Browse Source 
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz 2020-03-23 08:20:15 +01:00 committed by Sebastien Boeuf
parent 15d9ec0149
commit 41d7b3a387
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vmm/src/memory_manager.rs
View File

@ -527,23 +527,24 @@ impl MemoryManager {
} }
pub fn resize(&mut self, desired_ram: u64) -> Result<bool, Error> { pub fn resize(&mut self, desired_ram: u64) -> Result<bool, Error> {
let mut notify_hotplug = false; let mut resized = false;
match self.hotplug_method { match self.hotplug_method {
HotplugMethod::VirtioMem => { HotplugMethod::VirtioMem => {
if desired_ram >= self.boot_ram { if desired_ram >= self.boot_ram {
self.virtiomem_resize(desired_ram - self.boot_ram)?; self.virtiomem_resize(desired_ram - self.boot_ram)?;
self.current_ram = desired_ram; self.current_ram = desired_ram;
resized = true;
} }
} }
HotplugMethod::Acpi => { HotplugMethod::Acpi => {
if desired_ram >= self.current_ram { if desired_ram >= self.current_ram {
self.hotplug_ram_region((desired_ram - self.current_ram) as usize)?; self.hotplug_ram_region((desired_ram - self.current_ram) as usize)?;
self.current_ram = desired_ram; self.current_ram = desired_ram;
notify_hotplug = true resized = true;
} }
} }
} }
Ok(notify_hotplug) Ok(resized)
} }
} }

8
vmm/src/vm.rs
View File

@ -26,7 +26,7 @@ extern crate vm_allocator;
extern crate vm_memory; extern crate vm_memory;
extern crate vm_virtio; extern crate vm_virtio;
use crate::config::{DeviceConfig, DiskConfig, PmemConfig, VmConfig}; use crate::config::{DeviceConfig, DiskConfig, HotplugMethod, PmemConfig, VmConfig};
use crate::cpu; use crate::cpu;
use crate::device_manager::{get_win_size, Console, DeviceManager, DeviceManagerError}; use crate::device_manager::{get_win_size, Console, DeviceManager, DeviceManagerError};
use crate::memory_manager::{get_host_cpu_phys_bits, Error as MemoryManagerError, MemoryManager}; use crate::memory_manager::{get_host_cpu_phys_bits, Error as MemoryManagerError, MemoryManager};
@ -563,12 +563,18 @@ impl Vm {
.update_memory() .update_memory()
.map_err(Error::DeviceManager)?; .map_err(Error::DeviceManager)?;
let memory_config = &self.config.lock().unwrap().memory;
match memory_config.hotplug_method {
HotplugMethod::Acpi => {
self.device_manager self.device_manager
.lock() .lock()
.unwrap() .unwrap()
.notify_hotplug(HotPlugNotificationFlags::MEMORY_DEVICES_CHANGED) .notify_hotplug(HotPlugNotificationFlags::MEMORY_DEVICES_CHANGED)
.map_err(Error::DeviceManager)?; .map_err(Error::DeviceManager)?;
} }
HotplugMethod::VirtioMem => {}
}
}
// We update the VM config regardless of the actual guest resize operation // We update the VM config regardless of the actual guest resize operation
// result (true or false, happened or not), so that if the VM reboots it // result (true or false, happened or not), so that if the VM reboots it