diff options
| author | Xiong Zhang <xiong.y.zhang@intel.corp-partner.google.com> | 2019-10-30 14:59:26 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-11-10 06:39:34 +0000 |
| commit | 383b3b520a76a921be17a12640b24fba1419dbbb (patch) | |
| tree | 1aea1553c2534aab73b265929cf462c0d8999a67 /vm_control/src/lib.rs | |
| parent | 87a3b44d9e6caa82ab521a5dd9bafdb56e8b6ed1 (diff) | |
| download | crosvm-383b3b520a76a921be17a12640b24fba1419dbbb.tar crosvm-383b3b520a76a921be17a12640b24fba1419dbbb.tar.gz crosvm-383b3b520a76a921be17a12640b24fba1419dbbb.tar.bz2 crosvm-383b3b520a76a921be17a12640b24fba1419dbbb.tar.lz crosvm-383b3b520a76a921be17a12640b24fba1419dbbb.tar.xz crosvm-383b3b520a76a921be17a12640b24fba1419dbbb.tar.zst crosvm-383b3b520a76a921be17a12640b24fba1419dbbb.zip | |
resource: Rename device memory to mmio
Since unified allocator is used to allocate mmio, this patch remove the device memory name, and rename device to mmio. BUG=chromium:992270 TEST=this patch doesn't change function, run build_test Change-Id: I234b0db4b3c5de8cfee372ace5212a980564d0c7 Signed-off-by: Xiong Zhang <xiong.y.zhang@intel.corp-partner.google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1895234 Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Diffstat (limited to 'vm_control/src/lib.rs')
| -rw-r--r-- | vm_control/src/lib.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vm_control/src/lib.rs b/vm_control/src/lib.rs index 71bb193..eccee10 100644 --- a/vm_control/src/lib.rs +++ b/vm_control/src/lib.rs @@ -228,7 +228,7 @@ impl VmMemoryRequest { Err(e) => VmMemoryResponse::Err(e), } } - UnregisterMemory(slot) => match vm.remove_device_memory(slot) { + UnregisterMemory(slot) => match vm.remove_mmio_memory(slot) { Ok(_) => VmMemoryResponse::Ok, Err(e) => VmMemoryResponse::Err(e), }, @@ -404,7 +404,7 @@ fn register_memory( let addr = match allocation { Some((Alloc::PciBar { bus, dev, bar }, address)) => { match allocator - .mmio_allocator(MmioType::Device) + .mmio_allocator(MmioType::High) .get(&Alloc::PciBar { bus, dev, bar }) { Some((start_addr, length, _)) => { @@ -420,7 +420,7 @@ fn register_memory( } None => { let alloc = allocator.get_anon_alloc(); - match allocator.mmio_allocator(MmioType::Device).allocate( + match allocator.mmio_allocator(MmioType::High).allocate( size as u64, alloc, "vmcontrol_register_memory".to_string(), @@ -432,7 +432,7 @@ fn register_memory( _ => return Err(SysError::new(EINVAL)), }; - let slot = match vm.add_device_memory(GuestAddress(addr), mmap, false, false) { + let slot = match vm.add_mmio_memory(GuestAddress(addr), mmap, false, false) { Ok(v) => v, Err(e) => return Err(e), }; |