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 /devices/src/virtio/virtio_pci_device.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 'devices/src/virtio/virtio_pci_device.rs')
| -rw-r--r-- | devices/src/virtio/virtio_pci_device.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/devices/src/virtio/virtio_pci_device.rs b/devices/src/virtio/virtio_pci_device.rs index bd94fe3..cbe56a2 100644 --- a/devices/src/virtio/virtio_pci_device.rs +++ b/devices/src/virtio/virtio_pci_device.rs @@ -384,7 +384,7 @@ impl PciDevice for VirtioPciDevice { // Allocate one bar for the structures pointed to by the capability structures. let mut ranges = Vec::new(); let settings_config_addr = resources - .mmio_allocator(MmioType::Mmio) + .mmio_allocator(MmioType::Low) .allocate_with_align( CAPABILITY_BAR_SIZE, Alloc::PciBar { bus, dev, bar: 0 }, @@ -422,7 +422,7 @@ impl PciDevice for VirtioPciDevice { let mut ranges = Vec::new(); for config in self.device.get_device_bars(bus, dev) { let device_addr = resources - .mmio_allocator(MmioType::Device) + .mmio_allocator(MmioType::High) .allocate_with_align( config.get_size(), Alloc::PciBar { |