Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 2dab5e8

Browse files
committed
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 <bchalios@amazon.es>
1 parent 13879c6 commit 2dab5e8

File tree

26 files changed

+66
-334
lines changed

26 files changed

+66
-334
lines changed

‎Cargo.lock‎

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/vm-device/Cargo.toml‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

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

Lines changed: 0 additions & 194 deletions
This file was deleted.

‎src/vm-device/src/lib.rs‎

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎src/vmm/Cargo.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ utils = { path = "../utils" }
5353
uuid = "1.18.1"
5454
vhost = { version = "0.14.0", features = ["vhost-user-frontend"] }
5555
vm-allocator = { version = "0.1.3", features = ["serde"] }
56-
vm-device = { path = "../vm-device" }
5756
vm-memory = { version = "0.16.2", features = [
5857
"backend-mmap",
5958
"backend-bitmap",

‎src/vmm/src/arch/aarch64/vcpu.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ use crate::cpu_config::aarch64::custom_cpu_template::VcpuFeatures;
2323
use crate::cpu_config::templates::CpuConfiguration;
2424
use crate::logger::{IncMetric, METRICS, error};
2525
use crate::vcpu::{VcpuConfig, VcpuError};
26+
use crate::vstate::bus::Bus;
2627
use crate::vstate::memory::{Address, GuestMemoryMmap};
2728
use crate::vstate::vcpu::VcpuEmulation;
2829
use crate::vstate::vm::Vm;
@@ -120,7 +121,7 @@ pub struct KvmVcpu {
120121
#[derive(Default, Debug)]
121122
pub struct Peripherals {
122123
/// mmio bus.
123-
pub mmio_bus: Option<Arc<vm_device::Bus>>,
124+
pub mmio_bus: Option<Arc<Bus>>,
124125
}
125126

126127
impl KvmVcpu {

‎src/vmm/src/arch/x86_64/vcpu.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ use crate::arch::x86_64::msr::{MsrError, create_boot_msr_entries};
2525
use crate::arch::x86_64::regs::{SetupFpuError, SetupRegistersError, SetupSpecialRegistersError};
2626
use crate::cpu_config::x86_64::{CpuConfiguration, cpuid};
2727
use crate::logger::{IncMetric, METRICS};
28+
use crate::vstate::bus::Bus;
2829
use crate::vstate::memory::GuestMemoryMmap;
2930
use crate::vstate::vcpu::{VcpuConfig, VcpuEmulation, VcpuError};
3031
use crate::vstate::vm::Vm;
@@ -160,9 +161,9 @@ pub struct KvmVcpu {
160161
#[derive(Default, Debug)]
161162
pub struct Peripherals {
162163
/// Pio bus.
163-
pub pio_bus: Option<Arc<vm_device::Bus>>,
164+
pub pio_bus: Option<Arc<Bus>>,
164165
/// Mmio bus.
165-
pub mmio_bus: Option<Arc<vm_device::Bus>>,
166+
pub mmio_bus: Option<Arc<Bus>>,
166167
}
167168

168169
impl KvmVcpu {
@@ -267,7 +268,7 @@ impl KvmVcpu {
267268
}
268269

269270
/// Sets a Port Mapped IO bus for this vcpu.
270-
pub fn set_pio_bus(&mut self, pio_bus: Arc<vm_device::Bus>) {
271+
pub fn set_pio_bus(&mut self, pio_bus: Arc<Bus>) {
271272
self.peripherals.pio_bus = Some(pio_bus);
272273
}
273274

‎src/vmm/src/arch/x86_64/vm.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ use serde::{Deserialize, Serialize};
1414
use crate::arch::x86_64::msr::MsrError;
1515
use crate::snapshot::Persist;
1616
use crate::utils::u64_to_usize;
17+
use crate::vstate::bus::Bus;
1718
use crate::vstate::memory::{GuestMemoryExtension, GuestMemoryState};
1819
use crate::vstate::resources::ResourceAllocator;
1920
use crate::vstate::vm::{VmCommon, VmError};
@@ -60,7 +61,7 @@ pub struct ArchVm {
6061
/// `None` if `KVM_CAP_XSAVE2` not supported.
6162
xsave2_size: Option<usize>,
6263
/// Port IO bus
63-
pub pio_bus: Arc<vm_device::Bus>,
64+
pub pio_bus: Arc<Bus>,
6465
}
6566

6667
impl ArchVm {
@@ -95,7 +96,7 @@ impl ArchVm {
9596
.set_tss_address(u64_to_usize(crate::arch::x86_64::layout::KVM_TSS_ADDRESS))
9697
.map_err(ArchVmError::SetTssAddress)?;
9798

98-
let pio_bus = Arc::new(vm_device::Bus::new());
99+
let pio_bus = Arc::new(Bus::new());
99100

100101
Ok(ArchVm {
101102
common,

‎src/vmm/src/device_manager/legacy.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@ use vmm_sys_util::eventfd::EventFd;
1818
use crate::Vm;
1919
use crate::devices::legacy::serial::SerialOut;
2020
use crate::devices::legacy::{EventFdTrigger, I8042Device, SerialDevice, SerialEventsWrapper};
21+
use crate::vstate::bus::BusError;
2122

2223
/// Errors corresponding to the `PortIODeviceManager`.
2324
#[derive(Debug, derive_more::From, thiserror::Error, displaydoc::Display)]
2425
pub enum LegacyDeviceError {
2526
/// Failed to add legacy device to Bus: {0}
26-
BusError(vm_device::BusError),
27+
BusError(BusError),
2728
/// Failed to create EventFd: {0}
2829
EventFd(std::io::Error),
2930
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /