kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm, hypervisor: introduce and use make_user_memory_region

Browse Source 
This removes the last KVM-ism from memory_manager. Also make use of that
method in other places.

Signed-off-by: Wei Liu <liuwe@microsoft.com>
This commit is contained in:
Wei Liu
2020-07-04 11:38:17 +00:00
committed by Samuel Ortiz
parent 8d97d628c3
commit cfa758fbb1
5 changed files with 49 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
vmm/src/memory_manager.rs
View File

@@ -676,17 +676,13 @@ impl MemoryManager {
readonly: bool,
) -> Result<u32, Error> {
let slot = self.allocate_memory_slot();
let mem_region = hypervisor::MemoryRegion {
let mem_region = self.vm.make_user_memory_region(
slot,
guest_phys_addr,
memory_size,
userspace_addr,
flags: if readonly {
hypervisor::kvm::KVM_MEM_READONLY
} else {
0
},
};
readonly,
);
self.vm
.set_user_memory_region(mem_region)
@@ -733,13 +729,13 @@ impl MemoryManager {
mergeable: bool,
slot: u32,
) -> Result<(), Error> {
let mem_region = hypervisor::MemoryRegion {
let mem_region = self.vm.make_user_memory_region(
slot,
guest_phys_addr,
memory_size: 0,
0, /* memory_size -- using 0 removes this slot */
userspace_addr,
flags: 0,
};
false, /* readonly -- don't care */
);
self.vm
.set_user_memory_region(mem_region)