Signed-off-by: Jiri Denemark <jdenemar@xxxxxxxxxx>
---
src/cpu_map/index.xml | 2 +
src/cpu_map/meson.build | 2 +
src/cpu_map/x86_EPYC-Milan-v1.xml | 6 ++
src/cpu_map/x86_EPYC-Milan-v2.xml | 99 +++++++++++++++++++
.../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 9 ++
.../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 31 ++++++
tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 9 ++
.../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 9 ++
.../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 31 ++++++
tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 9 ++
.../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 9 ++
.../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 30 ++++++
tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 9 ++
.../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 9 ++
.../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 29 ++++++
tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 9 ++
.../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 9 ++
.../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 29 ++++++
tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 9 ++
.../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 9 ++
.../qemu_7.2.0-tcg.x86_64+hvf.xml | 25 +++++
.../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 25 +++++
tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 9 ++
.../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 9 ++
.../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 24 +++++
tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 9 ++
.../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 25 +++++
.../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 44 +++++++++
tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 25 +++++
.../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 25 +++++
.../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 42 ++++++++
tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 25 +++++
.../domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 25 +++++
.../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 42 ++++++++
tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 25 +++++
.../domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 25 +++++
.../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 42 ++++++++
tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 25 +++++
.../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 25 +++++
.../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 42 ++++++++
tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 25 +++++
.../cpu-fallback.x86_64-8.0.0.args | 2 +-
.../cpu-fallback.x86_64-8.0.0.xml | 2 +-
.../cpu-nofallback.x86_64-8.0.0.args | 2 +-
.../cpu-nofallback.x86_64-8.0.0.xml | 2 +-
45 files changed, 925 insertions(+), 4 deletions(-)
create mode 100644 src/cpu_map/x86_EPYC-Milan-v1.xml
create mode 100644 src/cpu_map/x86_EPYC-Milan-v2.xml
diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index afb3a994fb..ebec4094ec 100644
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -124,6 +124,8 @@
<include filename='x86_EPYC-IBPB.xml'/>
<include filename='x86_EPYC-Rome.xml'/>
<include filename='x86_EPYC-Milan.xml'/>
+ <include filename='x86_EPYC-Milan-v1.xml'/>
+ <include filename='x86_EPYC-Milan-v2.xml'/>
<include filename='x86_EPYC-Genoa.xml'/>
</group>
diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index 9accba9936..5baf6543dd 100644
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -51,6 +51,8 @@ cpumap_data = [
'x86_EPYC-IBPB.xml',
'x86_EPYC.xml',
'x86_EPYC-Genoa.xml',
+ 'x86_EPYC-Milan-v1.xml',
+ 'x86_EPYC-Milan-v2.xml',
'x86_EPYC-Milan.xml',
'x86_EPYC-Rome.xml',
'x86_features.xml',
diff --git a/src/cpu_map/x86_EPYC-Milan-v1.xml b/src/cpu_map/x86_EPYC-Milan-v1.xml
new file mode 100644
index 0000000000..6da90fe4f1
--- /dev/null
+++ b/src/cpu_map/x86_EPYC-Milan-v1.xml
@@ -0,0 +1,6 @@
+<cpus>
+ <model name='EPYC-Milan-v1'>
+ <decode host='off' guest='off'/>
+ <model name='EPYC-Milan'/>
+ </model>
+</cpus>
diff --git a/src/cpu_map/x86_EPYC-Milan-v2.xml b/src/cpu_map/x86_EPYC-Milan-v2.xml
new file mode 100644
index 0000000000..0ac8c6991e
--- /dev/null
+++ b/src/cpu_map/x86_EPYC-Milan-v2.xml
@@ -0,0 +1,99 @@
+<cpus>
+ <model name='EPYC-Milan-v2'>
+ <decode host='on' guest='on'/>
+ <signature family='25' model='1'/>
+ <vendor name='AMD'/>
+ <feature name='3dnowprefetch'/>
+ <feature name='abm'/>
+ <feature name='adx'/>
+ <feature name='aes'/>
+ <feature name='amd-psfd'/>
+ <feature name='amd-ssbd'/>
+ <feature name='amd-stibp'/>
+ <feature name='apic'/>
+ <feature name='arat'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='bmi1'/>
+ <feature name='bmi2'/>
+ <feature name='clflush'/>
+ <feature name='clflushopt'/>
+ <feature name='clwb'/>
+ <feature name='clzero'/>
+ <feature name='cmov'/>
+ <feature name='cr8legacy'/>
+ <feature name='cx16'/>
+ <feature name='cx8'/>
+ <feature name='de'/>
+ <feature name='erms'/>
+ <feature name='f16c'/>
+ <feature name='fma'/>
+ <feature name='fpu'/>
+ <feature name='fsgsbase'/>
+ <feature name='fsrm'/>
+ <feature name='fxsr'/>
+ <feature name='fxsr_opt'/>
+ <feature name='ibpb'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='lahf_lm'/>
+ <feature name='lfence-always-serializing'/>
+ <feature name='lm'/>
+ <feature name='mca'/>
+ <feature name='mce'/>
+ <feature name='misalignsse'/>
+ <feature name='mmx'/>
+ <feature name='mmxext'/>
+ <feature name='movbe'/>
+ <feature name='msr'/>
+ <feature name='mtrr'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='npt'/>
+ <feature name='nrip-save'/>
+ <feature name='null-sel-clr-base'/>
+ <feature name='nx'/>
+ <feature name='osvw'/>
+ <feature name='pae'/>
+ <feature name='pat'/>
+ <feature name='pcid'/>
+ <feature name='pclmuldq'/>
+ <feature name='pdpe1gb'/>
+ <feature name='perfctr_core'/>
+ <feature name='pge'/>
+ <feature name='pku'/>
+ <feature name='pni'/>
+ <feature name='popcnt'/>
+ <feature name='pse'/>
+ <feature name='pse36'/>
+ <feature name='rdpid'/>
+ <feature name='rdrand'/>
+ <feature name='rdseed'/>
+ <feature name='rdtscp'/>
+ <feature name='sep'/>
+ <feature name='sha-ni'/>
+ <feature name='smap'/>
+ <feature name='smep'/>
+ <feature name='sse'/>
+ <feature name='sse2'/>
+ <feature name='sse4.1'/>
+ <feature name='sse4.2'/>
+ <feature name='sse4a'/>
+ <feature name='ssse3'/>
+ <feature name='stibp-always-on'/>
+ <feature name='svm'/>
+ <feature name='svme-addr-chk'/>
+ <feature name='syscall'/>
+ <feature name='tsc'/>
+ <feature name='umip'/>
+ <feature name='vaes'/>
+ <feature name='vme'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='wbnoinvd'/>
+ <feature name='xgetbv1'/>
+ <feature name='xsave'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveerptr'/>
+ <feature name='xsaveopt'/>
+ <feature name='xsaves'/>
+ </model>
+</cpus>
diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
index c1583c7b69..b1d0bf95cc 100644
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -268,6 +268,15 @@
<feature name='pcid'/>
<feature name='pku'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ </blockers>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='Intel'>Haswell</model>
<blockers model='Haswell'>
diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
index d5196be7b9..044eee19d0 100644
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -497,6 +497,37 @@
<feature name='xsaveerptr'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='3dnowprefetch'/>
+ <feature name='amd-ssbd'/>
+ <feature name='amd-stibp'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='clzero'/>
+ <feature name='f16c'/>
+ <feature name='fma'/>
+ <feature name='fsrm'/>
+ <feature name='fxsr_opt'/>
+ <feature name='ibpb'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='misalignsse'/>
+ <feature name='nrip-save'/>
+ <feature name='osvw'/>
+ <feature name='pcid'/>
+ <feature name='perfctr_core'/>
+ <feature name='rdpid'/>
+ <feature name='rdseed'/>
+ <feature name='sha-ni'/>
+ <feature name='svme-addr-chk'/>
+ <feature name='topoext'/>
+ <feature name='umip'/>
+ <feature name='wbnoinvd'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveerptr'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<blockers model='EPYC-Rome'>
<feature name='3dnowprefetch'/>
diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index 826e829b68..ddb138398b 100644
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -267,6 +267,15 @@
<feature name='pcid'/>
<feature name='pku'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ </blockers>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='Intel'>Haswell</model>
<blockers model='Haswell'>
diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
index 1b385af7e6..94805319c5 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -306,6 +306,15 @@
<feature name='pcid'/>
<feature name='pku'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ </blockers>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='Intel'>Haswell</model>
<blockers model='Haswell'>
diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
index 67a943b587..2790b5cfcb 100644
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -562,6 +562,37 @@
<feature name='xsaveerptr'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='3dnowprefetch'/>
+ <feature name='amd-ssbd'/>
+ <feature name='amd-stibp'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='clzero'/>
+ <feature name='f16c'/>
+ <feature name='fma'/>
+ <feature name='fsrm'/>
+ <feature name='fxsr_opt'/>
+ <feature name='ibpb'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='misalignsse'/>
+ <feature name='nrip-save'/>
+ <feature name='osvw'/>
+ <feature name='pcid'/>
+ <feature name='perfctr_core'/>
+ <feature name='rdpid'/>
+ <feature name='rdseed'/>
+ <feature name='sha-ni'/>
+ <feature name='svme-addr-chk'/>
+ <feature name='topoext'/>
+ <feature name='umip'/>
+ <feature name='wbnoinvd'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveerptr'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<blockers model='EPYC-Rome'>
<feature name='3dnowprefetch'/>
diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index 25212bdc52..511128bae2 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -305,6 +305,15 @@
<feature name='pcid'/>
<feature name='pku'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ </blockers>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='Intel'>Haswell</model>
<blockers model='Haswell'>
diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
index a8b20bfc6f..f63809a476 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -303,6 +303,15 @@
<feature name='pcid'/>
<feature name='pku'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ </blockers>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='Intel'>Haswell</model>
<blockers model='Haswell'>
diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
index ad3095ade1..697161d6e3 100644
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -560,6 +560,36 @@
<feature name='xsaveerptr'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='3dnowprefetch'/>
+ <feature name='amd-ssbd'/>
+ <feature name='amd-stibp'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='clzero'/>
+ <feature name='f16c'/>
+ <feature name='fma'/>
+ <feature name='fsrm'/>
+ <feature name='fxsr_opt'/>
+ <feature name='ibpb'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='misalignsse'/>
+ <feature name='nrip-save'/>
+ <feature name='osvw'/>
+ <feature name='pcid'/>
+ <feature name='perfctr_core'/>
+ <feature name='rdpid'/>
+ <feature name='rdseed'/>
+ <feature name='sha-ni'/>
+ <feature name='topoext'/>
+ <feature name='umip'/>
+ <feature name='wbnoinvd'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveerptr'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<blockers model='EPYC-Rome'>
<feature name='3dnowprefetch'/>
diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index 49b36890b9..7e3fe9d2fc 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -302,6 +302,15 @@
<feature name='pcid'/>
<feature name='pku'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ </blockers>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='Intel'>Haswell</model>
<blockers model='Haswell'>
diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
index 060e773ce9..559802ec44 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -304,6 +304,15 @@
<feature name='pcid'/>
<feature name='pku'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ </blockers>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='Intel'>Haswell</model>
<blockers model='Haswell'>
diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
index cc75218853..71c981601c 100644
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -560,6 +560,35 @@
<feature name='xsaveerptr'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='3dnowprefetch'/>
+ <feature name='amd-ssbd'/>
+ <feature name='amd-stibp'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='clzero'/>
+ <feature name='f16c'/>
+ <feature name='fma'/>
+ <feature name='fsrm'/>
+ <feature name='fxsr_opt'/>
+ <feature name='ibpb'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='misalignsse'/>
+ <feature name='nrip-save'/>
+ <feature name='osvw'/>
+ <feature name='pcid'/>
+ <feature name='perfctr_core'/>
+ <feature name='rdpid'/>
+ <feature name='rdseed'/>
+ <feature name='sha-ni'/>
+ <feature name='topoext'/>
+ <feature name='wbnoinvd'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveerptr'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<blockers model='EPYC-Rome'>
<feature name='3dnowprefetch'/>
diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index 09d570e2f4..b375cda6ae 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -303,6 +303,15 @@
<feature name='pcid'/>
<feature name='pku'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ </blockers>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='Intel'>Haswell</model>
<blockers model='Haswell'>
diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
index 58424aa4b9..02aef16ef8 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -305,6 +305,15 @@
<feature name='pcid'/>
<feature name='pku'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ </blockers>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='Intel'>Haswell</model>
<blockers model='Haswell'>
diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
index 70e73c4d65..e3f7e1ac8e 100644
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -560,6 +560,35 @@
<feature name='xsaveerptr'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='3dnowprefetch'/>
+ <feature name='amd-ssbd'/>
+ <feature name='amd-stibp'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='clzero'/>
+ <feature name='f16c'/>
+ <feature name='fma'/>
+ <feature name='fsrm'/>
+ <feature name='fxsr_opt'/>
+ <feature name='ibpb'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='misalignsse'/>
+ <feature name='nrip-save'/>
+ <feature name='osvw'/>
+ <feature name='pcid'/>
+ <feature name='perfctr_core'/>
+ <feature name='rdpid'/>
+ <feature name='rdseed'/>
+ <feature name='sha-ni'/>
+ <feature name='topoext'/>
+ <feature name='wbnoinvd'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveerptr'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<blockers model='EPYC-Rome'>
<feature name='3dnowprefetch'/>
diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index 48809b554f..3acec2bff5 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -304,6 +304,15 @@
<feature name='pcid'/>
<feature name='pku'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ </blockers>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='Intel'>Haswell</model>
<blockers model='Haswell'>
diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
index cb0710e2cd..1ca1784a4c 100644
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -310,6 +310,15 @@
<feature name='pcid'/>
<feature name='pku'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ </blockers>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='Intel'>Haswell</model>
<blockers model='Haswell'>
diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
index 148ab6b3b0..31cc8c6d8d 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
@@ -461,6 +461,31 @@
<feature name='xsaveerptr'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='3dnowprefetch'/>
+ <feature name='amd-ssbd'/>
+ <feature name='amd-stibp'/>
+ <feature name='clzero'/>
+ <feature name='fsrm'/>
+ <feature name='fxsr_opt'/>
+ <feature name='ibpb'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='misalignsse'/>
+ <feature name='nrip-save'/>
+ <feature name='osvw'/>
+ <feature name='pcid'/>
+ <feature name='perfctr_core'/>
+ <feature name='rdpid'/>
+ <feature name='rdseed'/>
+ <feature name='sha-ni'/>
+ <feature name='topoext'/>
+ <feature name='wbnoinvd'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveerptr'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<blockers model='EPYC-Rome'>
<feature name='3dnowprefetch'/>
diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
index 148ab6b3b0..31cc8c6d8d 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -461,6 +461,31 @@
<feature name='xsaveerptr'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='3dnowprefetch'/>
+ <feature name='amd-ssbd'/>
+ <feature name='amd-stibp'/>
+ <feature name='clzero'/>
+ <feature name='fsrm'/>
+ <feature name='fxsr_opt'/>
+ <feature name='ibpb'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='misalignsse'/>
+ <feature name='nrip-save'/>
+ <feature name='osvw'/>
+ <feature name='pcid'/>
+ <feature name='perfctr_core'/>
+ <feature name='rdpid'/>
+ <feature name='rdseed'/>
+ <feature name='sha-ni'/>
+ <feature name='topoext'/>
+ <feature name='wbnoinvd'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveerptr'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<blockers model='EPYC-Rome'>
<feature name='3dnowprefetch'/>
diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
index c9edd151a9..93b16729ed 100644
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -309,6 +309,15 @@
<feature name='pcid'/>
<feature name='pku'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ </blockers>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='Intel'>Haswell</model>
<blockers model='Haswell'>
diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
index dd9be29826..4ebcae4619 100644
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -310,6 +310,15 @@
<feature name='pcid'/>
<feature name='pku'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ </blockers>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='Intel'>Haswell</model>
<blockers model='Haswell'>
diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
index 525cec8ae6..a1305eb8d7 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -464,6 +464,30 @@
<feature name='xsaveerptr'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='3dnowprefetch'/>
+ <feature name='amd-ssbd'/>
+ <feature name='amd-stibp'/>
+ <feature name='clzero'/>
+ <feature name='fxsr_opt'/>
+ <feature name='ibpb'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='misalignsse'/>
+ <feature name='nrip-save'/>
+ <feature name='osvw'/>
+ <feature name='pcid'/>
+ <feature name='perfctr_core'/>
+ <feature name='rdpid'/>
+ <feature name='rdseed'/>
+ <feature name='sha-ni'/>
+ <feature name='topoext'/>
+ <feature name='wbnoinvd'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveerptr'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<blockers model='EPYC-Rome'>
<feature name='3dnowprefetch'/>
diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index 076c96cebe..c1f55383d2 100644
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -309,6 +309,15 @@
<feature name='pcid'/>
<feature name='pku'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ </blockers>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='Intel'>Haswell</model>
<blockers model='Haswell'>
diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
index d7c8bf6f79..28add7aad3 100644
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -345,6 +345,31 @@
<feature name='pku'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='xsaves'/>
+ </blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v2</model>
+ <blockers model='EPYC-Milan-v2'>
+ <feature name='amd-psfd'/>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='stibp-always-on'/>
+ <feature name='vaes'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<blockers model='EPYC-Rome'>
<feature name='xsaves'/>
diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
index 3b0ef7d162..86a7f0b299 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -420,6 +420,50 @@
<feature name='xsavec'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='amd-ssbd'/>
+ <feature name='amd-stibp'/>
+ <feature name='clzero'/>
+ <feature name='fxsr_opt'/>
+ <feature name='ibpb'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='misalignsse'/>
+ <feature name='nrip-save'/>
+ <feature name='osvw'/>
+ <feature name='pcid'/>
+ <feature name='perfctr_core'/>
+ <feature name='sha-ni'/>
+ <feature name='topoext'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v2</model>
+ <blockers model='EPYC-Milan-v2'>
+ <feature name='amd-psfd'/>
+ <feature name='amd-ssbd'/>
+ <feature name='amd-stibp'/>
+ <feature name='clzero'/>
+ <feature name='fxsr_opt'/>
+ <feature name='ibpb'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='lfence-always-serializing'/>
+ <feature name='misalignsse'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='nrip-save'/>
+ <feature name='null-sel-clr-base'/>
+ <feature name='osvw'/>
+ <feature name='pcid'/>
+ <feature name='perfctr_core'/>
+ <feature name='sha-ni'/>
+ <feature name='stibp-always-on'/>
+ <feature name='topoext'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<blockers model='EPYC-Rome'>
<feature name='amd-stibp'/>
diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index f1e3d1bff8..65153b9b10 100644
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -344,6 +344,31 @@
<feature name='pku'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='xsaves'/>
+ </blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v2</model>
+ <blockers model='EPYC-Milan-v2'>
+ <feature name='amd-psfd'/>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='stibp-always-on'/>
+ <feature name='vaes'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<blockers model='EPYC-Rome'>
<feature name='xsaves'/>
diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
index 75d22bce68..b662d2ab21 100644
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -346,6 +346,31 @@
<feature name='pku'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='xsaves'/>
+ </blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v2</model>
+ <blockers model='EPYC-Milan-v2'>
+ <feature name='amd-psfd'/>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='stibp-always-on'/>
+ <feature name='vaes'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<blockers model='EPYC-Rome'>
<feature name='xsaves'/>
diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
index 24d1ea46f8..927f5eee41 100644
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -415,6 +415,48 @@
<feature name='xsavec'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='amd-ssbd'/>
+ <feature name='amd-stibp'/>
+ <feature name='clzero'/>
+ <feature name='fxsr_opt'/>
+ <feature name='ibpb'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='misalignsse'/>
+ <feature name='nrip-save'/>
+ <feature name='osvw'/>
+ <feature name='pcid'/>
+ <feature name='perfctr_core'/>
+ <feature name='topoext'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v2</model>
+ <blockers model='EPYC-Milan-v2'>
+ <feature name='amd-psfd'/>
+ <feature name='amd-ssbd'/>
+ <feature name='amd-stibp'/>
+ <feature name='clzero'/>
+ <feature name='fxsr_opt'/>
+ <feature name='ibpb'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='lfence-always-serializing'/>
+ <feature name='misalignsse'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='nrip-save'/>
+ <feature name='null-sel-clr-base'/>
+ <feature name='osvw'/>
+ <feature name='pcid'/>
+ <feature name='perfctr_core'/>
+ <feature name='stibp-always-on'/>
+ <feature name='topoext'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<blockers model='EPYC-Rome'>
<feature name='amd-stibp'/>
diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index 04d5631dd1..db8b305918 100644
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -345,6 +345,31 @@
<feature name='pku'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='xsaves'/>
+ </blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v2</model>
+ <blockers model='EPYC-Milan-v2'>
+ <feature name='amd-psfd'/>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='stibp-always-on'/>
+ <feature name='vaes'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<blockers model='EPYC-Rome'>
<feature name='xsaves'/>
diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
index 7687af999b..77a5c7ada8 100644
--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
@@ -346,6 +346,31 @@
<feature name='pku'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='xsaves'/>
+ </blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v2</model>
+ <blockers model='EPYC-Milan-v2'>
+ <feature name='amd-psfd'/>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='stibp-always-on'/>
+ <feature name='vaes'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<blockers model='EPYC-Rome'>
<feature name='xsaves'/>
diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
index a9423e9160..2d76da1e7e 100644
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
@@ -399,6 +399,48 @@
<feature name='xsavec'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='amd-ssbd'/>
+ <feature name='amd-stibp'/>
+ <feature name='clzero'/>
+ <feature name='fxsr_opt'/>
+ <feature name='ibpb'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='misalignsse'/>
+ <feature name='nrip-save'/>
+ <feature name='osvw'/>
+ <feature name='pcid'/>
+ <feature name='perfctr_core'/>
+ <feature name='topoext'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v2</model>
+ <blockers model='EPYC-Milan-v2'>
+ <feature name='amd-psfd'/>
+ <feature name='amd-ssbd'/>
+ <feature name='amd-stibp'/>
+ <feature name='clzero'/>
+ <feature name='fxsr_opt'/>
+ <feature name='ibpb'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='lfence-always-serializing'/>
+ <feature name='misalignsse'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='nrip-save'/>
+ <feature name='null-sel-clr-base'/>
+ <feature name='osvw'/>
+ <feature name='pcid'/>
+ <feature name='perfctr_core'/>
+ <feature name='stibp-always-on'/>
+ <feature name='topoext'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<blockers model='EPYC-Rome'>
<feature name='amd-stibp'/>
diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
index 98f6cbf734..67fef596b4 100644
--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
@@ -345,6 +345,31 @@
<feature name='pku'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='xsaves'/>
+ </blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v2</model>
+ <blockers model='EPYC-Milan-v2'>
+ <feature name='amd-psfd'/>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='stibp-always-on'/>
+ <feature name='vaes'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<blockers model='EPYC-Rome'>
<feature name='xsaves'/>
diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
index 1110b08ec1..a90c8fc1ce 100644
--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
@@ -350,6 +350,31 @@
<feature name='pku'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='xsaves'/>
+ </blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v2</model>
+ <blockers model='EPYC-Milan-v2'>
+ <feature name='amd-psfd'/>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='stibp-always-on'/>
+ <feature name='vaes'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<blockers model='EPYC-Rome'>
<feature name='xsaves'/>
diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
index 0f47ccd0f2..7bbd06a5e8 100644
--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
@@ -398,6 +398,48 @@
<feature name='xsavec'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='amd-ssbd'/>
+ <feature name='amd-stibp'/>
+ <feature name='clzero'/>
+ <feature name='fxsr_opt'/>
+ <feature name='ibpb'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='misalignsse'/>
+ <feature name='nrip-save'/>
+ <feature name='osvw'/>
+ <feature name='pcid'/>
+ <feature name='perfctr_core'/>
+ <feature name='topoext'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v2</model>
+ <blockers model='EPYC-Milan-v2'>
+ <feature name='amd-psfd'/>
+ <feature name='amd-ssbd'/>
+ <feature name='amd-stibp'/>
+ <feature name='clzero'/>
+ <feature name='fxsr_opt'/>
+ <feature name='ibpb'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='lfence-always-serializing'/>
+ <feature name='misalignsse'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='nrip-save'/>
+ <feature name='null-sel-clr-base'/>
+ <feature name='osvw'/>
+ <feature name='pcid'/>
+ <feature name='perfctr_core'/>
+ <feature name='stibp-always-on'/>
+ <feature name='topoext'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<blockers model='EPYC-Rome'>
<feature name='amd-stibp'/>
diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
index 17763856b8..b412d26813 100644
--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
@@ -349,6 +349,31 @@
<feature name='pku'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='xsaves'/>
+ </blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v2</model>
+ <blockers model='EPYC-Milan-v2'>
+ <feature name='amd-psfd'/>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='stibp-always-on'/>
+ <feature name='vaes'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<blockers model='EPYC-Rome'>
<feature name='xsaves'/>
diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
index 822ca0af9d..ccaa5e8123 100644
--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
@@ -350,6 +350,31 @@
<feature name='pku'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='xsaves'/>
+ </blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v2</model>
+ <blockers model='EPYC-Milan-v2'>
+ <feature name='amd-psfd'/>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='stibp-always-on'/>
+ <feature name='vaes'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<blockers model='EPYC-Rome'>
<feature name='xsaves'/>
diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
index 7375cd46ae..131f5abae3 100644
--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
@@ -398,6 +398,48 @@
<feature name='xsavec'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='amd-ssbd'/>
+ <feature name='amd-stibp'/>
+ <feature name='clzero'/>
+ <feature name='fxsr_opt'/>
+ <feature name='ibpb'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='misalignsse'/>
+ <feature name='nrip-save'/>
+ <feature name='osvw'/>
+ <feature name='pcid'/>
+ <feature name='perfctr_core'/>
+ <feature name='topoext'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v2</model>
+ <blockers model='EPYC-Milan-v2'>
+ <feature name='amd-psfd'/>
+ <feature name='amd-ssbd'/>
+ <feature name='amd-stibp'/>
+ <feature name='clzero'/>
+ <feature name='fxsr_opt'/>
+ <feature name='ibpb'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='lfence-always-serializing'/>
+ <feature name='misalignsse'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='nrip-save'/>
+ <feature name='null-sel-clr-base'/>
+ <feature name='osvw'/>
+ <feature name='pcid'/>
+ <feature name='perfctr_core'/>
+ <feature name='stibp-always-on'/>
+ <feature name='topoext'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsavec'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<blockers model='EPYC-Rome'>
<feature name='amd-stibp'/>
diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
index 584732a2a7..4272b40dd6 100644
--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
@@ -349,6 +349,31 @@
<feature name='pku'/>
<feature name='xsaves'/>
</blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
+ <blockers model='EPYC-Milan-v1'>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='xsaves'/>
+ </blockers>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v2</model>
+ <blockers model='EPYC-Milan-v2'>
+ <feature name='amd-psfd'/>
+ <feature name='erms'/>
+ <feature name='fsrm'/>
+ <feature name='ibrs'/>
+ <feature name='invpcid'/>
+ <feature name='no-nested-data-bp'/>
+ <feature name='pcid'/>
+ <feature name='pku'/>
+ <feature name='stibp-always-on'/>
+ <feature name='vaes'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='xsaves'/>
+ </blockers>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<blockers model='EPYC-Rome'>
<feature name='xsaves'/>
diff --git a/tests/qemuxmlconfdata/cpu-fallback.x86_64-8.0.0.args b/tests/qemuxmlconfdata/cpu-fallback.x86_64-8.0.0.args
index b0ce1dfcbd..371cbbfb62 100644
--- a/tests/qemuxmlconfdata/cpu-fallback.x86_64-8.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-fallback.x86_64-8.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
-machine pc-i440fx-8.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel kvm \
--cpu EPYC-Milan,amd-ssbd=off,erms=off,fsrm=off,ibrs=off,invpcid=off,pcid=off,pku=off,svme-addr-chk=off,xsaves=off \
+-cpu EPYC-Milan-v1,amd-ssbd=off,erms=off,fsrm=off,ibrs=off,invpcid=off,pcid=off,pku=off,svme-addr-chk=off,xsaves=off \
-m size=219136k \
-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
-overcommit mem-lock=off \
diff --git a/tests/qemuxmlconfdata/cpu-fallback.x86_64-8.0.0.xml b/tests/qemuxmlconfdata/cpu-fallback.x86_64-8.0.0.xml
index 865d1586bc..015a705f74 100644
--- a/tests/qemuxmlconfdata/cpu-fallback.x86_64-8.0.0.xml
+++ b/tests/qemuxmlconfdata/cpu-fallback.x86_64-8.0.0.xml
@@ -9,7 +9,7 @@
<boot dev='network'/>
</os>
<cpu mode='custom' match='exact' check='partial'>
- <model fallback='allow'>EPYC-Milan</model>
+ <model fallback='allow'>EPYC-Milan-v1</model>
<feature policy='disable' name='amd-ssbd'/>
<feature policy='disable' name='erms'/>
<feature policy='disable' name='fsrm'/>
diff --git a/tests/qemuxmlconfdata/cpu-nofallback.x86_64-8.0.0.args b/tests/qemuxmlconfdata/cpu-nofallback.x86_64-8.0.0.args
index b0ce1dfcbd..371cbbfb62 100644
--- a/tests/qemuxmlconfdata/cpu-nofallback.x86_64-8.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-nofallback.x86_64-8.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
-machine pc-i440fx-8.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel kvm \
--cpu EPYC-Milan,amd-ssbd=off,erms=off,fsrm=off,ibrs=off,invpcid=off,pcid=off,pku=off,svme-addr-chk=off,xsaves=off \
+-cpu EPYC-Milan-v1,amd-ssbd=off,erms=off,fsrm=off,ibrs=off,invpcid=off,pcid=off,pku=off,svme-addr-chk=off,xsaves=off \
-m size=219136k \
-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
-overcommit mem-lock=off \
diff --git a/tests/qemuxmlconfdata/cpu-nofallback.x86_64-8.0.0.xml b/tests/qemuxmlconfdata/cpu-nofallback.x86_64-8.0.0.xml
index 35bf0d3a41..32d42660ac 100644
--- a/tests/qemuxmlconfdata/cpu-nofallback.x86_64-8.0.0.xml
+++ b/tests/qemuxmlconfdata/cpu-nofallback.x86_64-8.0.0.xml
@@ -9,7 +9,7 @@
<boot dev='network'/>
</os>
<cpu mode='custom' match='exact' check='partial'>
- <model fallback='forbid'>EPYC-Milan</model>
+ <model fallback='forbid'>EPYC-Milan-v1</model>
<feature policy='disable' name='amd-ssbd'/>
<feature policy='disable' name='erms'/>
<feature policy='disable' name='fsrm'/>
--
2.47.0
