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

vmm: memory_manager: Fix virtio-mem resize

Browse Source 
It's important to return the region covered by virtio-mem the first time
it is inserted as the device manager must update all devices with this
information.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2020-09-10 17:42:55 +02:00
parent adc59a6f15
commit 34331d3e72
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vmm/src/memory_manager.rs
View File

@ -1120,7 +1120,7 @@ impl MemoryManager {
Ok(()) Ok(())
} }
pub fn virtiomem_resize(&mut self, size: u64) -> Result<(), Error> { pub fn virtiomem_resize(&mut self, size: u64) -> Result<Option<Arc<GuestRegionMmap>>, Error> {
let virtiomem_region = let virtiomem_region =
if let Some(memory_zone) = self.memory_zones.get_mut(DEFAULT_MEMORY_ZONE) { if let Some(memory_zone) = self.memory_zones.get_mut(DEFAULT_MEMORY_ZONE) {
if let Some(resize) = &memory_zone.virtiomem_resize { if let Some(resize) = &memory_zone.virtiomem_resize {
@ -1137,11 +1137,11 @@ impl MemoryManager {
}; };
// Add the region if that's the first time we resize. // Add the region if that's the first time we resize.
if let Some(region) = virtiomem_region { if let Some(region) = virtiomem_region.clone() {
self.add_region(region) self.add_region(region)?;
} else {
Ok(())
} }
Ok(virtiomem_region)
} }
pub fn balloon_resize(&mut self, expected_ram: u64) -> Result<u64, Error> { pub fn balloon_resize(&mut self, expected_ram: u64) -> Result<u64, Error> {
@ -1178,7 +1178,7 @@ impl MemoryManager {
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)?; region = self.virtiomem_resize(desired_ram - self.boot_ram)?;
self.current_ram = desired_ram; self.current_ram = desired_ram;
} }
} }