diff options
| author | Jason Macnak <natsu@google.com> | 2022-04-08 11:55:33 -0700 |
|---|---|---|
| committer | Jason Macnak <natsu@google.com> | 2022-04-08 11:55:33 -0700 |
| commit | db8824d8e012fa261379b7cda4e6f64e1013df85 (patch) | |
| tree | 3cbe0920dfd3a969b56422e0cf64fa81575941e1 | |
| parent | 84b9c0a94fec4c0c9df35167747dede544062bb8 (diff) | |
| download | crosvm-db8824d8e012fa261379b7cda4e6f64e1013df85.tar.gz | |
ANDROID: move virtio pci devices back to `MmioType::High`
... to fix running Cuttlefish with Gfxstream which attempts to map
existing allocations (virtio gpu blobs) into the guest space and
external/crosvm/vm_control/src/lib.rs 's
VmMemoryDestination::ExistingAllocation seems to expect the alloc
comes to use `mmio_allocator(MmioType::High)` (line 333).
This is partial revert of aosp/2051769
Bug: b/228607013
Test: cvd start --gpu_mode=gfxstream
Change-Id: I97c50a6d7425ce81ed1ce8d34787fde4c62179c0
| -rw-r--r-- | devices/src/virtio/virtio_pci_device.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/devices/src/virtio/virtio_pci_device.rs b/devices/src/virtio/virtio_pci_device.rs index ea9206d71..a8f73f161 100644 --- a/devices/src/virtio/virtio_pci_device.rs +++ b/devices/src/virtio/virtio_pci_device.rs @@ -600,7 +600,7 @@ impl PciDevice for VirtioPciDevice { let mut ranges: Vec<BarRange> = Vec::new(); for config in self.device.get_device_bars(address) { let device_addr = resources - .mmio_allocator_any() + .mmio_allocator(MmioType::High) .allocate_with_align( config.size(), Alloc::PciBar { |