Signed-off-by: Markus Schade <markus.schade@xxxxxxxxxxx> --- tests/cputest.c | 2 +- .../x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/tests/cputest.c b/tests/cputest.c index 53674f2b9a..442d91cc4c 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -1253,7 +1253,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-Ryzen-9-3900X-12-Core-host.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml index 37905ec812..e9aea3339a 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,11 @@ <cpu> <arch>x86_64</arch> - <model>EPYC-IBPB</model> + <model>EPYC-Rome</model> <vendor>AMD</vendor> <feature name='ht'/> <feature name='osxsave'/> <feature name='cmt'/> - <feature name='clwb'/> <feature name='umip'/> - <feature name='rdpid'/> <feature name='xsaves'/> <feature name='mbm_total'/> <feature name='mbm_local'/> @@ -18,13 +16,8 @@ <feature name='wdt'/> <feature name='tce'/> <feature name='topoext'/> - <feature name='perfctr_core'/> <feature name='perfctr_nb'/> <feature name='invtsc'/> - <feature name='clzero'/> - <feature name='xsaveerptr'/> - <feature name='wbnoinvd'/> - <feature name='amd-stibp'/> <feature name='amd-ssbd'/> <feature name='npt'/> <feature name='lbrv'/> -- 2.26.2