chore: Update to kvm-bindings 0.8.0

Cargo.toml

@@ -28,6 +28,3 @@ panic = "abort"
 [profile.release]
 panic = "abort"
 lto = true
-
-[patch.crates-io]
-kvm-bindings = { git = "https://github.com/firecracker-microvm/kvm-bindings", tag = "v0.7.0-2", features = ["fam-wrappers"] }

src/cpu-template-helper/Cargo.toml

@@ -19,7 +19,7 @@ serde_json = "1.0.116"
 thiserror = "1.0.59"
 
 vmm = { path = "../vmm" }
-vmm-sys-util = "0.12.1"
+vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }
 
 [features]
 tracing = ["log-instrument", "vmm/tracing"]

src/utils/Cargo.toml

@@ -16,7 +16,7 @@ log-instrument = { path = "../log-instrument", optional = true }
 serde = { version = "1.0.198", features = ["derive"] }
 thiserror = "1.0.59"
 vm-memory = { version = "0.14.1", features = ["backend-mmap", "backend-bitmap"] }
-vmm-sys-util = "0.12.1"
+vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }
 
 [dev-dependencies]
 serde_json = "1.0.116"

src/vmm/Cargo.toml

@@ -19,8 +19,8 @@ crc64 = "2.0.0"
 derive_more = { version = "0.99.17", default-features = false, features = ["from", "display"] }
 displaydoc = "0.2.4"
 event-manager = "0.4.0"
-kvm-bindings = { version = "0.7.0", features = ["fam-wrappers"] }
-kvm-ioctls = "0.16.0"
+kvm-bindings = { version = "0.8.0", features = ["fam-wrappers", "serde"] }
+kvm-ioctls = "0.17.0"
 lazy_static = "1.4.0"
 libc = "0.2.117"
 linux-loader = "0.11.0"

src/vmm/src/vstate/vcpu/aarch64.rs

@@ -54,12 +54,19 @@ pub struct KvmVcpu {
     pub index: u8,
     /// KVM vcpu fd.
     pub fd: VcpuFd,
-    /// Mmio bus.
-    pub mmio_bus: Option<crate::devices::Bus>,
+    /// Vcpu peripherals, such as buses
+    pub(super) peripherals: Peripherals,
     mpidr: u64,
     kvi: Option<kvm_bindings::kvm_vcpu_init>,
 }
 
+/// Vcpu peripherals
+#[derive(Default, Debug)]
+pub(super) struct Peripherals {
+    /// mmio bus.
+    pub mmio_bus: Option<crate::devices::Bus>,
+}
+
 impl KvmVcpu {
     /// Constructs a new kvm vcpu with arch specific functionality.
     ///
@@ -76,7 +83,7 @@ impl KvmVcpu {
         Ok(KvmVcpu {
             index,
             fd: kvm_vcpu,
-            mmio_bus: None,
+            peripherals: Default::default(),
             mpidr: 0,
             kvi: None,
         })
@@ -222,18 +229,6 @@ impl KvmVcpu {
 
         Ok(CpuConfiguration { regs })
     }
-
-    /// Runs the vCPU in KVM context and handles the kvm exit reason.
-    ///
-    /// Returns error or enum specifying whether emulation was handled or interrupted.
-    pub fn run_arch_emulation(&self, exit: VcpuExit) -> Result<VcpuEmulation, VcpuError> {
-        METRICS.vcpu.failures.inc();
-        // TODO: Are we sure we want to finish running a vcpu upon
-        // receiving a vm exit that is not necessarily an error?
-        error!("Unexpected exit reason on vcpu run: {:?}", exit);
-        Err(VcpuError::UnhandledKvmExit(format!("{:?}", exit)))
-    }
-
     /// Initializes internal vcpufd.
     fn init_vcpu(&self, kvi: &kvm_bindings::kvm_vcpu_init) -> Result<(), KvmVcpuError> {
         self.fd.vcpu_init(kvi).map_err(KvmVcpuError::Init)?;
@@ -253,6 +248,19 @@ impl KvmVcpu {
     }
 }
 
+impl Peripherals {
+    /// Runs the vCPU in KVM context and handles the kvm exit reason.
+    ///
+    /// Returns error or enum specifying whether emulation was handled or interrupted.
+    pub fn run_arch_emulation(&self, exit: VcpuExit) -> Result<VcpuEmulation, VcpuError> {
+        METRICS.vcpu.failures.inc();
+        // TODO: Are we sure we want to finish running a vcpu upon
+        // receiving a vm exit that is not necessarily an error?
+        error!("Unexpected exit reason on vcpu run: {:?}", exit);
+        Err(VcpuError::UnhandledKvmExit(format!("{:?}", exit)))
+    }
+}
+
 /// Structure holding VCPU kvm state.
 #[derive(Default, Clone, Serialize, Deserialize)]
 pub struct VcpuState {