Signed-off-by: Markus Schade <markus.schade@xxxxxxxxxxx> --- .../cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml | 9 +-------- .../cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml | 9 +-------- .../cputestdata/x86_64-cpuid-EPYC-7502-32-Core-json.xml | 9 +-------- 3 files changed, 3 insertions(+), 24 deletions(-) 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..a49ef46f52 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,10 @@ <cpu mode='custom' match='exact'> - <model fallback='forbid'>EPYC-IBPB</model> + <model fallback='forbid'>EPYC-Rome</model> <vendor>AMD</vendor> <feature policy='require' name='ht'/> <feature policy='require' name='osxsave'/> <feature policy='require' name='cmt'/> - <feature policy='require' name='clwb'/> <feature policy='require' name='umip'/> - <feature policy='require' name='rdpid'/> <feature policy='require' name='xsaves'/> <feature policy='require' name='mbm_total'/> <feature policy='require' name='mbm_local'/> @@ -17,13 +15,8 @@ <feature policy='require' name='wdt'/> <feature policy='require' name='tce'/> <feature policy='require' name='topoext'/> - <feature policy='require' name='perfctr_core'/> <feature policy='require' name='perfctr_nb'/> <feature policy='require' name='invtsc'/> - <feature policy='require' name='clzero'/> - <feature policy='require' name='xsaveerptr'/> - <feature policy='require' name='wbnoinvd'/> - <feature policy='require' name='amd-stibp'/> <feature policy='require' name='amd-ssbd'/> <feature policy='require' name='npt'/> <feature policy='require' name='lbrv'/> 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..e9aea3339a 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,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'/> 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..e402b77eed 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,24 +1,17 @@ <cpu mode='custom' match='exact'> - <model fallback='forbid'>EPYC-IBPB</model> + <model fallback='forbid'>EPYC-Rome</model> <vendor>AMD</vendor> <feature policy='require' name='x2apic'/> <feature policy='require' name='tsc-deadline'/> <feature policy='require' name='hypervisor'/> <feature policy='require' name='tsc_adjust'/> - <feature policy='require' name='clwb'/> <feature policy='require' name='umip'/> - <feature policy='require' name='rdpid'/> <feature policy='require' name='spec-ctrl'/> <feature policy='require' name='stibp'/> <feature policy='require' name='arch-capabilities'/> <feature policy='require' name='ssbd'/> <feature policy='require' name='xsaves'/> <feature policy='require' name='cmp_legacy'/> - <feature policy='require' name='perfctr_core'/> - <feature policy='require' name='clzero'/> - <feature policy='require' name='xsaveerptr'/> - <feature policy='require' name='wbnoinvd'/> - <feature policy='require' name='amd-stibp'/> <feature policy='require' name='amd-ssbd'/> <feature policy='require' name='virt-ssbd'/> <feature policy='require' name='npt'/> -- 2.26.2
