refactor(pci): remove vm-device crate

We are only using the Bus-related definitions from there now. Move those
in a module under `vmm` and drop the dependency to `vm-device`.

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

Author: bchalios

Cargo.lock

@@ -53,7 +53,6 @@ utils = { path = "../utils" }
 uuid = "1.18.1"
 vhost = { version = "0.14.0", features = ["vhost-user-frontend"] }
 vm-allocator = { version = "0.1.3", features = ["serde"] }
-vm-device = { path = "../vm-device" }
 vm-memory = { version = "0.16.2", features = [
   "backend-mmap",
   "backend-bitmap",

src/vm-device/Cargo.toml

@@ -23,6 +23,7 @@ use crate::cpu_config::aarch64::custom_cpu_template::VcpuFeatures;
 use crate::cpu_config::templates::CpuConfiguration;
 use crate::logger::{IncMetric, METRICS, error};
 use crate::vcpu::{VcpuConfig, VcpuError};
+use crate::vstate::bus::Bus;
 use crate::vstate::memory::{Address, GuestMemoryMmap};
 use crate::vstate::vcpu::VcpuEmulation;
 use crate::vstate::vm::Vm;
@@ -120,7 +121,7 @@ pub struct KvmVcpu {
 #[derive(Default, Debug)]
 pub struct Peripherals {
     /// mmio bus.
-    pub mmio_bus: Option<Arc<vm_device::Bus>>,
+    pub mmio_bus: Option<Arc<Bus>>,
 }
 
 impl KvmVcpu {

src/vm-device/src/interrupt/mod.rs

@@ -25,6 +25,7 @@ use crate::arch::x86_64::msr::{MsrError, create_boot_msr_entries};
 use crate::arch::x86_64::regs::{SetupFpuError, SetupRegistersError, SetupSpecialRegistersError};
 use crate::cpu_config::x86_64::{CpuConfiguration, cpuid};
 use crate::logger::{IncMetric, METRICS};
+use crate::vstate::bus::Bus;
 use crate::vstate::memory::GuestMemoryMmap;
 use crate::vstate::vcpu::{VcpuConfig, VcpuEmulation, VcpuError};
 use crate::vstate::vm::Vm;
@@ -160,9 +161,9 @@ pub struct KvmVcpu {
 #[derive(Default, Debug)]
 pub struct Peripherals {
     /// Pio bus.
-    pub pio_bus: Option<Arc<vm_device::Bus>>,
+    pub pio_bus: Option<Arc<Bus>>,
     /// Mmio bus.
-    pub mmio_bus: Option<Arc<vm_device::Bus>>,
+    pub mmio_bus: Option<Arc<Bus>>,
 }
 
 impl KvmVcpu {
@@ -267,7 +268,7 @@ impl KvmVcpu {
     }
 
     /// Sets a Port Mapped IO bus for this vcpu.
-    pub fn set_pio_bus(&mut self, pio_bus: Arc<vm_device::Bus>) {
+    pub fn set_pio_bus(&mut self, pio_bus: Arc<Bus>) {
         self.peripherals.pio_bus = Some(pio_bus);
     }
 

src/vm-device/src/lib.rs

@@ -14,6 +14,7 @@ use serde::{Deserialize, Serialize};
 use crate::arch::x86_64::msr::MsrError;
 use crate::snapshot::Persist;
 use crate::utils::u64_to_usize;
+use crate::vstate::bus::Bus;
 use crate::vstate::memory::{GuestMemoryExtension, GuestMemoryState};
 use crate::vstate::resources::ResourceAllocator;
 use crate::vstate::vm::{VmCommon, VmError};
@@ -60,7 +61,7 @@ pub struct ArchVm {
     /// `None` if `KVM_CAP_XSAVE2` not supported.
     xsave2_size: Option<usize>,
     /// Port IO bus
-    pub pio_bus: Arc<vm_device::Bus>,
+    pub pio_bus: Arc<Bus>,
 }
 
 impl ArchVm {
@@ -95,7 +96,7 @@ impl ArchVm {
             .set_tss_address(u64_to_usize(crate::arch::x86_64::layout::KVM_TSS_ADDRESS))
             .map_err(ArchVmError::SetTssAddress)?;
 
-        let pio_bus = Arc::new(vm_device::Bus::new());
+        let pio_bus = Arc::new(Bus::new());
 
         Ok(ArchVm {
             common,

src/vmm/Cargo.toml

@@ -18,12 +18,13 @@ use vmm_sys_util::eventfd::EventFd;
 use crate::Vm;
 use crate::devices::legacy::serial::SerialOut;
 use crate::devices::legacy::{EventFdTrigger, I8042Device, SerialDevice, SerialEventsWrapper};
+use crate::vstate::bus::BusError;
 
 /// Errors corresponding to the `PortIODeviceManager`.
 #[derive(Debug, derive_more::From, thiserror::Error, displaydoc::Display)]
 pub enum LegacyDeviceError {
     /// Failed to add legacy device to Bus: {0}
-    BusError(vm_device::BusError),
+    BusError(BusError),
     /// Failed to create EventFd: {0}
     EventFd(std::io::Error),
 }