Skip to content

Commit 8028787

Browse files
authored
Merge branch 'main' into pvh-rebased
2 parents bb4a860 + 9ff2c7b commit 8028787

File tree

15 files changed

+88
-77
lines changed

15 files changed

+88
-77
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ and this project adheres to
6666
Firecracker no longer overwrites CPUID leaf 0x80000000 when running AMD
6767
hardware, meaning the guest can now discover a greater range of CPUID leaves
6868
in the extended function range (this range is host kernel dependent).
69+
- [#5046](https://github.com/firecracker-microvm/firecracker/pull/5046): Retry
70+
KVM_CREATE_VM on EINTR that occasionally happen on heavily loaded hosts to
71+
improve reliability of microVM creation.
6972

7073
## [1.10.1]
7174

Cargo.lock

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

resources/guest_configs/ci.config

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,10 @@ CONFIG_SQUASHFS_ZSTD=y
55
# aarch64 only TBD split into a separate file
66
CONFIG_DEVMEM=y
77
# CONFIG_ARM64_ERRATUM_3194386 is not set
8+
# Needed for CTRL+ALT+DEL support
9+
CONFIG_SERIO=y
10+
CONFIG_SERIO_I8042=y
11+
CONFIG_SERIO_LIBPS2=y
12+
CONFIG_SERIO_GSCPS2=y
13+
CONFIG_KEYBOARD_ATKBD=y
14+
CONFIG_INPUT_KEYBOARD=y

resources/rebuild.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ EOF
120120
}
121121

122122
function clone_amazon_linux_repo {
123-
[ -d linux ] || git clone https://github.com/amazonlinux/linux linux
123+
[ -d linux ] || git clone --no-checkout --filter=tree:0 https://github.com/amazonlinux/linux
124124
}
125125

126126
# prints the git tag corresponding to the newest and best matching the provided kernel version $1
@@ -145,7 +145,8 @@ function build_al_kernel {
145145
local KERNEL_VERSION=$(echo $KERNEL_CFG | grep -Po "microvm-kernel-ci-$ARCH-\K(\d+\.\d+)")
146146

147147
pushd linux
148-
make distclean
148+
# fails immediately after clone because nothing is checked out
149+
make distclean || true
149150

150151
git checkout $(get_tag $KERNEL_VERSION)
151152

src/acpi-tables/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ license = "Apache-2.0"
1010
displaydoc = "0.2.5"
1111
thiserror = "2.0.11"
1212
vm-memory = { version = "0.16.1", features = ["backend-mmap", "backend-bitmap"] }
13-
zerocopy = { version = "0.8.18", features = ["derive"] }
13+
zerocopy = { version = "0.8.20", 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
@@ -10,15 +10,15 @@ name = "clippy-tracing"
1010
bench = false
1111

1212
[dependencies]
13-
clap = { version = "4.5.29", features = ["derive"] }
13+
clap = { version = "4.5.31", features = ["derive"] }
1414
itertools = "0.14.0"
1515
proc-macro2 = { version = "1.0.93", features = ["span-locations"] }
1616
quote = "1.0.38"
1717
syn = { version = "2.0.98", features = ["full", "extra-traits", "visit", "visit-mut", "printing"] }
1818
walkdir = "2.5.0"
1919

2020
[dev-dependencies]
21-
uuid = { version = "1.13.1", features = ["v4"] }
21+
uuid = { version = "1.14.0", features = ["v4"] }
2222

2323
[lints]
2424
workspace = true

src/cpu-template-helper/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ name = "cpu-template-helper"
1010
bench = false
1111

1212
[dependencies]
13-
clap = { version = "4.5.29", features = ["derive", "string"] }
13+
clap = { version = "4.5.31", features = ["derive", "string"] }
1414
displaydoc = "0.2.5"
15-
libc = "0.2.169"
15+
libc = "0.2.170"
1616
log-instrument = { path = "../log-instrument", optional = true }
17-
serde = { version = "1.0.217", features = ["derive"] }
18-
serde_json = "1.0.138"
17+
serde = { version = "1.0.218", features = ["derive"] }
18+
serde_json = "1.0.139"
1919
thiserror = "2.0.11"
2020

2121
vmm = { path = "../vmm" }

src/firecracker/Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ bench = false
1818
[dependencies]
1919
displaydoc = "0.2.5"
2020
event-manager = "0.4.0"
21-
libc = "0.2.169"
21+
libc = "0.2.170"
2222
log-instrument = { path = "../log-instrument", optional = true }
2323
micro_http = { git = "https://github.com/firecracker-microvm/micro-http" }
2424

25-
serde = { version = "1.0.217", features = ["derive"] }
25+
serde = { version = "1.0.218", features = ["derive"] }
2626
serde_derive = "1.0.136"
27-
serde_json = "1.0.138"
27+
serde_json = "1.0.139"
2828
thiserror = "2.0.11"
2929
timerfd = "1.6.0"
3030
utils = { path = "../utils" }
@@ -33,17 +33,17 @@ vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }
3333

3434
[dev-dependencies]
3535
cargo_toml = "0.21.0"
36-
libc = "0.2.169"
36+
libc = "0.2.170"
3737
regex = { version = "1.11.1", default-features = false, features = ["std", "unicode-perl"] }
3838

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

4343
[build-dependencies]
4444
seccompiler = { path = "../seccompiler" }
45-
serde = { version = "1.0.217" }
46-
serde_json = "1.0.138"
45+
serde = { version = "1.0.218" }
46+
serde_json = "1.0.139"
4747

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

0 commit comments

Comments
 (0)