Merge branch 'main' into hotplug

Author: ShadowCurse

Cargo.lock

@@ -15,7 +15,7 @@ tracing = ["log-instrument", "vmm/tracing"]
 [dependencies]
 clap = { version = "4.6.1", features = ["derive", "string"] }
 displaydoc = "0.2.5"
-libc = "0.2.185"
+libc = "0.2.186"
 log-instrument = { path = "../log-instrument", optional = true }
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.149"

src/cpu-template-helper/Cargo.toml

@@ -23,7 +23,7 @@ gdb = ["vmm/gdb"]
 [dependencies]
 displaydoc = "0.2.5"
 event-manager = "0.4.2"
-libc = "0.2.185"
+libc = "0.2.186"
 log-instrument = { path = "../log-instrument", optional = true }
 micro_http = { git = "https://github.com/firecracker-microvm/micro-http" }
 serde = { version = "1.0.228", features = ["derive"] }
@@ -41,7 +41,7 @@ serde_json = "1.0.149"
 
 [dev-dependencies]
 cargo_toml = "0.22.3"
-libc = "0.2.185"
+libc = "0.2.186"
 regex = { version = "1.12.3", default-features = false, features = [
   "std",
   "unicode-perl",

src/firecracker/Cargo.toml

@@ -15,7 +15,7 @@ bench = false
 tracing = ["log-instrument", "utils/tracing"]
 
 [dependencies]
-libc = "0.2.185"
+libc = "0.2.186"
 log-instrument = { path = "../log-instrument", optional = true }
 regex = { version = "1.12.3", default-features = false, features = ["std"] }
 thiserror = "2.0.18"

src/jailer/Cargo.toml

@@ -14,7 +14,7 @@ tracing = ["log-instrument", "utils/tracing"]
 
 [dependencies]
 displaydoc = "0.2.5"
-libc = "0.2.185"
+libc = "0.2.186"
 log-instrument = { path = "../log-instrument", optional = true }
 thiserror = "2.0.18"
 vmm-sys-util = "0.15.0"

src/rebase-snap/Cargo.toml

@@ -19,7 +19,7 @@ bench = false
 bitcode = { version = "0.6.9", features = ["serde"] }
 clap = { version = "4.6.1", features = ["derive", "string"] }
 displaydoc = "0.2.5"
-libc = "0.2.185"
+libc = "0.2.186"
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.149"
 thiserror = "2.0.18"

src/seccompiler/Cargo.toml

@@ -17,7 +17,7 @@ clap = { version = "4.6.1", features = ["derive", "string"] }
 displaydoc = "0.2.5"
 
 fc_utils = { package = "utils", path = "../utils" }
-libc = "0.2.185"
+libc = "0.2.186"
 log-instrument = { path = "../log-instrument", optional = true }
 semver = "1.0.28"
 thiserror = "2.0.18"

src/snapshot-editor/Cargo.toml

@@ -13,7 +13,7 @@ tracing = ["log-instrument"]
 
 [dependencies]
 displaydoc = "0.2.5"
-libc = "0.2.185"
+libc = "0.2.186"
 log-instrument = { path = "../log-instrument", optional = true }
 thiserror = "2.0.18"
 

src/utils/Cargo.toml

@@ -35,7 +35,7 @@ gdbstub = { version = "0.7.10", optional = true }
 gdbstub_arch = { version = "0.3.3", optional = true }
 kvm-bindings = { version = "0.14.0", features = ["fam-wrappers", "serde"] }
 kvm-ioctls = "0.24.0"
-libc = "0.2.185"
+libc = "0.2.186"
 linux-loader = "0.13.2"
 log = { version = "0.4.29", features = ["std", "serde"] }
 log-instrument = { path = "../log-instrument", optional = true }

src/vmm/Cargo.toml

@@ -93,11 +93,12 @@ impl PciDevices {
 
         debug!(
             "Inserting MMIO BAR region: {:#x}:{:#x}",
-            virtio_device_locked.bar_address, CAPABILITY_BAR_SIZE
+            virtio_device_locked.config_bar_addr(),
+            CAPABILITY_BAR_SIZE
         );
         vm.common.mmio_bus.insert(
             virtio_device.clone(),
-            virtio_device_locked.bar_address,
+            virtio_device_locked.config_bar_addr(),
             CAPABILITY_BAR_SIZE,
         )?;