diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-06-14 11:25:18 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-06-14 11:25:18 +0000 |
commit | b7966a9d2e768533acac0f37bdeb293c256109d3 (patch) | |
tree | 357a365ecc99e4bec214d084352e316769f70041 /src/plugin | |
parent | 1e318da5b57c12f67bed3b528100dbe4ec287ac5 (diff) | |
parent | d42d3fec7a9535b664b89d30fd48c90feda59957 (diff) | |
download | crosvm-b7966a9d2e768533acac0f37bdeb293c256109d3.tar crosvm-b7966a9d2e768533acac0f37bdeb293c256109d3.tar.gz crosvm-b7966a9d2e768533acac0f37bdeb293c256109d3.tar.bz2 crosvm-b7966a9d2e768533acac0f37bdeb293c256109d3.tar.lz crosvm-b7966a9d2e768533acac0f37bdeb293c256109d3.tar.xz crosvm-b7966a9d2e768533acac0f37bdeb293c256109d3.tar.zst crosvm-b7966a9d2e768533acac0f37bdeb293c256109d3.zip |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/plugin')
-rw-r--r-- | src/plugin/mod.rs | 2 | ||||
-rw-r--r-- | src/plugin/process.rs | 3 |
2 files changed, 3 insertions, 2 deletions
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, |