Skip to content

Commit 027fdbe

Browse files
authored
Merge branch 'main' into main-live-migration-and-msync
2 parents 06c4ee7 + 9cef42a commit 027fdbe

File tree

19 files changed

+273
-121
lines changed

19 files changed

+273
-121
lines changed

Cargo.lock

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

src/acpi-tables/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ license = "Apache-2.0"
88

99
[dependencies]
1010
displaydoc = "0.2.4"
11-
thiserror = "1.0.59"
11+
thiserror = "1.0.60"
1212
vm-memory = { version = "0.14.1", features = ["backend-mmap", "backend-bitmap"] }
13-
zerocopy = { version = "0.7.33", features = ["derive"] }
13+
zerocopy = { version = "0.7.34", features = ["derive"] }
1414

1515
[lib]
1616
bench = false

src/clippy-tracing/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ bench = false
1212
[dependencies]
1313
clap = { version = "4.5.4", features = ["derive"] }
1414
itertools = "0.12.1"
15-
proc-macro2 = { version = "1.0.81", features = ["span-locations"] }
15+
proc-macro2 = { version = "1.0.82", features = ["span-locations"] }
1616
quote = "1.0.36"
17-
syn = { version = "2.0.60", features = ["full", "extra-traits", "visit", "visit-mut", "printing"] }
17+
syn = { version = "2.0.63", features = ["full", "extra-traits", "visit", "visit-mut", "printing"] }
1818
walkdir = "2.5.0"
1919

2020
[dev-dependencies]

src/cpu-template-helper/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ clap = { version = "4.5.4", features = ["derive", "string"] }
1414
displaydoc = "0.2.4"
1515
libc = "0.2.154"
1616
log-instrument = { path = "../log-instrument", optional = true }
17-
serde = { version = "1.0.200", features = ["derive"] }
18-
serde_json = "1.0.116"
19-
thiserror = "1.0.59"
17+
serde = { version = "1.0.201", features = ["derive"] }
18+
serde_json = "1.0.117"
19+
thiserror = "1.0.60"
2020

2121
vmm = { path = "../vmm" }
2222
vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }

src/firecracker/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ log-instrument = { path = "../log-instrument", optional = true }
2323
micro_http = { git = "https://github.com/firecracker-microvm/micro-http" }
2424

2525
seccompiler = { path = "../seccompiler" }
26-
serde = { version = "1.0.200", features = ["derive"] }
26+
serde = { version = "1.0.201", features = ["derive"] }
2727
serde_derive = "1.0.136"
28-
serde_json = "1.0.116"
29-
thiserror = "1.0.59"
28+
serde_json = "1.0.117"
29+
thiserror = "1.0.60"
3030
timerfd = "1.6.0"
3131
utils = { path = "../utils" }
3232
vmm = { path = "../vmm" }
@@ -37,14 +37,14 @@ libc = "0.2.154"
3737
regex = { version = "1.10.4", default-features = false, features = ["std", "unicode-perl"] }
3838

3939
# Dev-Dependencies for uffd examples
40-
serde = { version = "1.0.200", features = ["derive"] }
40+
serde = { version = "1.0.201", features = ["derive"] }
4141
userfaultfd = "0.8.1"
4242

4343
[build-dependencies]
4444
bincode = "1.2.1"
4545
seccompiler = { path = "../seccompiler" }
46-
serde = { version = "1.0.200" }
47-
serde_json = "1.0.116"
46+
serde = { version = "1.0.201" }
47+
serde_json = "1.0.117"
4848

4949
[features]
5050
tracing = ["log-instrument", "seccompiler/tracing", "utils/tracing", "vmm/tracing"]

src/jailer/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ libc = "0.2.154"
1616
log-instrument = { path = "../log-instrument", optional = true }
1717
nix = { version = "0.28.0", default-features = false, features = ["dir"] }
1818
regex = { version = "1.10.4", default-features = false, features = ["std"] }
19-
thiserror = "1.0.59"
19+
thiserror = "1.0.60"
2020

2121
utils = { path = "../utils" }
2222

src/log-instrument-macros/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ proc-macro = true
1111
bench = false
1212

1313
[dependencies]
14-
proc-macro2 = "1.0.81"
14+
proc-macro2 = "1.0.82"
1515
quote = "1.0.36"
16-
syn = { version = "2.0.60", features = ["full", "extra-traits"] }
16+
syn = { version = "2.0.63", features = ["full", "extra-traits"] }
1717

1818
[lints]
1919
workspace = true

src/rebase-snap/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ bench = false
1313
displaydoc = "0.2.4"
1414
libc = "0.2.154"
1515
log-instrument = { path = "../log-instrument", optional = true }
16-
thiserror = "1.0.59"
16+
thiserror = "1.0.60"
1717

1818
utils = { path = "../utils" }
1919

src/seccompiler/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ bincode = "1.2.1"
2020
displaydoc = "0.2.4"
2121
libc = "0.2.154"
2222
log-instrument = { path = "../log-instrument", optional = true }
23-
serde = { version = "1.0.200", features = ["derive"] }
24-
serde_json = "1.0.116"
25-
thiserror = "1.0.59"
23+
serde = { version = "1.0.201", features = ["derive"] }
24+
serde_json = "1.0.117"
25+
thiserror = "1.0.60"
2626

2727
utils = { path = "../utils" }
2828

src/snapshot-editor/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ displaydoc = "0.2.4"
1616
fc_utils = { package = "utils", path = "../utils" }
1717
libc = "0.2.154"
1818
log-instrument = { path = "../log-instrument", optional = true }
19-
semver = "1.0.22"
20-
thiserror = "1.0.59"
19+
semver = "1.0.23"
20+
thiserror = "1.0.60"
2121
vmm = { path = "../vmm" }
2222

2323
[target.'cfg(target_arch = "aarch64")'.dependencies]

src/utils/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ derive_more = { version = "0.99.17", default-features = false, features = ["from
1313
displaydoc = "0.2.4"
1414
libc = "0.2.154"
1515
log-instrument = { path = "../log-instrument", optional = true }
16-
serde = { version = "1.0.200", features = ["derive"] }
17-
thiserror = "1.0.59"
16+
serde = { version = "1.0.201", features = ["derive"] }
17+
thiserror = "1.0.60"
1818
vm-memory = { version = "0.14.1", features = ["backend-mmap", "backend-bitmap"] }
1919
vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }
2020

2121
[dev-dependencies]
22-
serde_json = "1.0.116"
22+
serde_json = "1.0.117"
2323

2424
[features]
2525
tracing = ["log-instrument"]

0 commit comments

Comments
 (0)