Skip to content

Commit f8c4b4c

Browse files
authored
Merge branch 'main' into instance-id-in-header
2 parents f20a938 + ea6a553 commit f8c4b4c

File tree

22 files changed

+141
-151
lines changed

22 files changed

+141
-151
lines changed

CHANGELOG.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ and this project adheres to
3535
MMDS to set `Content-Type` header correctly (i.e. `Content-Type: text/plain`
3636
for IMDS-formatted or error responses and `Content-Type: application/json` for
3737
JSON-formatted responses).
38+
- [#5260](https://github.com/firecracker-microvm/firecracker/pull/5260): Fixed a
39+
bug allowing the block device to starve all other devices when backed by a
40+
sufficiently slow drive.
3841

3942
## [1.12.0]
4043

@@ -156,13 +159,6 @@ and this project adheres to
156159
the empty seccomp policy as default for debug builds to avoid crashes on
157160
syscalls introduced by debug assertions from Rust 1.80.0.
158161

159-
## [1.10.1]
160-
161-
### Changed
162-
163-
- [#4907](https://github.com/firecracker-microvm/firecracker/pull/4907): Bumped
164-
the snapshot version to 4.0.0, so users need to regenerate snapshots.
165-
166162
## [1.10.0]
167163

168164
### Added

Cargo.lock

Lines changed: 20 additions & 20 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ bench = false
1616
displaydoc = "0.2.5"
1717
thiserror = "2.0.12"
1818
vm-memory = { version = "0.16.2", features = ["backend-mmap", "backend-bitmap"] }
19-
zerocopy = { version = "0.8.25", features = ["derive"] }
19+
zerocopy = { version = "0.8.26", features = ["derive"] }
2020

2121
[lints]
2222
workspace = true

src/clippy-tracing/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ clap = { version = "4.5.40", features = ["derive"] }
1414
itertools = "0.14.0"
1515
proc-macro2 = { version = "1.0.95", features = ["span-locations"] }
1616
quote = "1.0.40"
17-
syn = { version = "2.0.103", features = ["full", "extra-traits", "visit", "visit-mut", "printing"] }
17+
syn = { version = "2.0.104", 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ tracing = ["log-instrument", "vmm/tracing"]
1515
[dependencies]
1616
clap = { version = "4.5.40", features = ["derive", "string"] }
1717
displaydoc = "0.2.5"
18-
libc = "0.2.173"
18+
libc = "0.2.174"
1919
log-instrument = { path = "../log-instrument", optional = true }
2020
serde = { version = "1.0.219", features = ["derive"] }
2121
serde_json = "1.0.140"

src/firecracker/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ gdb = ["vmm/gdb"]
2222
[dependencies]
2323
displaydoc = "0.2.5"
2424
event-manager = "0.4.1"
25-
libc = "0.2.173"
25+
libc = "0.2.174"
2626
log-instrument = { path = "../log-instrument", optional = true }
2727
micro_http = { git = "https://github.com/firecracker-microvm/micro-http" }
2828
serde = { version = "1.0.219", features = ["derive"] }
@@ -41,7 +41,7 @@ serde_json = "1.0.140"
4141

4242
[dev-dependencies]
4343
cargo_toml = "0.22.1"
44-
libc = "0.2.173"
44+
libc = "0.2.174"
4545
regex = { version = "1.11.1", default-features = false, features = ["std", "unicode-perl"] }
4646

4747
# Dev-Dependencies for uffd examples

src/firecracker/examples/uffd/uffd_utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ impl UffdHandler {
191191

192192
fn zero_out(&mut self, addr: u64) -> bool {
193193
match unsafe { self.uffd.zeropage(addr as *mut _, self.page_size, true) } {
194-
Ok(r) if r >= 0 => true,
194+
Ok(_) => true,
195195
Err(Error::ZeropageFailed(error)) if error as i32 == libc::EAGAIN => false,
196196
r => panic!("Unexpected zeropage result: {:?}", r),
197197
}

src/jailer/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ bench = false
1515
tracing = ["log-instrument", "utils/tracing"]
1616

1717
[dependencies]
18-
libc = "0.2.173"
18+
libc = "0.2.174"
1919
log-instrument = { path = "../log-instrument", optional = true }
2020
regex = { version = "1.11.1", default-features = false, features = ["std"] }
2121
thiserror = "2.0.12"

src/log-instrument-macros/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ bench = false
1313
[dependencies]
1414
proc-macro2 = "1.0.95"
1515
quote = "1.0.40"
16-
syn = { version = "2.0.103", features = ["full", "extra-traits"] }
16+
syn = { version = "2.0.104", 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
@@ -14,7 +14,7 @@ tracing = ["log-instrument", "utils/tracing"]
1414

1515
[dependencies]
1616
displaydoc = "0.2.5"
17-
libc = "0.2.173"
17+
libc = "0.2.174"
1818
log-instrument = { path = "../log-instrument", optional = true }
1919
thiserror = "2.0.12"
2020
vmm-sys-util = "0.14.0"

0 commit comments

Comments
 (0)