Merge branch 'main' into net_queue_512

firecracker-microvm · Oct 30, 2024 · 6366bcb · 6366bcb
2 parents 42aacca + e04cdfe
commit 6366bcb
Show file tree

Hide file tree

Showing 16 changed files with 116 additions and 99 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/acpi-tables/Cargo.toml b/src/acpi-tables/Cargo.toml
@@ -8,9 +8,9 @@ license = "Apache-2.0"
 
 [dependencies]
 displaydoc = "0.2.5"
-thiserror = "1.0.64"
-vm-memory = { version = "0.15.0", features = ["backend-mmap", "backend-bitmap"] }
-zerocopy = { version = "0.8.6", features = ["derive"] }
+thiserror = "1.0.65"
+vm-memory = { version = "0.16.0", features = ["backend-mmap", "backend-bitmap"] }
+zerocopy = { version = "0.8.7", features = ["derive"] }
 
 [lib]
 bench = false

diff --git a/src/clippy-tracing/Cargo.toml b/src/clippy-tracing/Cargo.toml
@@ -12,9 +12,9 @@ bench = false
 [dependencies]
 clap = { version = "4.5.20", features = ["derive"] }
 itertools = "0.13.0"
-proc-macro2 = { version = "1.0.88", features = ["span-locations"] }
+proc-macro2 = { version = "1.0.89", features = ["span-locations"] }
 quote = "1.0.37"
-syn = { version = "2.0.82", features = ["full", "extra-traits", "visit", "visit-mut", "printing"] } 
+syn = { version = "2.0.85", features = ["full", "extra-traits", "visit", "visit-mut", "printing"] } 
 walkdir = "2.5.0"
 
 [dev-dependencies]

diff --git a/src/cpu-template-helper/Cargo.toml b/src/cpu-template-helper/Cargo.toml
@@ -14,9 +14,9 @@ clap = { version = "4.5.20", features = ["derive", "string"] }
 displaydoc = "0.2.5"
 libc = "0.2.161"
 log-instrument = { path = "../log-instrument", optional = true }
-serde = { version = "1.0.210", features = ["derive"] }
+serde = { version = "1.0.214", features = ["derive"] }
 serde_json = "1.0.132"
-thiserror = "1.0.64"
+thiserror = "1.0.65"
 
 vmm = { path = "../vmm" }
 vmm-sys-util = "0.12.1"