Skip to content

Commit d6d919c

Browse files
authored
Merge branch 'main' into dependabot/pip/tools/devctr/requests-2.32.4
2 parents 27d8519 + 005e345 commit d6d919c

File tree

6 files changed

+67
-116
lines changed

6 files changed

+67
-116
lines changed

Cargo.lock

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

docs/getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ wget "https://s3.amazonaws.com/spec.ccfc.min/${latest_kernel_key}"
113113
latest_ubuntu_key=$(curl "http://spec.ccfc.min.s3.amazonaws.com/?prefix=firecracker-ci/$CI_VERSION/$ARCH/ubuntu-&list-type=2" \
114114
| grep -oP "(?<=<Key>)(firecracker-ci/$CI_VERSION/$ARCH/ubuntu-[0-9]+\.[0-9]+\.squashfs)(?=</Key>)" \
115115
| sort -V | tail -1)
116-
ubuntu_version=$(basename $latest_ubuntu_key .sqashfs | grep -oE '[0-9]+\.[0-9]+')
116+
ubuntu_version=$(basename $latest_ubuntu_key .squashfs | grep -oE '[0-9]+\.[0-9]+')
117117

118118
# Download a rootfs
119119
wget -O ubuntu-$ubuntu_version.squashfs.upstream "https://s3.amazonaws.com/spec.ccfc.min/$latest_ubuntu_key"

src/vmm/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ vm-fdt = "0.3.0"
5757
criterion = { version = "0.6.0", default-features = false }
5858
device_tree = "1.1.0"
5959
itertools = "0.14.0"
60-
proptest = { version = "1.6.0", default-features = false, features = ["std"] }
60+
proptest = { version = "1.7.0", default-features = false, features = ["std"] }
6161

6262
[[bench]]
6363
name = "cpu_templates"

tests/data/cpu_template_helper/fingerprint_INTEL_SAPPHIRE_RAPIDS_5.10host.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"firecracker_version": "1.12.0-dev",
3-
"kernel_version": "5.10.234-225.910.amzn2.x86_64",
4-
"microcode_version": "0x2b000620",
2+
"firecracker_version": "1.13.0-dev",
3+
"kernel_version": "5.10.237-230.948.amzn2.x86_64",
4+
"microcode_version": "0x2b000639",
55
"bios_version": "1.0",
6-
"bios_revision": "3.3",
6+
"bios_revision": "3.10",
77
"guest_cpu_config": {
88
"kvm_capabilities": [],
99
"cpuid_modifiers": [
@@ -1339,7 +1339,7 @@
13391339
},
13401340
{
13411341
"addr": "0x10a",
1342-
"bitmap": "0b0000000000000000000000000000000000001100000010001110000011101011"
1342+
"bitmap": "0b0100000000000000000000000000000000001100000010001110000011101011"
13431343
},
13441344
{
13451345
"addr": "0x140",

tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_5.10host.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"firecracker_version": "1.12.0-dev",
3-
"kernel_version": "5.10.234-225.910.amzn2.x86_64",
2+
"firecracker_version": "1.13.0-dev",
3+
"kernel_version": "5.10.237-230.948.amzn2.x86_64",
44
"microcode_version": "0x2007006",
55
"bios_version": "1.0",
6-
"bios_revision": "4.11",
6+
"bios_revision": "4.13",
77
"guest_cpu_config": {
88
"kvm_capabilities": [],
99
"cpuid_modifiers": [
@@ -1128,7 +1128,7 @@
11281128
},
11291129
{
11301130
"addr": "0x10a",
1131-
"bitmap": "0b0000000000000000000000000000000000001100000000000000000001001100"
1131+
"bitmap": "0b0100000000000000000000000000000000001100000000000000000001001100"
11321132
},
11331133
{
11341134
"addr": "0x140",

0 commit comments

Comments
 (0)