From da0e0f939b731d89d067fb9382bbdc05e47f4067 Mon Sep 17 00:00:00 2001 From: Tomasz Jeznach Date: Wed, 29 Apr 2020 12:58:11 -0700 Subject: devices: pci: refactor PCI devices to use PciAddress. Simple refactor of PCI device addressing to use PciAddress type providing bus:device.function number. BUG=None TEST=build_test & tast run crostini.Sanity Change-Id: I7755ad6b31aa8c882475cd8212630e1cc86ef49e Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2172766 Reviewed-by: Daniel Verkamp Tested-by: kokoro Commit-Queue: Tomasz Jeznach --- vm_control/src/lib.rs | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'vm_control/src') diff --git a/vm_control/src/lib.rs b/vm_control/src/lib.rs index 9e78be2..a8535f8 100644 --- a/vm_control/src/lib.rs +++ b/vm_control/src/lib.rs @@ -550,11 +550,23 @@ fn register_memory( }; let addr = match allocation { - Some((Alloc::PciBar { bus, dev, bar }, offset)) => { + Some(( + Alloc::PciBar { + bus, + dev, + func, + bar, + }, + offset, + )) => { match allocator .mmio_allocator(MmioType::High) - .get(&Alloc::PciBar { bus, dev, bar }) - { + .get(&Alloc::PciBar { + bus, + dev, + func, + bar, + }) { Some((start_addr, length, _)) => { let address = *start_addr + offset; let range = *start_addr..*start_addr + *length; -- cgit 1.4.1