Merge branch 'main' into update-snapshot-docs

Author: roypat

CHANGELOG.md

@@ -122,7 +122,8 @@ and this project adheres to
   VMGenID support for microVMs running on ARM hosts with 6.1 guest kernels.
   Support for VMGenID via DeviceTree bindings exists only on mainline 6.10 Linux
   onwards. Users of Firecracker will need to backport the relevant patches on
-  top of their 6.1 kernels to make use of the feature.
+  top of their 6.1 kernels to make use of the feature. As a result, Firecracker
+  snapshot version is now 3.0.0
 - [#4732](https://github.com/firecracker-microvm/firecracker/pull/4732),
   [#4733](https://github.com/firecracker-microvm/firecracker/pull/4733),
   [#4741](https://github.com/firecracker-microvm/firecracker/pull/4741),

Cargo.lock

@@ -14,7 +14,7 @@ clap = { version = "4.5.27", features = ["derive"] }
 itertools = "0.14.0"
 proc-macro2 = { version = "1.0.93", features = ["span-locations"] }
 quote = "1.0.38"
-syn = { version = "2.0.96", features = ["full", "extra-traits", "visit", "visit-mut", "printing"] } 
+syn = { version = "2.0.98", features = ["full", "extra-traits", "visit", "visit-mut", "printing"] } 
 walkdir = "2.5.0"
 
 [dev-dependencies]

src/clippy-tracing/Cargo.toml

@@ -15,7 +15,7 @@ displaydoc = "0.2.5"
 libc = "0.2.169"
 log-instrument = { path = "../log-instrument", optional = true }
 serde = { version = "1.0.217", features = ["derive"] }
-serde_json = "1.0.137"
+serde_json = "1.0.138"
 thiserror = "2.0.11"
 
 vmm = { path = "../vmm" }

src/cpu-template-helper/Cargo.toml

@@ -24,7 +24,7 @@ micro_http = { git = "https://github.com/firecracker-microvm/micro-http" }
 
 serde = { version = "1.0.217", features = ["derive"] }
 serde_derive = "1.0.136"
-serde_json = "1.0.137"
+serde_json = "1.0.138"
 thiserror = "2.0.11"
 timerfd = "1.6.0"
 utils = { path = "../utils" }
@@ -43,7 +43,7 @@ userfaultfd = "0.8.1"
 [build-dependencies]
 seccompiler = { path = "../seccompiler" }
 serde = { version = "1.0.217" }
-serde_json = "1.0.137"
+serde_json = "1.0.138"
 
 [features]
 tracing = ["log-instrument", "utils/tracing", "vmm/tracing"]

src/firecracker/Cargo.toml

@@ -13,7 +13,7 @@ bench = false
 [dependencies]
 proc-macro2 = "1.0.93"
 quote = "1.0.38"
-syn = { version = "2.0.96", features = ["full", "extra-traits"] }
+syn = { version = "2.0.98", features = ["full", "extra-traits"] }
 
 [lints]
 workspace = true

src/log-instrument-macros/Cargo.toml

@@ -21,7 +21,7 @@ clap = { version = "4.5.27", features = ["derive", "string"] }
 displaydoc = "0.2.5"
 libc = "0.2.169"
 serde = { version = "1.0.217", features = ["derive"] }
-serde_json = "1.0.137"
+serde_json = "1.0.138"
 thiserror = "2.0.11"
 zerocopy = { version = "0.8.14" }
 

src/seccompiler/Cargo.toml

@@ -33,7 +33,7 @@ micro_http = { git = "https://github.com/firecracker-microvm/micro-http" }
 
 semver = { version = "1.0.25", features = ["serde"] }
 serde = { version = "1.0.217", features = ["derive", "rc"] }
-serde_json = "1.0.137"
+serde_json = "1.0.138"
 slab = "0.4.7"
 thiserror = "2.0.11"
 timerfd = "1.5.0"

src/vmm/Cargo.toml

@@ -155,7 +155,6 @@ fn create_vmm_and_vcpus(
     event_manager: &mut EventManager,
     guest_memory: GuestMemoryMmap,
     uffd: Option<Uffd>,
-    track_dirty_pages: bool,
     vcpu_count: u8,
     kvm_capabilities: Vec<KvmCapability>,
 ) -> Result<(Vmm, Vec<Vcpu>), StartMicrovmError> {
@@ -172,7 +171,7 @@ fn create_vmm_and_vcpus(
     kvm.check_memory(&guest_memory)
         .map_err(VmmError::Kvm)
         .map_err(StartMicrovmError::Internal)?;
-    vm.memory_init(&guest_memory, track_dirty_pages)
+    vm.memory_init(&guest_memory)
         .map_err(VmmError::Vm)
         .map_err(StartMicrovmError::Internal)?;
 
@@ -292,7 +291,6 @@ pub fn build_microvm_for_boot(
         event_manager,
         guest_memory,
         None,
-        vm_resources.machine_config.track_dirty_pages,
         vm_resources.machine_config.vcpu_count,
         cpu_template.kvm_capabilities.clone(),
     )?;
@@ -482,7 +480,6 @@ pub fn build_microvm_from_snapshot(
         event_manager,
         guest_memory,
         uffd,
-        vm_resources.machine_config.track_dirty_pages,
         vm_resources.machine_config.vcpu_count,
         microvm_state.kvm_state.kvm_cap_modifiers.clone(),
     )?;
@@ -1140,7 +1137,7 @@ pub(crate) mod tests {
 
         let kvm = Kvm::new(vec![]).unwrap();
         let mut vm = Vm::new(&kvm).unwrap();
-        vm.memory_init(&guest_memory, false).unwrap();
+        vm.memory_init(&guest_memory).unwrap();
         let mmio_device_manager = MMIODeviceManager::new();
         let acpi_device_manager = ACPIDeviceManager::new();
         #[cfg(target_arch = "x86_64")]
@@ -1394,7 +1391,7 @@ pub(crate) mod tests {
         let kvm = Kvm::new(vec![]).expect("Cannot create Kvm");
         #[allow(unused_mut)]
         let mut vm = Vm::new(&kvm).unwrap();
-        vm.memory_init(&guest_memory, false).unwrap();
+        vm.memory_init(&guest_memory).unwrap();
         let evfd = EventFd::new(libc::EFD_NONBLOCK).unwrap();
 
         #[cfg(target_arch = "x86_64")]