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

device_manager: avoid manipulating MemoryRegion fields directly

Browse Source 
Hyper-V may have different field names. Use make_user_memory_region
instead.

No functional change.

Signed-off-by: Wei Liu <liuwe@microsoft.com>
This commit is contained in:
Wei Liu 2020-07-16 10:47:02 +00:00 committed by Sebastien Boeuf
parent dfd6f3471d
commit c08d2b2c70
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vmm/src/device_manager.rs
View File

@ -601,7 +601,7 @@ impl DeviceRelocation for AddressManager {
if let Some(mut shm_regions) = virtio_dev.get_shm_regions() { if let Some(mut shm_regions) = virtio_dev.get_shm_regions() {
if shm_regions.addr.raw_value() == old_base { if shm_regions.addr.raw_value() == old_base {
// Remove old region from KVM by passing a size of 0. // Remove old region from KVM by passing a size of 0.
let mut mem_region = self.vm.make_user_memory_region( let mem_region = self.vm.make_user_memory_region(
shm_regions.mem_slot, shm_regions.mem_slot,
old_base, old_base,
0, 0,
@ -617,8 +617,13 @@ impl DeviceRelocation for AddressManager {
})?; })?;
// Create new mapping by inserting new region to KVM. // Create new mapping by inserting new region to KVM.
mem_region.guest_phys_addr = new_base; let mem_region = self.vm.make_user_memory_region(
mem_region.memory_size = shm_regions.len; shm_regions.mem_slot,
new_base,
shm_regions.len,
shm_regions.host_addr,
false,
);
self.vm.set_user_memory_region(mem_region).map_err(|e| { self.vm.set_user_memory_region(mem_region).map_err(|e| {
io::Error::new( io::Error::new(