fix: update msr/cpu template helper baselines

roypat · roypat · commit 70745e1119d5 · 2025-07-21T19:55:44.000Z
We disabled nested virt in our CI instances, so these baselines need
updating.

Signed-off-by: Patrick Roy &lt;roypat@amazon.co.uk&gt;
diff --git a/tests/data/cpu_template_helper/fingerprint_AMD_GENOA_5.10host.json b/tests/data/cpu_template_helper/fingerprint_AMD_GENOA_5.10host.json
@@ -1,9 +1,9 @@
 {
-  "firecracker_version": "1.12.0-dev",
-  "kernel_version": "5.10.234-225.910.amzn2.x86_64",
+  "firecracker_version": "1.13.0-dev",
+  "kernel_version": "5.10.238-234.956.amzn2.x86_64",
   "microcode_version": "0xa101154",
   "bios_version": "1.0",
-  "bios_revision": "2.19",
+  "bios_revision": "2.21",
   "guest_cpu_config": {
     "kvm_capabilities": [],
     "cpuid_modifiers": [
@@ -666,7 +666,7 @@
           },
           {
             "register": "ecx",
-            "bitmap": "0b00000000110000000000001111110111"
+            "bitmap": "0b00000000110000000000001111110011"
           },
           {
             "register": "edx",
@@ -865,19 +865,19 @@
         "modifiers": [
           {
             "register": "eax",
-            "bitmap": "0b00000000000000000000000000000001"
+            "bitmap": "0b00000000000000000000000000000000"
           },
           {
             "register": "ebx",
-            "bitmap": "0b00000000000000000000000000001000"
+            "bitmap": "0b00000000000000000000000000000000"
           },
           {
             "register": "ecx",
             "bitmap": "0b00000000000000000000000000000000"
           },
           {
             "register": "edx",
-            "bitmap": "0b00000000000000000000000000001001"
+            "bitmap": "0b00000000000000000000000000000000"
           }
         ]
       },
diff --git a/tests/data/cpu_template_helper/fingerprint_AMD_GENOA_6.1host.json b/tests/data/cpu_template_helper/fingerprint_AMD_GENOA_6.1host.json
@@ -1,9 +1,9 @@
 {
-  "firecracker_version": "1.12.0-dev",
-  "kernel_version": "6.1.129-138.220.amzn2023.x86_64",
+  "firecracker_version": "1.13.0-dev",
+  "kernel_version": "6.1.141-165.249.amzn2023.x86_64",
   "microcode_version": "0xa101154",
   "bios_version": "1.0",
-  "bios_revision": "2.19",
+  "bios_revision": "2.21",
   "guest_cpu_config": {
     "kvm_capabilities": [],
     "cpuid_modifiers": [
@@ -666,7 +666,7 @@
           },
           {
             "register": "ecx",
-            "bitmap": "0b00000000110000000000001111110111"
+            "bitmap": "0b00000000110000000000001111110011"
           },
           {
             "register": "edx",
@@ -865,19 +865,19 @@
         "modifiers": [
           {
             "register": "eax",
-            "bitmap": "0b00000000000000000000000000000001"
+            "bitmap": "0b00000000000000000000000000000000"
           },
           {
             "register": "ebx",
-            "bitmap": "0b00000000000000000000000000001000"
+            "bitmap": "0b00000000000000000000000000000000"
           },
           {
             "register": "ecx",
             "bitmap": "0b00000000000000000000000000000000"
           },
           {
             "register": "edx",
-            "bitmap": "0b00010000000000011001010000111011"
+            "bitmap": "0b00000000000000000000000000000000"
           }
         ]
       },
diff --git a/tests/data/cpu_template_helper/fingerprint_AMD_MILAN_5.10host.json b/tests/data/cpu_template_helper/fingerprint_AMD_MILAN_5.10host.json
@@ -1,9 +1,9 @@
 {
-  "firecracker_version": "1.12.0-dev",
-  "kernel_version": "5.10.234-225.910.amzn2.x86_64",
+  "firecracker_version": "1.13.0-dev",
+  "kernel_version": "5.10.238-234.956.amzn2.x86_64",
   "microcode_version": "0xa0011db",
   "bios_version": "1.0",
-  "bios_revision": "0.90",
+  "bios_revision": "0.94",
   "guest_cpu_config": {
     "kvm_capabilities": [],
     "cpuid_modifiers": [
@@ -574,7 +574,7 @@
           },
           {
             "register": "ecx",
-            "bitmap": "0b00000000110000000000001111110111"
+            "bitmap": "0b00000000110000000000001111110011"
           },
           {
             "register": "edx",
@@ -773,19 +773,19 @@
         "modifiers": [
           {
             "register": "eax",
-            "bitmap": "0b00000000000000000000000000000001"
+            "bitmap": "0b00000000000000000000000000000000"
           },
           {
             "register": "ebx",
-            "bitmap": "0b00000000000000000000000000001000"
+            "bitmap": "0b00000000000000000000000000000000"
           },
           {
             "register": "ecx",
             "bitmap": "0b00000000000000000000000000000000"
           },
           {
             "register": "edx",
-            "bitmap": "0b00000000000000000000000000001001"
+            "bitmap": "0b00000000000000000000000000000000"
           }
         ]
       },
diff --git a/tests/data/cpu_template_helper/fingerprint_AMD_MILAN_6.1host.json b/tests/data/cpu_template_helper/fingerprint_AMD_MILAN_6.1host.json
@@ -1,9 +1,9 @@
 {
-  "firecracker_version": "1.12.0-dev",
-  "kernel_version": "6.1.129-138.220.amzn2023.x86_64",
+  "firecracker_version": "1.13.0-dev",
+  "kernel_version": "6.1.141-165.249.amzn2023.x86_64",
   "microcode_version": "0xa0011db",
   "bios_version": "1.0",
-  "bios_revision": "0.90",
+  "bios_revision": "0.94",
   "guest_cpu_config": {
     "kvm_capabilities": [],
     "cpuid_modifiers": [
@@ -574,7 +574,7 @@
           },
           {
             "register": "ecx",
-            "bitmap": "0b00000000110000000000001111110111"
+            "bitmap": "0b00000000110000000000001111110011"
           },
           {
             "register": "edx",
@@ -773,19 +773,19 @@
         "modifiers": [
           {
             "register": "eax",
-            "bitmap": "0b00000000000000000000000000000001"
+            "bitmap": "0b00000000000000000000000000000000"
           },
           {
             "register": "ebx",
-            "bitmap": "0b00000000000000000000000000001000"
+            "bitmap": "0b00000000000000000000000000000000"
           },
           {
             "register": "ecx",
             "bitmap": "0b00000000000000000000000000000000"
           },
           {
             "register": "edx",
-            "bitmap": "0b00010000000000011001010000111011"
+            "bitmap": "0b00000000000000000000000000000000"
           }
         ]
       },
diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_5.10host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_5.10host.json
@@ -1,9 +1,9 @@
 {
-  "firecracker_version": "1.12.0-dev",
-  "kernel_version": "5.10.234-225.910.amzn2.x86_64",
-  "microcode_version": "0x5003801",
+  "firecracker_version": "1.13.0-dev",
+  "kernel_version": "5.10.238-234.956.amzn2.x86_64",
+  "microcode_version": "0x5003901",
   "bios_version": "1.0",
-  "bios_revision": "4.11",
+  "bios_revision": "4.13",
   "guest_cpu_config": {
     "kvm_capabilities": [],
     "cpuid_modifiers": [
@@ -45,7 +45,7 @@
           },
           {
             "register": "ecx",
-            "bitmap": "0b11110111111110100011001000100011"
+            "bitmap": "0b11110111111110100011001000000011"
           },
           {
             "register": "edx",
diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_6.1host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_6.1host.json
@@ -1,9 +1,9 @@
 {
-  "firecracker_version": "1.12.0-dev",
-  "kernel_version": "6.1.129-138.220.amzn2023.x86_64",
-  "microcode_version": "0x5003801",
+  "firecracker_version": "1.13.0-dev",
+  "kernel_version": "6.1.141-165.249.amzn2023.x86_64",
+  "microcode_version": "0x5003901",
   "bios_version": "1.0",
-  "bios_revision": "4.11",
+  "bios_revision": "4.13",
   "guest_cpu_config": {
     "kvm_capabilities": [],
     "cpuid_modifiers": [
@@ -45,7 +45,7 @@
           },
           {
             "register": "ecx",
-            "bitmap": "0b11110111111110100011001000100011"
+            "bitmap": "0b11110111111110100011001000000011"
           },
           {
             "register": "edx",
diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_ICELAKE_5.10host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_ICELAKE_5.10host.json
@@ -1,9 +1,9 @@
 {
-  "firecracker_version": "1.12.0-dev",
-  "kernel_version": "5.10.234-225.910.amzn2.x86_64",
-  "microcode_version": "0xd0003f6",
+  "firecracker_version": "1.13.0-dev",
+  "kernel_version": "5.10.238-234.956.amzn2.x86_64",
+  "microcode_version": "0xd000404",
   "bios_version": "1.0",
-  "bios_revision": "1.40",
+  "bios_revision": "1.41",
   "guest_cpu_config": {
     "kvm_capabilities": [],
     "cpuid_modifiers": [
@@ -45,7 +45,7 @@
           },
           {
             "register": "ecx",
-            "bitmap": "0b11110111111110100011001000100011"
+            "bitmap": "0b11110111111110100011001000000011"
           },
           {
             "register": "edx",
diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_ICELAKE_6.1host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_ICELAKE_6.1host.json
@@ -1,9 +1,9 @@
 {
-  "firecracker_version": "1.12.0-dev",
-  "kernel_version": "6.1.129-138.220.amzn2023.x86_64",
-  "microcode_version": "0xd0003f6",
+  "firecracker_version": "1.13.0-dev",
+  "kernel_version": "6.1.141-165.249.amzn2023.x86_64",
+  "microcode_version": "0xd000404",
   "bios_version": "1.0",
-  "bios_revision": "1.40",
+  "bios_revision": "1.41",
   "guest_cpu_config": {
     "kvm_capabilities": [],
     "cpuid_modifiers": [
@@ -45,7 +45,7 @@
           },
           {
             "register": "ecx",
-            "bitmap": "0b11110111111110100011001000100111"
+            "bitmap": "0b11110111111110100011001000000111"
           },
           {
             "register": "edx",
diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_SAPPHIRE_RAPIDS_5.10host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_SAPPHIRE_RAPIDS_5.10host.json
@@ -1,6 +1,6 @@
 {
   "firecracker_version": "1.13.0-dev",
-  "kernel_version": "5.10.237-230.948.amzn2.x86_64",
+  "kernel_version": "5.10.238-234.956.amzn2.x86_64",
   "microcode_version": "0x2b000639",
   "bios_version": "1.0",
   "bios_revision": "3.10",
@@ -45,7 +45,7 @@
           },
           {
             "register": "ecx",
-            "bitmap": "0b11110111111110100011001000100011"
+            "bitmap": "0b11110111111110100011001000000011"
           },
           {
             "register": "edx",
diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_SAPPHIRE_RAPIDS_6.1host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_SAPPHIRE_RAPIDS_6.1host.json
@@ -1,6 +1,6 @@
 {
   "firecracker_version": "1.13.0-dev",
-  "kernel_version": "6.1.140-154.222.amzn2023.x86_64",
+  "kernel_version": "6.1.141-165.249.amzn2023.x86_64",
   "microcode_version": "0x2b000639",
   "bios_version": "1.0",
   "bios_revision": "3.10",
@@ -45,7 +45,7 @@
           },
           {
             "register": "ecx",
-            "bitmap": "0b11110111111110100011001000100011"
+            "bitmap": "0b11110111111110100011001000000011"
           },
           {
             "register": "edx",
diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_5.10host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_5.10host.json
@@ -1,9 +1,9 @@
 {
   "firecracker_version": "1.13.0-dev",
-  "kernel_version": "5.10.237-230.948.amzn2.x86_64",
+  "kernel_version": "5.10.238-234.956.amzn2.x86_64",
   "microcode_version": "0x2007006",
   "bios_version": "1.0",
-  "bios_revision": "4.13",
+  "bios_revision": "4.14",
   "guest_cpu_config": {
     "kvm_capabilities": [],
     "cpuid_modifiers": [
@@ -45,7 +45,7 @@
           },
           {
             "register": "ecx",
-            "bitmap": "0b11110111111110100011001000100011"
+            "bitmap": "0b11110111111110100011001000000011"
           },
           {
             "register": "edx",
diff --git a/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_6.1host.json b/tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_6.1host.json
@@ -1,9 +1,9 @@
 {
   "firecracker_version": "1.13.0-dev",
-  "kernel_version": "6.1.140-154.222.amzn2023.x86_64",
+  "kernel_version": "6.1.141-165.249.amzn2023.x86_64",
   "microcode_version": "0x2007006",
   "bios_version": "1.0",
-  "bios_revision": "4.13",
+  "bios_revision": "4.14",
   "guest_cpu_config": {
     "kvm_capabilities": [],
     "cpuid_modifiers": [
@@ -45,7 +45,7 @@
           },
           {
             "register": "ecx",
-            "bitmap": "0b11110111111110100011001000100011"
+            "bitmap": "0b11110111111110100011001000000011"
           },
           {
             "register": "edx",
diff --git a/tests/data/msr/msr_list_T2A_AMD_MILAN_6.1host_5.10guest.csv b/tests/data/msr/msr_list_T2A_AMD_MILAN_6.1host_5.10guest.csv
@@ -1,9 +1,9 @@
 MSR_ADDR,VALUE
 0x0,0x0
 0x1,0x0
-0x10,0xd2adc3c4
-0x11,0x2a00000
-0x12,0x2a01001
+0x10,0x91048477
+0x11,0x24a1008
+0x12,0x24a2001
 0x17,0x0
 0x1b,0xfee00d00
 0x2a,0x0
@@ -21,7 +21,7 @@ MSR_ADDR,VALUE
 0x140,0x0
 0x174,0x10
 0x175,0x3000
-0x176,0x81801370
+0x176,0x81a01510
 0x179,0x20
 0x17a,0x0
 0x186,0x0
@@ -197,7 +197,7 @@ MSR_ADDR,VALUE
 0x619,0x0
 0x639,0x0
 0x641,0x0
-0x6e0,0x1834261cf
+0x6e0,0x91ac122f
 0x802,0x0
 0x803,0x50014
 0x808,0x10
@@ -241,14 +241,13 @@ MSR_ADDR,VALUE
 0x83e,0x0
 0xc0000080,0xd01
 0xc0000081,0x23001000000000
-0xc0000082,0xffffffff81800000
-0xc0000083,0xffffffff81801400
+0xc0000082,0xffffffff81a00080
+0xc0000083,0xffffffff81a015c0
 0xc0000084,0x47700
-0xc0000100,0x7f99e723c500
+0xc0000100,0x369e2380
 0xc0000101,0xffff88803ec00000
 0xc0000102,0x0
 0xc0000103,0x0
-0xc0000104,0x100000000
 0xc0010000,0x0
 0xc0010001,0x0
 0xc0010002,0x0
diff --git a/tests/data/msr/msr_list_T2A_AMD_MILAN_6.1host_6.1guest.csv b/tests/data/msr/msr_list_T2A_AMD_MILAN_6.1host_6.1guest.csv

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`{`
`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.238-234.956.amzn2.x86_64",`
`4`	`4`	`"microcode_version": "0xa101154",`
`5`	`5`	`"bios_version": "1.0",`
`6`		`- "bios_revision": "2.19",`
	`6`	`+ "bios_revision": "2.21",`
`7`	`7`	`"guest_cpu_config": {`
`8`	`8`	`"kvm_capabilities": [],`
`9`	`9`	`"cpuid_modifiers": [`
`@@ -666,7 +666,7 @@`
`666`	`666`	`},`
`667`	`667`	`{`
`668`	`668`	`"register": "ecx",`
`669`		`- "bitmap": "0b00000000110000000000001111110111"`
	`669`	`+ "bitmap": "0b00000000110000000000001111110011"`
`670`	`670`	`},`
`671`	`671`	`{`
`672`	`672`	`"register": "edx",`
`@@ -865,19 +865,19 @@`
`865`	`865`	`"modifiers": [`
`866`	`866`	`{`
`867`	`867`	`"register": "eax",`
`868`		`- "bitmap": "0b00000000000000000000000000000001"`
	`868`	`+ "bitmap": "0b00000000000000000000000000000000"`
`869`	`869`	`},`
`870`	`870`	`{`
`871`	`871`	`"register": "ebx",`
`872`		`- "bitmap": "0b00000000000000000000000000001000"`
	`872`	`+ "bitmap": "0b00000000000000000000000000000000"`
`873`	`873`	`},`
`874`	`874`	`{`
`875`	`875`	`"register": "ecx",`
`876`	`876`	`"bitmap": "0b00000000000000000000000000000000"`
`877`	`877`	`},`
`878`	`878`	`{`
`879`	`879`	`"register": "edx",`
`880`		`- "bitmap": "0b00000000000000000000000000001001"`
	`880`	`+ "bitmap": "0b00000000000000000000000000000000"`
`881`	`881`	`}`
`882`	`882`	`]`
`883`	`883`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`{`
`2`		`- "firecracker_version": "1.12.0-dev",`
`3`		`- "kernel_version": "6.1.129-138.220.amzn2023.x86_64",`
	`2`	`+ "firecracker_version": "1.13.0-dev",`
	`3`	`+ "kernel_version": "6.1.141-165.249.amzn2023.x86_64",`
`4`	`4`	`"microcode_version": "0xa101154",`
`5`	`5`	`"bios_version": "1.0",`
`6`		`- "bios_revision": "2.19",`
	`6`	`+ "bios_revision": "2.21",`
`7`	`7`	`"guest_cpu_config": {`
`8`	`8`	`"kvm_capabilities": [],`
`9`	`9`	`"cpuid_modifiers": [`
`@@ -666,7 +666,7 @@`
`666`	`666`	`},`
`667`	`667`	`{`
`668`	`668`	`"register": "ecx",`
`669`		`- "bitmap": "0b00000000110000000000001111110111"`
	`669`	`+ "bitmap": "0b00000000110000000000001111110011"`
`670`	`670`	`},`
`671`	`671`	`{`
`672`	`672`	`"register": "edx",`
`@@ -865,19 +865,19 @@`
`865`	`865`	`"modifiers": [`
`866`	`866`	`{`
`867`	`867`	`"register": "eax",`
`868`		`- "bitmap": "0b00000000000000000000000000000001"`
	`868`	`+ "bitmap": "0b00000000000000000000000000000000"`
`869`	`869`	`},`
`870`	`870`	`{`
`871`	`871`	`"register": "ebx",`
`872`		`- "bitmap": "0b00000000000000000000000000001000"`
	`872`	`+ "bitmap": "0b00000000000000000000000000000000"`
`873`	`873`	`},`
`874`	`874`	`{`
`875`	`875`	`"register": "ecx",`
`876`	`876`	`"bitmap": "0b00000000000000000000000000000000"`
`877`	`877`	`},`
`878`	`878`	`{`
`879`	`879`	`"register": "edx",`
`880`		`- "bitmap": "0b00010000000000011001010000111011"`
	`880`	`+ "bitmap": "0b00000000000000000000000000000000"`
`881`	`881`	`}`
`882`	`882`	`]`
`883`	`883`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"firecracker_version": "1.13.0-dev",`
`3`		`- "kernel_version": "5.10.237-230.948.amzn2.x86_64",`
	`3`	`+ "kernel_version": "5.10.238-234.956.amzn2.x86_64",`
`4`	`4`	`"microcode_version": "0x2b000639",`
`5`	`5`	`"bios_version": "1.0",`
`6`	`6`	`"bios_revision": "3.10",`
`@@ -45,7 +45,7 @@`
`45`	`45`	`},`
`46`	`46`	`{`
`47`	`47`	`"register": "ecx",`
`48`		`- "bitmap": "0b11110111111110100011001000100011"`
	`48`	`+ "bitmap": "0b11110111111110100011001000000011"`
`49`	`49`	`},`
`50`	`50`	`{`
`51`	`51`	`"register": "edx",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"firecracker_version": "1.13.0-dev",`
`3`		`- "kernel_version": "6.1.140-154.222.amzn2023.x86_64",`
	`3`	`+ "kernel_version": "6.1.141-165.249.amzn2023.x86_64",`
`4`	`4`	`"microcode_version": "0x2b000639",`
`5`	`5`	`"bios_version": "1.0",`
`6`	`6`	`"bios_revision": "3.10",`
`@@ -45,7 +45,7 @@`
`45`	`45`	`},`
`46`	`46`	`{`
`47`	`47`	`"register": "ecx",`
`48`		`- "bitmap": "0b11110111111110100011001000100011"`
	`48`	`+ "bitmap": "0b11110111111110100011001000000011"`
`49`	`49`	`},`
`50`	`50`	`{`
`51`	`51`	`"register": "edx",`