From 5ffdfb6f093a54f60c79c621b4f4da8eb995bd2e Mon Sep 17 00:00:00 2001
From: Jack Thomson <jackabt@amazon.com>
Date: Mon, 17 Mar 2025 10:52:50 +0000
Subject: [PATCH 1/4] feat: Add m7a as a tested instance

Adding M7a to our default tested intances and the cross snapshot
pipeline.
Update the README to reflect this change.

Signed-off-by: Jack Thomson <jackabt@amazon.com>
---
 .buildkite/common.py         |  1 +
 .buildkite/pipeline_cross.py |  8 +++++++-
 README.md                    | 17 +++++++++--------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/.buildkite/common.py b/.buildkite/common.py
index f936bbce314..24607609841 100644
--- a/.buildkite/common.py
+++ b/.buildkite/common.py
@@ -19,6 +19,7 @@
     "m5n.metal",  # Intel Cascade Lake
     "m6i.metal",  # Intel Icelake
     "m6a.metal",  # AMD Milan
+    "m7a.metal-48xl",  # AMD Genoa
     "m6g.metal",  # Graviton2
     "m7g.metal",  # Graviton3
 ]
diff --git a/.buildkite/pipeline_cross.py b/.buildkite/pipeline_cross.py
index 1bac8c4bc3b..c611f87c065 100755
--- a/.buildkite/pipeline_cross.py
+++ b/.buildkite/pipeline_cross.py
@@ -18,7 +18,13 @@
     per_instance = pipeline.per_instance.copy()
     per_instance.pop("instances")
     per_instance.pop("platforms")
-    instances_x86_64 = ["c5n.metal", "m5n.metal", "m6i.metal", "m6a.metal"]
+    instances_x86_64 = [
+        "c5n.metal",
+        "m5n.metal",
+        "m6i.metal",
+        "m6a.metal",
+        "m7a.metal-48xl",
+    ]
     instances_aarch64 = ["m7g.metal"]
     commands = [
         "./tools/devtool -y test --no-build -- -m nonci -n4 integration_tests/functional/test_snapshot_phase1.py",
diff --git a/README.md b/README.md
index 5805b76ba15..dcb5771f994 100644
--- a/README.md
+++ b/README.md
@@ -130,14 +130,15 @@ The **API endpoint** can be used to:
 
 We test all combinations of:
 
-| Instance  | Host OS & Kernel | Guest Rootfs | Guest Kernel |
-| :-------- | :--------------- | :----------- | :----------- |
-| c5n.metal | al2 linux_5.10   | ubuntu 24.04 | linux_5.10   |
-| m5n.metal | al2023 linux_6.1 |              | linux_6.1    |
-| m6i.metal |                  |              |              |
-| m6a.metal |                  |              |              |
-| m6g.metal |                  |              |              |
-| m7g.metal |                  |              |              |
+| Instance       | Host OS & Kernel | Guest Rootfs | Guest Kernel |
+| :------------- | :--------------- | :----------- | :----------- |
+| c5n.metal      | al2 linux_5.10   | ubuntu 24.04 | linux_5.10   |
+| m5n.metal      | al2023 linux_6.1 |              | linux_6.1    |
+| m6i.metal      |                  |              |              |
+| m6a.metal      |                  |              |              |
+| m7a.metal-48xl |                  |              |              |
+| m6g.metal      |                  |              |              |
+| m7g.metal      |                  |              |              |
 
 ## Known issues and Limitations
 

From 9f993a03daeab91cdacdd4dc1f3f85158df9f30d Mon Sep 17 00:00:00 2001
From: Jack Thomson <jackabt@amazon.com>
Date: Mon, 17 Mar 2025 11:01:02 +0000
Subject: [PATCH 2/4] test: Ignore m7a tcp throughput

We are investigating volatility in the tcp throughput on m7a for now we
will ignore it, until we find a solution.

Signed-off-by: Jack Thomson <jackabt@amazon.com>
---
 tools/ab_test.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/ab_test.py b/tools/ab_test.py
index 7c4cdcada7a..fdcb433fe1b 100755
--- a/tools/ab_test.py
+++ b/tools/ab_test.py
@@ -44,6 +44,8 @@
 IGNORED = [
     # Network throughput on m6a.metal
     {"instance": "m6a.metal", "performance_test": "test_network_tcp_throughput"},
+    # Network throughput on m7a.metal
+    {"instance": "m7a.metal-48xl", "performance_test": "test_network_tcp_throughput"},
 ]
 
 

From eb092500e79810d301760f8391eb6107b74a6cad Mon Sep 17 00:00:00 2001
From: Jack Thomson <jackabt@amazon.com>
Date: Mon, 17 Mar 2025 12:01:25 +0000
Subject: [PATCH 3/4] doc: Add AMD Genoa support to changelog

New entry in the changelog for AMD Genoa that is officially onboarded
and tested on Firecracker

Signed-off-by: Jack Thomson <jackabt@amazon.com>
---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3bf8ea3c55..935c1b65b43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,8 @@ and this project adheres to
   provides the appropriate ELF Note to indicate that PVH boot mode is supported.
   Linux kernels newer than 5.0 compiled with `CONFIG_PVH=y` set this ELF Note,
   as do FreeBSD kernels.
+- [#5088](https://github.com/firecracker-microvm/firecracker/pull/5088): Added
+  AMD Genoa as a supported and tested platform for Firecracker.
 
 ### Changed
 

From 18e18d95c33f0ee90b694f82fa37642d6fe19eef Mon Sep 17 00:00:00 2001
From: Jack Thomson <jackabt@amazon.com>
Date: Mon, 17 Mar 2025 13:45:56 +0000
Subject: [PATCH 4/4] test: Add m7a to cpu template pipeline

Add m7a to the cpu template pipeline and add msr baselines for the
variant.

Signed-off-by: Jack Thomson <jackabt@amazon.com>
---
 .buildkite/pipeline_cpu_template.py           |  16 +-
 ..._list_T2A_AMD_GENOA_5.10host_5.10guest.csv | 298 +++++++++++++++++
 ...r_list_T2A_AMD_GENOA_5.10host_6.1guest.csv | 298 +++++++++++++++++
 ...r_list_T2A_AMD_GENOA_6.1host_5.10guest.csv | 300 ++++++++++++++++++
 ...sr_list_T2A_AMD_GENOA_6.1host_6.1guest.csv | 300 ++++++++++++++++++
 5 files changed, 1210 insertions(+), 2 deletions(-)
 create mode 100644 tests/data/msr/msr_list_T2A_AMD_GENOA_5.10host_5.10guest.csv
 create mode 100644 tests/data/msr/msr_list_T2A_AMD_GENOA_5.10host_6.1guest.csv
 create mode 100644 tests/data/msr/msr_list_T2A_AMD_GENOA_6.1host_5.10guest.csv
 create mode 100644 tests/data/msr/msr_list_T2A_AMD_GENOA_6.1host_6.1guest.csv

diff --git a/.buildkite/pipeline_cpu_template.py b/.buildkite/pipeline_cpu_template.py
index 18cf0cad3f5..e42ae926d2e 100755
--- a/.buildkite/pipeline_cpu_template.py
+++ b/.buildkite/pipeline_cpu_template.py
@@ -26,7 +26,13 @@ class BkStep(str, Enum):
             "tools/devtool -y test --no-build -- -m nonci -n4 --dist worksteal integration_tests/functional/test_cpu_features_x86_64.py -k 'test_cpu_rdmsr' "
         ],
         BkStep.LABEL: "📖 rdmsr",
-        "instances": ["c5n.metal", "m5n.metal", "m6a.metal", "m6i.metal"],
+        "instances": [
+            "c5n.metal",
+            "m5n.metal",
+            "m6i.metal",
+            "m6a.metal",
+            "m7a.metal-48xl",
+        ],
     },
     "fingerprint": {
         BkStep.COMMAND: [
@@ -59,7 +65,13 @@ class BkStep(str, Enum):
             "c5n.metal": ["m5n.metal", "m6i.metal"],
             "m6i.metal": ["m5n.metal", "c5n.metal"],
         },
-        "instances": ["c5n.metal", "m5n.metal", "m6i.metal", "m6a.metal"],
+        "instances": [
+            "c5n.metal",
+            "m5n.metal",
+            "m6i.metal",
+            "m6a.metal",
+            "m7a.metal-48xl",
+        ],
     },
 }
 
diff --git a/tests/data/msr/msr_list_T2A_AMD_GENOA_5.10host_5.10guest.csv b/tests/data/msr/msr_list_T2A_AMD_GENOA_5.10host_5.10guest.csv
new file mode 100644
index 00000000000..82f8d2673d7
--- /dev/null
+++ b/tests/data/msr/msr_list_T2A_AMD_GENOA_5.10host_5.10guest.csv
@@ -0,0 +1,298 @@
+MSR_ADDR,VALUE
+0,0x0
+0x1,0x0
+0x10,0x86e8ca1e
+0x11,0x24a1008
+0x12,0x24a2001
+0x17,0x0
+0x1b,0xfee00d00
+0x2a,0x0
+0x2c,0x1000000
+0x34,0x0
+0x3b,0x0
+0x48,0x0
+0x8b,0x1000065
+0xc1,0x0
+0xc2,0x0
+0xcd,0x3
+0xce,0x80000000
+0xfe,0x508
+0x11e,0xbe702111
+0x140,0x0
+0x174,0x10
+0x175,0xfffffe0000003000
+0x176,0xffffffff81a01510
+0x179,0x20
+0x17a,0x0
+0x186,0x0
+0x187,0x0
+0x198,0x400000003e8
+0x199,0x0
+0x1a0,0x1
+0x1d9,0x0
+0x1db,0x0
+0x1dc,0x0
+0x1dd,0x0
+0x1de,0x0
+0x1fc,0x0
+0x200,0x0
+0x201,0x0
+0x202,0x0
+0x203,0x0
+0x204,0x0
+0x205,0x0
+0x206,0x0
+0x207,0x0
+0x208,0x0
+0x209,0x0
+0x20a,0x0
+0x20b,0x0
+0x20c,0x0
+0x20d,0x0
+0x20e,0x0
+0x20f,0x0
+0x250,0x0
+0x258,0x0
+0x259,0x0
+0x268,0x0
+0x269,0x0
+0x26a,0x0
+0x26b,0x0
+0x26c,0x0
+0x26d,0x0
+0x26e,0x0
+0x26f,0x0
+0x277,0x7040600070406
+0x2ff,0x0
+0x400,0x0
+0x401,0x0
+0x402,0x0
+0x403,0x0
+0x404,0x0
+0x405,0x0
+0x406,0x0
+0x407,0x0
+0x408,0x0
+0x409,0x0
+0x40a,0x0
+0x40b,0x0
+0x40c,0x0
+0x40d,0x0
+0x40e,0x0
+0x40f,0x0
+0x410,0x0
+0x411,0x0
+0x412,0x0
+0x413,0x0
+0x414,0x0
+0x415,0x0
+0x416,0x0
+0x417,0x0
+0x418,0x0
+0x419,0x0
+0x41a,0x0
+0x41b,0x0
+0x41c,0x0
+0x41d,0x0
+0x41e,0x0
+0x41f,0x0
+0x420,0x0
+0x421,0x0
+0x422,0x0
+0x423,0x0
+0x424,0x0
+0x425,0x0
+0x426,0x0
+0x427,0x0
+0x428,0x0
+0x429,0x0
+0x42a,0x0
+0x42b,0x0
+0x42c,0x0
+0x42d,0x0
+0x42e,0x0
+0x42f,0x0
+0x430,0x0
+0x431,0x0
+0x432,0x0
+0x433,0x0
+0x434,0x0
+0x435,0x0
+0x436,0x0
+0x437,0x0
+0x438,0x0
+0x439,0x0
+0x43a,0x0
+0x43b,0x0
+0x43c,0x0
+0x43d,0x0
+0x43e,0x0
+0x43f,0x0
+0x440,0x0
+0x441,0x0
+0x442,0x0
+0x443,0x0
+0x444,0x0
+0x445,0x0
+0x446,0x0
+0x447,0x0
+0x448,0x0
+0x449,0x0
+0x44a,0x0
+0x44b,0x0
+0x44c,0x0
+0x44d,0x0
+0x44e,0x0
+0x44f,0x0
+0x450,0x0
+0x451,0x0
+0x452,0x0
+0x453,0x0
+0x454,0x0
+0x455,0x0
+0x456,0x0
+0x457,0x0
+0x458,0x0
+0x459,0x0
+0x45a,0x0
+0x45b,0x0
+0x45c,0x0
+0x45d,0x0
+0x45e,0x0
+0x45f,0x0
+0x460,0x0
+0x461,0x0
+0x462,0x0
+0x463,0x0
+0x464,0x0
+0x465,0x0
+0x466,0x0
+0x467,0x0
+0x468,0x0
+0x469,0x0
+0x46a,0x0
+0x46b,0x0
+0x46c,0x0
+0x46d,0x0
+0x46e,0x0
+0x46f,0x0
+0x470,0x0
+0x471,0x0
+0x472,0x0
+0x473,0x0
+0x474,0x0
+0x475,0x0
+0x476,0x0
+0x477,0x0
+0x478,0x0
+0x479,0x0
+0x47a,0x0
+0x47b,0x0
+0x47c,0x0
+0x47d,0x0
+0x47e,0x0
+0x47f,0x0
+0x606,0x0
+0x611,0x0
+0x619,0x0
+0x639,0x0
+0x641,0x0
+0x6e0,0x150b49126
+0x802,0x0
+0x803,0x50014
+0x808,0x10
+0x80a,0x10
+0x80d,0x1
+0x80f,0x1ff
+0x810,0x0
+0x811,0x0
+0x812,0x0
+0x813,0x0
+0x814,0x0
+0x815,0x0
+0x816,0x0
+0x817,0x0
+0x818,0x0
+0x819,0x0
+0x81a,0x0
+0x81b,0x0
+0x81c,0x0
+0x81d,0x0
+0x81e,0x0
+0x81f,0x0
+0x820,0x0
+0x821,0x0
+0x822,0x0
+0x823,0x0
+0x824,0x0
+0x825,0x0
+0x826,0x0
+0x827,0x0
+0x828,0x0
+0x830,0x0
+0x832,0x400ec
+0x833,0x10000
+0x834,0x400
+0x835,0x10700
+0x836,0x400
+0x837,0xfe
+0x838,0x0
+0x839,0x0
+0x83e,0x0
+0xc0000080,0xd01
+0xc0000081,0x23001000000000
+0xc0000082,0xffffffff81a00080
+0xc0000083,0xffffffff81a015c0
+0xc0000084,0x47700
+0xc0000100,0x7fbe30c03740
+0xc0000101,0xffff88803ec00000
+0xc0000102,0x0
+0xc0000103,0x0
+0xc0010000,0x0
+0xc0010001,0x0
+0xc0010002,0x0
+0xc0010003,0x0
+0xc0010004,0x0
+0xc0010005,0x0
+0xc0010006,0x0
+0xc0010007,0x0
+0xc0010010,0x0
+0xc0010015,0x0
+0xc001001b,0x20000000
+0xc001001f,0x0
+0xc0010055,0x0
+0xc0010058,0x0
+0xc0010112,0x0
+0xc0010113,0x0
+0xc0010114,0x0
+0xc0010117,0x0
+0xc001011f,0x0
+0xc0010131,0x0
+0xc0010140,0x4
+0xc0010141,0x0
+0xc0010200,0x0
+0xc0010201,0x0
+0xc0010202,0x0
+0xc0010203,0x0
+0xc0010204,0x0
+0xc0010205,0x0
+0xc0010206,0x0
+0xc0010207,0x0
+0xc0010208,0x0
+0xc0010209,0x0
+0xc001020a,0x0
+0xc001020b,0xffff
+0xc0011021,0x0
+0xc0011022,0x0
+0xc0011023,0x0
+0xc0011029,0x2
+0xc001102a,0x0
+0xc001102c,0x0
+0x400000000,0x0
+0x2000000000,0x0
+0x4000000000,0x0
+0x8000000000,0x0
+0x1000000000000,0x0
+0x3c000000000000,0x0
+0x80000000000000,0x0
+0x40000000000000,0x0
diff --git a/tests/data/msr/msr_list_T2A_AMD_GENOA_5.10host_6.1guest.csv b/tests/data/msr/msr_list_T2A_AMD_GENOA_5.10host_6.1guest.csv
new file mode 100644
index 00000000000..cbb1af0b3ac
--- /dev/null
+++ b/tests/data/msr/msr_list_T2A_AMD_GENOA_5.10host_6.1guest.csv
@@ -0,0 +1,298 @@
+MSR_ADDR,VALUE
+0,0x0
+0x1,0x0
+0x10,0x7cc4d24c
+0x11,0x25cb008
+0x12,0x25cc001
+0x17,0x0
+0x1b,0xfee00d00
+0x2a,0x0
+0x2c,0x1000000
+0x34,0x0
+0x3b,0x0
+0x48,0x0
+0x8b,0x1000065
+0xc1,0x0
+0xc2,0x0
+0xcd,0x3
+0xce,0x80000000
+0xfe,0x508
+0x11e,0xbe702111
+0x140,0x0
+0x174,0x10
+0x175,0xfffffe0000003000
+0x176,0xffffffff81a01620
+0x179,0x20
+0x17a,0x0
+0x186,0x0
+0x187,0x0
+0x198,0x400000003e8
+0x199,0x0
+0x1a0,0x1
+0x1d9,0x0
+0x1db,0x0
+0x1dc,0x0
+0x1dd,0x0
+0x1de,0x0
+0x1fc,0x0
+0x200,0x0
+0x201,0x0
+0x202,0x0
+0x203,0x0
+0x204,0x0
+0x205,0x0
+0x206,0x0
+0x207,0x0
+0x208,0x0
+0x209,0x0
+0x20a,0x0
+0x20b,0x0
+0x20c,0x0
+0x20d,0x0
+0x20e,0x0
+0x20f,0x0
+0x250,0x0
+0x258,0x0
+0x259,0x0
+0x268,0x0
+0x269,0x0
+0x26a,0x0
+0x26b,0x0
+0x26c,0x0
+0x26d,0x0
+0x26e,0x0
+0x26f,0x0
+0x277,0x7040600070406
+0x2ff,0x0
+0x400,0x0
+0x401,0x0
+0x402,0x0
+0x403,0x0
+0x404,0x0
+0x405,0x0
+0x406,0x0
+0x407,0x0
+0x408,0x0
+0x409,0x0
+0x40a,0x0
+0x40b,0x0
+0x40c,0x0
+0x40d,0x0
+0x40e,0x0
+0x40f,0x0
+0x410,0x0
+0x411,0x0
+0x412,0x0
+0x413,0x0
+0x414,0x0
+0x415,0x0
+0x416,0x0
+0x417,0x0
+0x418,0x0
+0x419,0x0
+0x41a,0x0
+0x41b,0x0
+0x41c,0x0
+0x41d,0x0
+0x41e,0x0
+0x41f,0x0
+0x420,0x0
+0x421,0x0
+0x422,0x0
+0x423,0x0
+0x424,0x0
+0x425,0x0
+0x426,0x0
+0x427,0x0
+0x428,0x0
+0x429,0x0
+0x42a,0x0
+0x42b,0x0
+0x42c,0x0
+0x42d,0x0
+0x42e,0x0
+0x42f,0x0
+0x430,0x0
+0x431,0x0
+0x432,0x0
+0x433,0x0
+0x434,0x0
+0x435,0x0
+0x436,0x0
+0x437,0x0
+0x438,0x0
+0x439,0x0
+0x43a,0x0
+0x43b,0x0
+0x43c,0x0
+0x43d,0x0
+0x43e,0x0
+0x43f,0x0
+0x440,0x0
+0x441,0x0
+0x442,0x0
+0x443,0x0
+0x444,0x0
+0x445,0x0
+0x446,0x0
+0x447,0x0
+0x448,0x0
+0x449,0x0
+0x44a,0x0
+0x44b,0x0
+0x44c,0x0
+0x44d,0x0
+0x44e,0x0
+0x44f,0x0
+0x450,0x0
+0x451,0x0
+0x452,0x0
+0x453,0x0
+0x454,0x0
+0x455,0x0
+0x456,0x0
+0x457,0x0
+0x458,0x0
+0x459,0x0
+0x45a,0x0
+0x45b,0x0
+0x45c,0x0
+0x45d,0x0
+0x45e,0x0
+0x45f,0x0
+0x460,0x0
+0x461,0x0
+0x462,0x0
+0x463,0x0
+0x464,0x0
+0x465,0x0
+0x466,0x0
+0x467,0x0
+0x468,0x0
+0x469,0x0
+0x46a,0x0
+0x46b,0x0
+0x46c,0x0
+0x46d,0x0
+0x46e,0x0
+0x46f,0x0
+0x470,0x0
+0x471,0x0
+0x472,0x0
+0x473,0x0
+0x474,0x0
+0x475,0x0
+0x476,0x0
+0x477,0x0
+0x478,0x0
+0x479,0x0
+0x47a,0x0
+0x47b,0x0
+0x47c,0x0
+0x47d,0x0
+0x47e,0x0
+0x47f,0x0
+0x606,0x0
+0x611,0x0
+0x619,0x0
+0x639,0x0
+0x641,0x0
+0x6e0,0x13998e6da
+0x802,0x0
+0x803,0x50014
+0x808,0x10
+0x80a,0x10
+0x80d,0x1
+0x80f,0x1ff
+0x810,0x0
+0x811,0x0
+0x812,0x0
+0x813,0x0
+0x814,0x0
+0x815,0x0
+0x816,0x0
+0x817,0x0
+0x818,0x0
+0x819,0x0
+0x81a,0x0
+0x81b,0x0
+0x81c,0x0
+0x81d,0x0
+0x81e,0x0
+0x81f,0x0
+0x820,0x0
+0x821,0x0
+0x822,0x0
+0x823,0x0
+0x824,0x0
+0x825,0x0
+0x826,0x0
+0x827,0x0
+0x828,0x0
+0x830,0x0
+0x832,0x400ec
+0x833,0x10000
+0x834,0x400
+0x835,0x10700
+0x836,0x400
+0x837,0xfe
+0x838,0x0
+0x839,0x0
+0x83e,0x0
+0xc0000080,0xd01
+0xc0000081,0x23001000000000
+0xc0000082,0xffffffff81a00080
+0xc0000083,0xffffffff81a016e0
+0xc0000084,0x257fd5
+0xc0000100,0x7f2345db1740
+0xc0000101,0xffff88803ec00000
+0xc0000102,0x0
+0xc0000103,0x0
+0xc0010000,0x0
+0xc0010001,0x0
+0xc0010002,0x0
+0xc0010003,0x0
+0xc0010004,0x0
+0xc0010005,0x0
+0xc0010006,0x0
+0xc0010007,0x0
+0xc0010010,0x0
+0xc0010015,0x0
+0xc001001b,0x20000000
+0xc001001f,0x0
+0xc0010055,0x0
+0xc0010058,0x0
+0xc0010112,0x0
+0xc0010113,0x0
+0xc0010114,0x0
+0xc0010117,0x0
+0xc001011f,0x0
+0xc0010131,0x0
+0xc0010140,0x4
+0xc0010141,0x0
+0xc0010200,0x0
+0xc0010201,0x0
+0xc0010202,0x0
+0xc0010203,0x0
+0xc0010204,0x0
+0xc0010205,0x0
+0xc0010206,0x0
+0xc0010207,0x0
+0xc0010208,0x0
+0xc0010209,0x0
+0xc001020a,0x0
+0xc001020b,0xffff
+0xc0011021,0x0
+0xc0011022,0x0
+0xc0011023,0x0
+0xc0011029,0x2
+0xc001102a,0x0
+0xc001102c,0x0
+0x400000000,0x0
+0x2000000000,0x0
+0x4000000000,0x0
+0x8000000000,0x0
+0x1000000000000,0x0
+0x3c000000000000,0x0
+0x80000000000000,0x0
+0x40000000000000,0x0
diff --git a/tests/data/msr/msr_list_T2A_AMD_GENOA_6.1host_5.10guest.csv b/tests/data/msr/msr_list_T2A_AMD_GENOA_6.1host_5.10guest.csv
new file mode 100644
index 00000000000..b3015830e3f
--- /dev/null
+++ b/tests/data/msr/msr_list_T2A_AMD_GENOA_6.1host_5.10guest.csv
@@ -0,0 +1,300 @@
+MSR_ADDR,VALUE
+0,0x0
+0x1,0x0
+0x10,0x916c8f40
+0x11,0x24a1008
+0x12,0x24a2001
+0x17,0x0
+0x1b,0xfee00d00
+0x2a,0x0
+0x2c,0x1000000
+0x34,0x0
+0x3b,0x0
+0x48,0x0
+0x8b,0x1000065
+0xc1,0x0
+0xc2,0x0
+0xcd,0x3
+0xce,0x80000000
+0xfe,0x508
+0x11e,0xbe702111
+0x140,0x0
+0x174,0x10
+0x175,0x3000
+0x176,0x81a01510
+0x179,0x20
+0x17a,0x0
+0x186,0x0
+0x187,0x0
+0x198,0x400000003e8
+0x199,0x0
+0x1a0,0x1
+0x1d9,0x0
+0x1db,0x0
+0x1dc,0x0
+0x1dd,0x0
+0x1de,0x0
+0x1fc,0x0
+0x200,0x0
+0x201,0x0
+0x202,0x0
+0x203,0x0
+0x204,0x0
+0x205,0x0
+0x206,0x0
+0x207,0x0
+0x208,0x0
+0x209,0x0
+0x20a,0x0
+0x20b,0x0
+0x20c,0x0
+0x20d,0x0
+0x20e,0x0
+0x20f,0x0
+0x250,0x0
+0x258,0x0
+0x259,0x0
+0x268,0x0
+0x269,0x0
+0x26a,0x0
+0x26b,0x0
+0x26c,0x0
+0x26d,0x0
+0x26e,0x0
+0x26f,0x0
+0x277,0x7040600070406
+0x2ff,0x0
+0x400,0x0
+0x401,0x0
+0x402,0x0
+0x403,0x0
+0x404,0x0
+0x405,0x0
+0x406,0x0
+0x407,0x0
+0x408,0x0
+0x409,0x0
+0x40a,0x0
+0x40b,0x0
+0x40c,0x0
+0x40d,0x0
+0x40e,0x0
+0x40f,0x0
+0x410,0x0
+0x411,0x0
+0x412,0x0
+0x413,0x0
+0x414,0x0
+0x415,0x0
+0x416,0x0
+0x417,0x0
+0x418,0x0
+0x419,0x0
+0x41a,0x0
+0x41b,0x0
+0x41c,0x0
+0x41d,0x0
+0x41e,0x0
+0x41f,0x0
+0x420,0x0
+0x421,0x0
+0x422,0x0
+0x423,0x0
+0x424,0x0
+0x425,0x0
+0x426,0x0
+0x427,0x0
+0x428,0x0
+0x429,0x0
+0x42a,0x0
+0x42b,0x0
+0x42c,0x0
+0x42d,0x0
+0x42e,0x0
+0x42f,0x0
+0x430,0x0
+0x431,0x0
+0x432,0x0
+0x433,0x0
+0x434,0x0
+0x435,0x0
+0x436,0x0
+0x437,0x0
+0x438,0x0
+0x439,0x0
+0x43a,0x0
+0x43b,0x0
+0x43c,0x0
+0x43d,0x0
+0x43e,0x0
+0x43f,0x0
+0x440,0x0
+0x441,0x0
+0x442,0x0
+0x443,0x0
+0x444,0x0
+0x445,0x0
+0x446,0x0
+0x447,0x0
+0x448,0x0
+0x449,0x0
+0x44a,0x0
+0x44b,0x0
+0x44c,0x0
+0x44d,0x0
+0x44e,0x0
+0x44f,0x0
+0x450,0x0
+0x451,0x0
+0x452,0x0
+0x453,0x0
+0x454,0x0
+0x455,0x0
+0x456,0x0
+0x457,0x0
+0x458,0x0
+0x459,0x0
+0x45a,0x0
+0x45b,0x0
+0x45c,0x0
+0x45d,0x0
+0x45e,0x0
+0x45f,0x0
+0x460,0x0
+0x461,0x0
+0x462,0x0
+0x463,0x0
+0x464,0x0
+0x465,0x0
+0x466,0x0
+0x467,0x0
+0x468,0x0
+0x469,0x0
+0x46a,0x0
+0x46b,0x0
+0x46c,0x0
+0x46d,0x0
+0x46e,0x0
+0x46f,0x0
+0x470,0x0
+0x471,0x0
+0x472,0x0
+0x473,0x0
+0x474,0x0
+0x475,0x0
+0x476,0x0
+0x477,0x0
+0x478,0x0
+0x479,0x0
+0x47a,0x0
+0x47b,0x0
+0x47c,0x0
+0x47d,0x0
+0x47e,0x0
+0x47f,0x0
+0x606,0x0
+0x611,0x0
+0x619,0x0
+0x639,0x0
+0x641,0x0
+0x6e0,0x13b260b8c
+0x802,0x0
+0x803,0x50014
+0x808,0x10
+0x80a,0x10
+0x80d,0x1
+0x80f,0x1ff
+0x810,0x0
+0x811,0x0
+0x812,0x0
+0x813,0x0
+0x814,0x0
+0x815,0x0
+0x816,0x0
+0x817,0x0
+0x818,0x0
+0x819,0x0
+0x81a,0x0
+0x81b,0x0
+0x81c,0x0
+0x81d,0x0
+0x81e,0x0
+0x81f,0x0
+0x820,0x0
+0x821,0x0
+0x822,0x0
+0x823,0x0
+0x824,0x0
+0x825,0x0
+0x826,0x0
+0x827,0x0
+0x828,0x0
+0x830,0x0
+0x832,0x400ec
+0x833,0x10000
+0x834,0x400
+0x835,0x10700
+0x836,0x400
+0x837,0xfe
+0x838,0x0
+0x839,0x0
+0x83e,0x0
+0xc0000080,0xd01
+0xc0000081,0x23001000000000
+0xc0000082,0xffffffff81a00080
+0xc0000083,0xffffffff81a015c0
+0xc0000084,0x47700
+0xc0000100,0x7f4e13140740
+0xc0000101,0xffff88803ec00000
+0xc0000102,0x0
+0xc0000103,0x0
+0xc0000104,0x100000000
+0xc0010000,0x0
+0xc0010001,0x0
+0xc0010002,0x0
+0xc0010003,0x0
+0xc0010004,0x0
+0xc0010005,0x0
+0xc0010006,0x0
+0xc0010007,0x0
+0xc0010010,0x0
+0xc0010015,0x0
+0xc001001b,0x20000000
+0xc001001f,0x0
+0xc0010055,0x0
+0xc0010058,0x0
+0xc0010112,0x0
+0xc0010113,0x0
+0xc0010114,0x0
+0xc0010117,0x0
+0xc001011f,0x0
+0xc0010130,0x0
+0xc0010131,0x0
+0xc0010140,0x4
+0xc0010141,0x0
+0xc0010200,0x0
+0xc0010201,0x0
+0xc0010202,0x0
+0xc0010203,0x0
+0xc0010204,0x0
+0xc0010205,0x0
+0xc0010206,0x0
+0xc0010207,0x0
+0xc0010208,0x0
+0xc0010209,0x0
+0xc001020a,0x0
+0xc001020b,0xffff
+0xc0011021,0x0
+0xc0011022,0x0
+0xc0011023,0x0
+0xc0011029,0x2
+0xc001102a,0x0
+0xc001102c,0x0
+0x400000000,0x0
+0x2000000000,0x0
+0x4000000000,0x0
+0x8000000000,0x0
+0x1000000000000,0x0
+0x3c000000000000,0x0
+0x80000000000000,0x0
+0x40000000000000,0x0
diff --git a/tests/data/msr/msr_list_T2A_AMD_GENOA_6.1host_6.1guest.csv b/tests/data/msr/msr_list_T2A_AMD_GENOA_6.1host_6.1guest.csv
new file mode 100644
index 00000000000..59606121fda
--- /dev/null
+++ b/tests/data/msr/msr_list_T2A_AMD_GENOA_6.1host_6.1guest.csv
@@ -0,0 +1,300 @@
+MSR_ADDR,VALUE
+0,0x0
+0x1,0x0
+0x10,0x7bd49b6c
+0x11,0x25cb008
+0x12,0x25cc001
+0x17,0x0
+0x1b,0xfee00d00
+0x2a,0x0
+0x2c,0x1000000
+0x34,0x0
+0x3b,0x0
+0x48,0x0
+0x8b,0x1000065
+0xc1,0x0
+0xc2,0x0
+0xcd,0x3
+0xce,0x80000000
+0xfe,0x508
+0x11e,0xbe702111
+0x140,0x0
+0x174,0x10
+0x175,0x3000
+0x176,0x81a01620
+0x179,0x20
+0x17a,0x0
+0x186,0x0
+0x187,0x0
+0x198,0x400000003e8
+0x199,0x0
+0x1a0,0x1
+0x1d9,0x0
+0x1db,0x0
+0x1dc,0x0
+0x1dd,0x0
+0x1de,0x0
+0x1fc,0x0
+0x200,0x0
+0x201,0x0
+0x202,0x0
+0x203,0x0
+0x204,0x0
+0x205,0x0
+0x206,0x0
+0x207,0x0
+0x208,0x0
+0x209,0x0
+0x20a,0x0
+0x20b,0x0
+0x20c,0x0
+0x20d,0x0
+0x20e,0x0
+0x20f,0x0
+0x250,0x0
+0x258,0x0
+0x259,0x0
+0x268,0x0
+0x269,0x0
+0x26a,0x0
+0x26b,0x0
+0x26c,0x0
+0x26d,0x0
+0x26e,0x0
+0x26f,0x0
+0x277,0x7040600070406
+0x2ff,0x0
+0x400,0x0
+0x401,0x0
+0x402,0x0
+0x403,0x0
+0x404,0x0
+0x405,0x0
+0x406,0x0
+0x407,0x0
+0x408,0x0
+0x409,0x0
+0x40a,0x0
+0x40b,0x0
+0x40c,0x0
+0x40d,0x0
+0x40e,0x0
+0x40f,0x0
+0x410,0x0
+0x411,0x0
+0x412,0x0
+0x413,0x0
+0x414,0x0
+0x415,0x0
+0x416,0x0
+0x417,0x0
+0x418,0x0
+0x419,0x0
+0x41a,0x0
+0x41b,0x0
+0x41c,0x0
+0x41d,0x0
+0x41e,0x0
+0x41f,0x0
+0x420,0x0
+0x421,0x0
+0x422,0x0
+0x423,0x0
+0x424,0x0
+0x425,0x0
+0x426,0x0
+0x427,0x0
+0x428,0x0
+0x429,0x0
+0x42a,0x0
+0x42b,0x0
+0x42c,0x0
+0x42d,0x0
+0x42e,0x0
+0x42f,0x0
+0x430,0x0
+0x431,0x0
+0x432,0x0
+0x433,0x0
+0x434,0x0
+0x435,0x0
+0x436,0x0
+0x437,0x0
+0x438,0x0
+0x439,0x0
+0x43a,0x0
+0x43b,0x0
+0x43c,0x0
+0x43d,0x0
+0x43e,0x0
+0x43f,0x0
+0x440,0x0
+0x441,0x0
+0x442,0x0
+0x443,0x0
+0x444,0x0
+0x445,0x0
+0x446,0x0
+0x447,0x0
+0x448,0x0
+0x449,0x0
+0x44a,0x0
+0x44b,0x0
+0x44c,0x0
+0x44d,0x0
+0x44e,0x0
+0x44f,0x0
+0x450,0x0
+0x451,0x0
+0x452,0x0
+0x453,0x0
+0x454,0x0
+0x455,0x0
+0x456,0x0
+0x457,0x0
+0x458,0x0
+0x459,0x0
+0x45a,0x0
+0x45b,0x0
+0x45c,0x0
+0x45d,0x0
+0x45e,0x0
+0x45f,0x0
+0x460,0x0
+0x461,0x0
+0x462,0x0
+0x463,0x0
+0x464,0x0
+0x465,0x0
+0x466,0x0
+0x467,0x0
+0x468,0x0
+0x469,0x0
+0x46a,0x0
+0x46b,0x0
+0x46c,0x0
+0x46d,0x0
+0x46e,0x0
+0x46f,0x0
+0x470,0x0
+0x471,0x0
+0x472,0x0
+0x473,0x0
+0x474,0x0
+0x475,0x0
+0x476,0x0
+0x477,0x0
+0x478,0x0
+0x479,0x0
+0x47a,0x0
+0x47b,0x0
+0x47c,0x0
+0x47d,0x0
+0x47e,0x0
+0x47f,0x0
+0x606,0x0
+0x611,0x0
+0x619,0x0
+0x639,0x0
+0x641,0x0
+0x6e0,0x137e39322
+0x802,0x0
+0x803,0x50014
+0x808,0x10
+0x80a,0x10
+0x80d,0x1
+0x80f,0x1ff
+0x810,0x0
+0x811,0x0
+0x812,0x0
+0x813,0x0
+0x814,0x0
+0x815,0x0
+0x816,0x0
+0x817,0x0
+0x818,0x0
+0x819,0x0
+0x81a,0x0
+0x81b,0x0
+0x81c,0x0
+0x81d,0x0
+0x81e,0x0
+0x81f,0x0
+0x820,0x0
+0x821,0x0
+0x822,0x0
+0x823,0x0
+0x824,0x0
+0x825,0x0
+0x826,0x0
+0x827,0x0
+0x828,0x0
+0x830,0x0
+0x832,0x400ec
+0x833,0x10000
+0x834,0x400
+0x835,0x10700
+0x836,0x400
+0x837,0xfe
+0x838,0x0
+0x839,0x0
+0x83e,0x0
+0xc0000080,0xd01
+0xc0000081,0x23001000000000
+0xc0000082,0xffffffff81a00080
+0xc0000083,0xffffffff81a016e0
+0xc0000084,0x257fd5
+0xc0000100,0x7f7c57cd9740
+0xc0000101,0xffff88803ec00000
+0xc0000102,0x0
+0xc0000103,0x0
+0xc0000104,0x100000000
+0xc0010000,0x0
+0xc0010001,0x0
+0xc0010002,0x0
+0xc0010003,0x0
+0xc0010004,0x0
+0xc0010005,0x0
+0xc0010006,0x0
+0xc0010007,0x0
+0xc0010010,0x0
+0xc0010015,0x0
+0xc001001b,0x20000000
+0xc001001f,0x0
+0xc0010055,0x0
+0xc0010058,0x0
+0xc0010112,0x0
+0xc0010113,0x0
+0xc0010114,0x0
+0xc0010117,0x0
+0xc001011f,0x0
+0xc0010130,0x0
+0xc0010131,0x0
+0xc0010140,0x4
+0xc0010141,0x0
+0xc0010200,0x0
+0xc0010201,0x0
+0xc0010202,0x0
+0xc0010203,0x0
+0xc0010204,0x0
+0xc0010205,0x0
+0xc0010206,0x0
+0xc0010207,0x0
+0xc0010208,0x0
+0xc0010209,0x0
+0xc001020a,0x0
+0xc001020b,0xffff
+0xc0011021,0x0
+0xc0011022,0x0
+0xc0011023,0x0
+0xc0011029,0x2
+0xc001102a,0x0
+0xc001102c,0x0
+0x400000000,0x0
+0x2000000000,0x0
+0x4000000000,0x0
+0x8000000000,0x0
+0x1000000000000,0x0
+0x3c000000000000,0x0
+0x80000000000000,0x0
+0x40000000000000,0x0