diff --git a/vmm/src/device_manager.rs b/vmm/src/device_manager.rs index fce8cb231..7e12b5aaa 100644 --- a/vmm/src/device_manager.rs +++ b/vmm/src/device_manager.rs @@ -590,7 +590,7 @@ impl DeviceRelocation for AddressManager { if let Some(mut shm_regions) = virtio_dev.get_shm_regions() { if shm_regions.addr.raw_value() == old_base { // Remove old region from KVM by passing a size of 0. - let mut mem_region = hypervisor::kvm::kvm_userspace_memory_region { + let mut mem_region = hypervisor::MemoryRegion { slot: shm_regions.mem_slot, guest_phys_addr: old_base, memory_size: 0, diff --git a/vmm/src/memory_manager.rs b/vmm/src/memory_manager.rs index 14b1bb95e..5e59b4956 100644 --- a/vmm/src/memory_manager.rs +++ b/vmm/src/memory_manager.rs @@ -13,8 +13,6 @@ use arch::{get_host_cpu_phys_bits, layout, RegionType}; use devices::ioapic; use devices::BusDevice; -use hypervisor::kvm::{kvm_userspace_memory_region, KVM_MEM_READONLY}; - use std::convert::TryInto; use std::ffi; use std::fs::{File, OpenOptions}; @@ -678,12 +676,16 @@ impl MemoryManager { readonly: bool, ) -> Result { let slot = self.allocate_kvm_memory_slot(); - let mem_region = kvm_userspace_memory_region { + let mem_region = hypervisor::MemoryRegion { slot, guest_phys_addr, memory_size, userspace_addr, - flags: if readonly { KVM_MEM_READONLY } else { 0 }, + flags: if readonly { + hypervisor::kvm::KVM_MEM_READONLY + } else { + 0 + }, }; self.fd @@ -731,7 +733,7 @@ impl MemoryManager { mergeable: bool, slot: u32, ) -> Result<(), Error> { - let mem_region = kvm_userspace_memory_region { + let mem_region = hypervisor::MemoryRegion { slot, guest_phys_addr, memory_size: 0, diff --git a/vmm/src/vm.rs b/vmm/src/vm.rs index a7cd204d8..a0d2cbf5c 100644 --- a/vmm/src/vm.rs +++ b/vmm/src/vm.rs @@ -1451,7 +1451,7 @@ pub fn test_vm() { let vm_fd = hv.create_vm().expect("new VM fd creation failed"); mem.with_regions(|index, region| { - let mem_region = hypervisor::kvm_userspace_memory_region { + let mem_region = hypervisor::MemoryRegion { slot: index as u32, guest_phys_addr: region.start_addr().raw_value(), memory_size: region.len() as u64,