diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 1486a29c65..fec01f324c 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -66,6 +66,7 @@ + diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 19daa7157b..b86612b6e0 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -32,6 +32,7 @@ cpumap_data = [ 'x86_Dhyana.xml', 'x86_EPYC-IBPB.xml', 'x86_EPYC.xml', + 'x86_EPYC-Rome.xml', 'x86_features.xml', 'x86_Haswell-IBRS.xml', 'x86_Haswell-noTSX-IBRS.xml', diff --git a/src/cpu_map/x86_EPYC-Rome.xml b/src/cpu_map/x86_EPYC-Rome.xml new file mode 100644 index 0000000000..99fc015fdd --- /dev/null +++ b/src/cpu_map/x86_EPYC-Rome.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/cputest.c b/tests/cputest.c index bf5ce84aa7..b3b143cbf1 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -1254,7 +1254,7 @@ mymain(void) DO_TEST_CPUID(VIR_ARCH_X86_64, "Pentium-P6100", JSON_NONE); DO_TEST_CPUID(VIR_ARCH_X86_64, "Phenom-B95", JSON_HOST); DO_TEST_CPUID(VIR_ARCH_X86_64, "Ryzen-7-1800X-Eight-Core", JSON_HOST); - DO_TEST_CPUID(VIR_ARCH_X86_64, "Ryzen-9-3900X-12-Core", JSON_MODELS); + DO_TEST_CPUID(VIR_ARCH_X86_64, "Ryzen-9-3900X-12-Core", JSON_MODELS_REQUIRED); DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-5110", JSON_NONE); DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E3-1225-v5", JSON_MODELS); DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E3-1245-v5", JSON_MODELS); diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml index 1320f65a58..cb2caab6f5 100644 --- a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml +++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml @@ -1,12 +1,9 @@ - EPYC-IBPB + EPYC-Rome AMD - - - @@ -17,18 +14,11 @@ - - - - - - - diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml index 37905ec812..b6784f9eba 100644 --- a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml +++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml @@ -1,13 +1,10 @@ x86_64 - EPYC-IBPB + EPYC-Rome AMD - - - @@ -18,18 +15,11 @@ - - - - - - - diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-json.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-json.xml index 225cf63852..86466c0547 100644 --- a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-json.xml +++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-json.xml @@ -1,28 +1,18 @@ - EPYC-IBPB + EPYC-Rome AMD - - - - - - - - - - diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml index 37905ec812..b6784f9eba 100644 --- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml @@ -1,13 +1,10 @@ x86_64 - EPYC-IBPB + EPYC-Rome AMD - - - @@ -18,18 +15,11 @@ - - - - - - - diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml index fc21b2ad62..d70c718b94 100644 --- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml @@ -95,6 +95,7 @@ Haswell-noTSX Haswell-IBRS Haswell + EPYC-Rome EPYC-IBPB EPYC Dhyana diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml index 110a79dd34..58f8547d3d 100644 --- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml @@ -100,6 +100,7 @@ Haswell-noTSX Haswell-IBRS Haswell + EPYC-Rome EPYC-IBPB EPYC Dhyana diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml index aceca34c43..587b49f55c 100644 --- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml @@ -94,6 +94,7 @@ Haswell-noTSX Haswell-IBRS Haswell + EPYC-Rome EPYC-IBPB EPYC Dhyana diff --git a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml index e1762611c5..716adab95b 100644 --- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml @@ -36,30 +36,20 @@ - EPYC-IBPB + EPYC-Rome AMD - - - - - - - - - - @@ -107,6 +97,7 @@ Haswell-noTSX Haswell-IBRS Haswell + EPYC-Rome EPYC-IBPB EPYC Dhyana diff --git a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml index 86f091d238..669afdbec8 100644 --- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml @@ -100,6 +100,7 @@ Haswell-noTSX Haswell-IBRS Haswell + EPYC-Rome EPYC-IBPB EPYC Dhyana diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml index 117f316b6a..dbb828c368 100644 --- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml @@ -35,30 +35,20 @@ - EPYC-IBPB + EPYC-Rome AMD - - - - - - - - - - @@ -106,6 +96,7 @@ Haswell-noTSX Haswell-IBRS Haswell + EPYC-Rome EPYC-IBPB EPYC Dhyana diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml index fdbf29fcdf..71b655dd10 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -36,30 +36,20 @@ - EPYC-IBPB + EPYC-Rome AMD - - - - - - - - - - @@ -107,6 +97,7 @@ Haswell-noTSX Haswell-IBRS Haswell + EPYC-Rome EPYC-IBPB EPYC Dhyana diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml index d33b8585a0..b5c9b31da7 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -100,6 +100,7 @@ Haswell-noTSX Haswell-IBRS Haswell + EPYC-Rome EPYC-IBPB EPYC Dhyana diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml index 6e2da6508f..b28dc590c1 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -35,30 +35,20 @@ - EPYC-IBPB + EPYC-Rome AMD - - - - - - - - - - @@ -106,6 +96,7 @@ Haswell-noTSX Haswell-IBRS Haswell + EPYC-Rome EPYC-IBPB EPYC Dhyana