diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/linux.rs | 4 | ||||
-rw-r--r-- | src/plugin/mod.rs | 2 | ||||
-rw-r--r-- | src/plugin/process.rs | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/linux.rs b/src/linux.rs index 3e2045f..ec2067c 100644 --- a/src/linux.rs +++ b/src/linux.rs @@ -1012,9 +1012,9 @@ fn create_pmem_device( .map_err(Error::AllocatePmemDeviceAddress)?; let slot = vm - .add_mmap_arena( + .add_memory_region( GuestAddress(mapping_address), - arena, + Box::new(arena), /* read_only = */ disk.read_only, /* log_dirty_pages = */ false, ) diff --git a/src/plugin/mod.rs b/src/plugin/mod.rs index 470d5f0..28a43f7 100644 --- a/src/plugin/mod.rs +++ b/src/plugin/mod.rs @@ -384,7 +384,7 @@ impl PluginObject { 8 => vm.unregister_ioevent(&evt, addr, Datamatch::U64(Some(datamatch as u64))), _ => Err(SysError::new(EINVAL)), }, - PluginObject::Memory { slot, .. } => vm.remove_mmio_memory(slot).and(Ok(())), + PluginObject::Memory { slot, .. } => vm.remove_memory_region(slot).and(Ok(())), PluginObject::IrqEvent { irq_id, evt } => vm.unregister_irqfd(&evt, irq_id), } } diff --git a/src/plugin/process.rs b/src/plugin/process.rs index 688aa85..f48c1d0 100644 --- a/src/plugin/process.rs +++ b/src/plugin/process.rs @@ -361,7 +361,8 @@ impl Process { } let mem = MemoryMapping::from_fd_offset(&shm, length as usize, offset) .map_err(mmap_to_sys_err)?; - let slot = vm.add_mmio_memory(GuestAddress(start), mem, read_only, dirty_log)?; + let slot = + vm.add_memory_region(GuestAddress(start), Box::new(mem), read_only, dirty_log)?; entry.insert(PluginObject::Memory { slot, length: length as usize, |