pci: remove unused type from PciDevice::allocate_bars

Cloud Hypervisor code is passing a resource type argument in the logic
that allocates BARs for devices. `Resource` is an Enum where one of its
variants is `PciBar`. Not sure what Cloud Hypervisor uses this for, but
it seems redundant since this method is specifically used to allocate
BAR memory for devices.

We definitely don't use it, so remove it.

Signed-off-by: Babis Chalios <[email protected]>

Author: bchalios

src/pci/src/configuration.rs

@@ -10,7 +10,6 @@ use std::sync::{Arc, Mutex};
 
 use byteorder::{ByteOrder, LittleEndian};
 use serde::{Deserialize, Serialize};
-use vm_device::PciBarType;
 
 use crate::device::BarReprogrammingParams;
 use crate::MsixConfig;
@@ -443,26 +442,6 @@ pub enum PciBarRegionType {
     Memory64BitRegion = 0x04,
 }
 
-impl From<PciBarType> for PciBarRegionType {
-    fn from(type_: PciBarType) -> Self {
-        match type_ {
-            PciBarType::Io => PciBarRegionType::IoRegion,
-            PciBarType::Mmio32 => PciBarRegionType::Memory32BitRegion,
-            PciBarType::Mmio64 => PciBarRegionType::Memory64BitRegion,
-        }
-    }
-}
-
-impl From<PciBarRegionType> for PciBarType {
-    fn from(val: PciBarRegionType) -> Self {
-        match val {
-            PciBarRegionType::IoRegion => PciBarType::Io,
-            PciBarRegionType::Memory32BitRegion => PciBarType::Mmio32,
-            PciBarRegionType::Memory64BitRegion => PciBarType::Mmio64,
-        }
-    }
-}
-
 #[derive(Debug, Copy, Clone, Serialize, Deserialize)]
 pub enum PciBarPrefetchable {
     NotPrefetchable = 0,

src/pci/src/device.rs

@@ -10,7 +10,6 @@ use std::sync::{Arc, Barrier};
 use std::{io, result};
 
 use vm_allocator::AddressAllocator;
-use vm_device::Resource;
 
 use crate::configuration::{self, PciBarRegionType};
 use crate::PciBarConfiguration;
@@ -25,8 +24,6 @@ pub enum Error {
     IoRegistrationFailed(u64, configuration::Error),
     /// Expected resource not found.
     MissingResource,
-    /// Invalid resource
-    InvalidResource(Resource),
 }
 pub type Result<T> = std::result::Result<T, Error>;
 
@@ -45,7 +42,6 @@ pub trait PciDevice: Send {
         &mut self,
         _mmio32_allocator: &mut AddressAllocator,
         _mmio64_allocator: &mut AddressAllocator,
-        _resources: Option<Vec<Resource>>,
     ) -> Result<Vec<PciBarConfiguration>> {
         Ok(Vec::new())
     }

src/vmm/src/device_manager/pci_mngr.rs

@@ -143,7 +143,6 @@ impl PciDevices {
         virtio_device.allocate_bars(
             &mut resource_allocator.mmio32_memory,
             &mut resource_allocator.mmio64_memory,
-            None,
         )?;
 
         let virtio_device = Arc::new(Mutex::new(virtio_device));

src/vmm/src/devices/virtio/transport/pci/device.rs

@@ -27,7 +27,7 @@ use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use vm_allocator::{AddressAllocator, AllocPolicy, RangeInclusive};
 use vm_device::interrupt::{InterruptIndex, InterruptSourceGroup, MsiIrqGroupConfig};
-use vm_device::{BusDevice, PciBarType, Resource};
+use vm_device::{BusDevice, PciBarType};
 use vm_memory::{Address, ByteValued, GuestAddress, Le32};
 use vmm_sys_util::errno;
 use vmm_sys_util::eventfd::EventFd;
@@ -886,7 +886,6 @@ impl PciDevice for VirtioPciDevice {
         &mut self,
         mmio32_allocator: &mut AddressAllocator,
         mmio64_allocator: &mut AddressAllocator,
-        _resources: Option<Vec<Resource>>,
     ) -> std::result::Result<Vec<PciBarConfiguration>, PciDeviceError> {
         let mut bars = Vec::new();
         let device_clone = self.device.clone();