4:07 p.m.
For SEV-SNP support we will need to be able to specify versioned CPU models
that are not yet available in libvirt. Rather than just adding a versioned CPU
or two that would satisfy that immediate need, I decided to try to add
versioned CPUs in a more standard way. This series generates CPU definitions
for all cpu versions that are defined in upstream qemu (at least for
recent Intel and AMD CPUs).
libvirt already provides a select subset of these versions as configurable CPU
models. But we only include the ones that have defined aliases in qemu, such as
EPYC-IBPB. After this patchset, all verisioned cpu models supported by qemu
will be available in libvirt.
Note that I'm only adding versions that are not already available via their
alias. For example, I am not adding an EPYC-v2 CPU model since it is already
available as EPYC-IBPB.
Changes in v2:
- don't make any changes to existing CPU models
- drop concept of aliases from libvirt and only provide new versioned models
that aren't already available via their qemu alias.
Jonathon Jongsma (9):
cpu_map: update script to generate versioned CPUs
cpu_map: Add versioned EPYC CPUs
cpu_map: Add versioned Intel Skylake CPUs
cpu_map: Add versioned Intel Cascadelake CPUs
cpu_map: Add versioned Intel Icelake CPUs
cpu_map: Add versioned Intel Cooperlake CPUs
cpu_map: Add versioned Intel Snowridge CPUs
cpu_map: Add versioned Intel SapphireRapids CPUs
cpu_map: Add versioned Dhyana CPUs
src/cpu_map/index.xml | 22 +++
src/cpu_map/meson.build | 22 +++
src/cpu_map/sync_qemu_models_i386.py | 44 ++++--
src/cpu_map/x86_Cascadelake-Server-v2.xml | 93 +++++++++++++
src/cpu_map/x86_Cascadelake-Server-v4.xml | 91 +++++++++++++
src/cpu_map/x86_Cascadelake-Server-v5.xml | 92 +++++++++++++
src/cpu_map/x86_Cooperlake-v2.xml | 98 ++++++++++++++
src/cpu_map/x86_Dhyana-v2.xml | 81 ++++++++++++
src/cpu_map/x86_EPYC-Milan-v2.xml | 108 +++++++++++++++
src/cpu_map/x86_EPYC-Rome-v2.xml | 93 +++++++++++++
src/cpu_map/x86_EPYC-Rome-v3.xml | 95 +++++++++++++
src/cpu_map/x86_EPYC-Rome-v4.xml | 94 +++++++++++++
src/cpu_map/x86_EPYC-v3.xml | 87 ++++++++++++
src/cpu_map/x86_EPYC-v4.xml | 88 ++++++++++++
src/cpu_map/x86_Icelake-Server-v3.xml | 103 +++++++++++++++
src/cpu_map/x86_Icelake-Server-v4.xml | 108 +++++++++++++++
src/cpu_map/x86_Icelake-Server-v5.xml | 109 +++++++++++++++
src/cpu_map/x86_Icelake-Server-v6.xml | 109 +++++++++++++++
src/cpu_map/x86_SapphireRapids-v2.xml | 125 ++++++++++++++++++
src/cpu_map/x86_Skylake-Client-v4.xml | 77 +++++++++++
src/cpu_map/x86_Skylake-Server-v4.xml | 83 ++++++++++++
src/cpu_map/x86_Skylake-Server-v5.xml | 85 ++++++++++++
src/cpu_map/x86_Snowridge-v2.xml | 78 +++++++++++
src/cpu_map/x86_Snowridge-v3.xml | 80 +++++++++++
src/cpu_map/x86_Snowridge-v4.xml | 78 +++++++++++
.../x86_64-cpuid-Atom-P5362-guest.xml | 3 +-
.../x86_64-cpuid-Atom-P5362-json.xml | 3 +-
.../x86_64-cpuid-Cooperlake-host.xml | 3 +-
.../x86_64-cpuid-EPYC-7502-32-Core-host.xml | 5 +-
.../x86_64-cpuid-EPYC-7601-32-Core-guest.xml | 9 +-
...6_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml | 8 +-
..._64-cpuid-Hygon-C86-7185-32-core-guest.xml | 5 +-
...6_64-cpuid-Hygon-C86-7185-32-core-host.xml | 5 +-
...6_64-cpuid-Hygon-C86-7185-32-core-json.xml | 6 +-
...4-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml | 9 +-
.../x86_64-cpuid-Xeon-Platinum-8268-guest.xml | 9 +-
.../x86_64-cpuid-Xeon-Platinum-8268-host.xml | 9 +-
.../x86_64-cpuid-Xeon-Platinum-9242-guest.xml | 9 +-
.../x86_64-cpuid-Xeon-Platinum-9242-host.xml | 9 +-
.../x86_64-cpuid-Xeon-Platinum-9242-json.xml | 9 +-
..._64-cpuid-baseline-Cascadelake+Icelake.xml | 9 +-
...-cpuid-baseline-Cooperlake+Cascadelake.xml | 9 +-
...6_64-cpuid-baseline-Cooperlake+Icelake.xml | 9 +-
.../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 2 +
.../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 2 +
tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 2 +
.../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 4 +
.../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 4 +
tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 4 +
.../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 7 +
.../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 7 +
tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 7 +
.../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 7 +
.../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 7 +
tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 7 +
.../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 8 ++
.../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 8 ++
tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 8 ++
.../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 15 +++
.../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 15 +++
tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 15 +++
.../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 16 +++
.../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 16 +++
tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 16 +++
.../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 17 +++
.../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 17 +++
tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 17 +++
.../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 17 +++
.../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 17 +++
tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 17 +++
.../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 17 +++
.../qemu_7.2.0-tcg.x86_64+hvf.xml | 17 +++
.../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 17 +++
tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 17 +++
.../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 17 +++
.../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 17 +++
tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 17 +++
.../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 27 +++-
.../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 22 +++
tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 27 +++-
.../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 27 +++-
.../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 22 +++
tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 27 +++-
...-host-model-fallback-kvm.x86_64-8.1.0.args | 2 +-
...host-model-fallback-kvm.x86_64-latest.args | 2 +-
.../cpu-host-model-kvm.x86_64-8.1.0.args | 2 +-
.../cpu-host-model-kvm.x86_64-latest.args | 2 +-
...ost-model-nofallback-kvm.x86_64-8.1.0.args | 2 +-
...st-model-nofallback-kvm.x86_64-latest.args | 2 +-
89 files changed, 2710 insertions(+), 123 deletions(-)
create mode 100644 src/cpu_map/x86_Cascadelake-Server-v2.xml
create mode 100644 src/cpu_map/x86_Cascadelake-Server-v4.xml
create mode 100644 src/cpu_map/x86_Cascadelake-Server-v5.xml
create mode 100644 src/cpu_map/x86_Cooperlake-v2.xml
create mode 100644 src/cpu_map/x86_Dhyana-v2.xml
create mode 100644 src/cpu_map/x86_EPYC-Milan-v2.xml
create mode 100644 src/cpu_map/x86_EPYC-Rome-v2.xml
create mode 100644 src/cpu_map/x86_EPYC-Rome-v3.xml
create mode 100644 src/cpu_map/x86_EPYC-Rome-v4.xml
create mode 100644 src/cpu_map/x86_EPYC-v3.xml
create mode 100644 src/cpu_map/x86_EPYC-v4.xml
create mode 100644 src/cpu_map/x86_Icelake-Server-v3.xml
create mode 100644 src/cpu_map/x86_Icelake-Server-v4.xml
create mode 100644 src/cpu_map/x86_Icelake-Server-v5.xml
create mode 100644 src/cpu_map/x86_Icelake-Server-v6.xml
create mode 100644 src/cpu_map/x86_SapphireRapids-v2.xml
create mode 100644 src/cpu_map/x86_Skylake-Client-v4.xml
create mode 100644 src/cpu_map/x86_Skylake-Server-v4.xml
create mode 100644 src/cpu_map/x86_Skylake-Server-v5.xml
create mode 100644 src/cpu_map/x86_Snowridge-v2.xml
create mode 100644 src/cpu_map/x86_Snowridge-v3.xml
create mode 100644 src/cpu_map/x86_Snowridge-v4.xml
--
2.41.0
4:07 p.m.
New subject: [PATCH v2 1/9] cpu_map: update script to generate versioned CPUs
Previously, the script only generated the parent CPU and any versions
that had a defined alias. Now generate all CPU versions. Any version
that had a defined alias will continue to use that alias, but those
without aliases will use the generated name $BASECPUNAME-vN. This
generated name will be used as an alternate name for those CPU versions
with defined aliases.
Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com>
---
src/cpu_map/sync_qemu_models_i386.py | 44 +++++++++++++++++++++++-----
1 file changed, 36 insertions(+), 8 deletions(-)
diff --git a/src/cpu_map/sync_qemu_models_i386.py b/src/cpu_map/sync_qemu_models_i386.py
index 1c6a2d4d27..956e4700de 100755
--- a/src/cpu_map/sync_qemu_models_i386.py
+++ b/src/cpu_map/sync_qemu_models_i386.py
@@ -322,31 +322,55 @@ def expand_model(model):
different fields and may have differing versions into several libvirt-
friendly cpu models."""
- result = {
- "name": model.pop(".name"),
+ basename = model.pop(".name")
+ parent = {
+ "name": basename,
+ "alias": None,
"vendor": translate_vendor(model.pop(".vendor")),
"features": set(),
"extra": dict()}
if ".family" in model and ".model" in model:
- result["family"] = model.pop(".family")
- result["model"] = model.pop(".model")
+ parent["family"] = model.pop(".family")
+ parent["model"] = model.pop(".model")
for k in [k for k in model if k.startswith(".features")]:
v = model.pop(k)
for feature in v.split():
translated = translate_feature(feature)
if translated:
- result["features"].add(translated)
+ parent["features"].add(translated)
versions = model.pop(".versions", [])
for k, v in model.items():
- result["extra"]["model" + k] = v
- yield result
+ parent["extra"]["model" + k] = v
+
+ result = parent
for version in versions:
+ # each version builds on the previous one
result = copy.deepcopy(result)
- result["name"] = version.pop(".alias",
result["name"])
+ vnum = int(version.pop(".version"))
+ vname = "{}-v{}".format(basename, vnum)
+ if vnum == 1:
+ # the first version should always be an alias for the parent and
+ # should therefore have no extra properties
+ if version.items():
+ raise RuntimeError("Unexpected properties in version 1")
+ # just treat this version as an alias of the parent model and don't
+ # generate a new CPU model
+ parent["alias"] = vname
+ continue
+
+ # prefer the 'alias' over the generated the name if it exists since we
+ # have already been using these aliases
+ alias = version.pop(".alias", None)
+ if alias:
+ result["name"] = alias
+ result["alias"] = vname
+ else:
+ result["name"] = vname
+ result["alias"] = None
props = version.pop(".props", dict())
for k, v in props:
@@ -367,6 +391,8 @@ def expand_model(model):
yield result
+ yield parent
+
def output_model(f, model):
if model["extra"]:
@@ -377,6 +403,8 @@ def output_model(f, model):
f.write("<cpus>\n")
f.write(" <model
name='{}'>\n".format(model["name"]))
+ if model["alias"]:
+ f.write(" <alias
name='{}'/>\n".format(model["alias"]))
f.write(" <decode host='on' guest='on'/>\n")
f.write(" <signature family='{}'
model='{}'/>\n".format(
model["family"], model["model"]))
--
2.41.0
4:07 p.m.
New subject: [PATCH v2 2/9] cpu_map: Add versioned EPYC CPUs
Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com>
---
src/cpu_map/index.xml | 6 +
src/cpu_map/meson.build | 6 +
src/cpu_map/x86_EPYC-Milan-v2.xml | 108 ++++++++++++++++++
src/cpu_map/x86_EPYC-Rome-v2.xml | 93 +++++++++++++++
src/cpu_map/x86_EPYC-Rome-v3.xml | 95 +++++++++++++++
src/cpu_map/x86_EPYC-Rome-v4.xml | 94 +++++++++++++++
src/cpu_map/x86_EPYC-v3.xml | 87 ++++++++++++++
src/cpu_map/x86_EPYC-v4.xml | 88 ++++++++++++++
.../x86_64-cpuid-EPYC-7502-32-Core-host.xml | 5 +-
.../x86_64-cpuid-EPYC-7601-32-Core-guest.xml | 9 +-
...6_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml | 8 +-
...4-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml | 9 +-
.../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 2 +
.../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 2 +
tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 2 +
.../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 2 +
.../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 2 +
tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 2 +
.../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 2 +
.../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 2 +
tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 2 +
.../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 2 +
.../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 2 +
tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 2 +
.../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 2 +
.../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 2 +
tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 2 +
.../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 2 +
.../qemu_7.2.0-tcg.x86_64+hvf.xml | 2 +
.../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 2 +
tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 2 +
.../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 2 +
.../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 2 +
tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 2 +
.../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 11 +-
.../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 6 +
tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 11 +-
.../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 11 +-
.../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 6 +
tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 11 +-
...-host-model-fallback-kvm.x86_64-8.1.0.args | 2 +-
...host-model-fallback-kvm.x86_64-latest.args | 2 +-
.../cpu-host-model-kvm.x86_64-8.1.0.args | 2 +-
.../cpu-host-model-kvm.x86_64-latest.args | 2 +-
...ost-model-nofallback-kvm.x86_64-8.1.0.args | 2 +-
...st-model-nofallback-kvm.x86_64-latest.args | 2 +-
55 files changed, 686 insertions(+), 43 deletions(-)
create mode 100644 src/cpu_map/x86_EPYC-Milan-v2.xml
create mode 100644 src/cpu_map/x86_EPYC-Rome-v2.xml
create mode 100644 src/cpu_map/x86_EPYC-Rome-v3.xml
create mode 100644 src/cpu_map/x86_EPYC-Rome-v4.xml
create mode 100644 src/cpu_map/x86_EPYC-v3.xml
create mode 100644 src/cpu_map/x86_EPYC-v4.xml
diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index d2c5af5797..861edc3bb7 100644
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -67,9 +67,15 @@
<include filename='x86_Opteron_G4.xml'/>
<include filename='x86_Opteron_G5.xml'/>
<include filename='x86_EPYC.xml'/>
+ <include filename='x86_EPYC-v3.xml'/>
+ <include filename='x86_EPYC-v4.xml'/>
<include filename='x86_EPYC-IBPB.xml'/>
<include filename='x86_EPYC-Rome.xml'/>
+ <include filename='x86_EPYC-Rome-v2.xml'/>
+ <include filename='x86_EPYC-Rome-v3.xml'/>
+ <include filename='x86_EPYC-Rome-v4.xml'/>
<include filename='x86_EPYC-Milan.xml'/>
+ <include filename='x86_EPYC-Milan-v2.xml'/>
<include filename='x86_EPYC-Genoa.xml'/>
<!-- Hygon CPU models -->
diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index ae5293e85f..68e093e041 100644
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -39,8 +39,14 @@ cpumap_data = [
'x86_Dhyana.xml',
'x86_EPYC-IBPB.xml',
'x86_EPYC.xml',
+ 'x86_EPYC-v3.xml',
+ 'x86_EPYC-v4.xml',
'x86_EPYC-Genoa.xml',
+ 'x86_EPYC-Milan-v2.xml',
'x86_EPYC-Milan.xml',
+ 'x86_EPYC-Rome-v2.xml',
+ 'x86_EPYC-Rome-v3.xml',
+ 'x86_EPYC-Rome-v4.xml',
'x86_EPYC-Rome.xml',
'x86_features.xml',
'x86_Haswell-IBRS.xml',
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..4cadba2325
--- /dev/null
+++ b/src/cpu_map/x86_EPYC-Milan-v2.xml
@@ -0,0 +1,108 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '1'
+ 'model.xlevel': '0x8000001E'
+ 'model.model_id': 'AMD EPYC-Milan Processor'
+ 'model.cache_info': '&epyc_milan_cache_info'
+ 'property.model-id': 'AMD EPYC-Milan-v2 Processor'
+ 'version.cache_info': '&epyc_milan_v2_cache_info'
+-->
+<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/src/cpu_map/x86_EPYC-Rome-v2.xml b/src/cpu_map/x86_EPYC-Rome-v2.xml
new file mode 100644
index 0000000000..0cade90cdc
--- /dev/null
+++ b/src/cpu_map/x86_EPYC-Rome-v2.xml
@@ -0,0 +1,93 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '0'
+ 'model.xlevel': '0x8000001E'
+ 'model.model_id': 'AMD EPYC-Rome Processor'
+ 'model.cache_info': '&epyc_rome_cache_info'
+-->
+<cpus>
+ <model name='EPYC-Rome-v2'>
+ <decode host='on' guest='on'/>
+ <signature family='23' model='49'/>
+ <vendor name='AMD'/>
+ <feature name='3dnowprefetch'/>
+ <feature name='abm'/>
+ <feature name='adx'/>
+ <feature name='aes'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='fpu'/>
+ <feature name='fsgsbase'/>
+ <feature name='fxsr'/>
+ <feature name='fxsr_opt'/>
+ <feature name='ibpb'/>
+ <feature name='ibrs'/>
+ <feature name='lahf_lm'/>
+ <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='npt'/>
+ <feature name='nrip-save'/>
+ <feature name='nx'/>
+ <feature name='osvw'/>
+ <feature name='pae'/>
+ <feature name='pat'/>
+ <feature name='pclmuldq'/>
+ <feature name='pdpe1gb'/>
+ <feature name='perfctr_core'/>
+ <feature name='pge'/>
+ <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='svm'/>
+ <feature name='syscall'/>
+ <feature name='tsc'/>
+ <feature name='umip'/>
+ <feature name='vme'/>
+ <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/src/cpu_map/x86_EPYC-Rome-v3.xml b/src/cpu_map/x86_EPYC-Rome-v3.xml
new file mode 100644
index 0000000000..6b8f07c7f2
--- /dev/null
+++ b/src/cpu_map/x86_EPYC-Rome-v3.xml
@@ -0,0 +1,95 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '0'
+ 'model.xlevel': '0x8000001E'
+ 'model.model_id': 'AMD EPYC-Rome Processor'
+ 'model.cache_info': '&epyc_rome_cache_info'
+ 'property.model-id': 'AMD EPYC-Rome-v3 Processor'
+ 'version.cache_info': '&epyc_rome_v3_cache_info'
+-->
+<cpus>
+ <model name='EPYC-Rome-v3'>
+ <decode host='on' guest='on'/>
+ <signature family='23' model='49'/>
+ <vendor name='AMD'/>
+ <feature name='3dnowprefetch'/>
+ <feature name='abm'/>
+ <feature name='adx'/>
+ <feature name='aes'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='fpu'/>
+ <feature name='fsgsbase'/>
+ <feature name='fxsr'/>
+ <feature name='fxsr_opt'/>
+ <feature name='ibpb'/>
+ <feature name='ibrs'/>
+ <feature name='lahf_lm'/>
+ <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='npt'/>
+ <feature name='nrip-save'/>
+ <feature name='nx'/>
+ <feature name='osvw'/>
+ <feature name='pae'/>
+ <feature name='pat'/>
+ <feature name='pclmuldq'/>
+ <feature name='pdpe1gb'/>
+ <feature name='perfctr_core'/>
+ <feature name='pge'/>
+ <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='svm'/>
+ <feature name='syscall'/>
+ <feature name='tsc'/>
+ <feature name='umip'/>
+ <feature name='vme'/>
+ <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/src/cpu_map/x86_EPYC-Rome-v4.xml b/src/cpu_map/x86_EPYC-Rome-v4.xml
new file mode 100644
index 0000000000..e69f910e56
--- /dev/null
+++ b/src/cpu_map/x86_EPYC-Rome-v4.xml
@@ -0,0 +1,94 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '0'
+ 'model.xlevel': '0x8000001E'
+ 'model.model_id': 'AMD EPYC-Rome Processor'
+ 'model.cache_info': '&epyc_rome_cache_info'
+ 'property.model-id': 'AMD EPYC-Rome-v4 Processor (no XSAVES)'
+ 'version.cache_info': '&epyc_rome_v3_cache_info'
+-->
+<cpus>
+ <model name='EPYC-Rome-v4'>
+ <decode host='on' guest='on'/>
+ <signature family='23' model='49'/>
+ <vendor name='AMD'/>
+ <feature name='3dnowprefetch'/>
+ <feature name='abm'/>
+ <feature name='adx'/>
+ <feature name='aes'/>
+ <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='f16c'/>
+ <feature name='fma'/>
+ <feature name='fpu'/>
+ <feature name='fsgsbase'/>
+ <feature name='fxsr'/>
+ <feature name='fxsr_opt'/>
+ <feature name='ibpb'/>
+ <feature name='ibrs'/>
+ <feature name='lahf_lm'/>
+ <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='npt'/>
+ <feature name='nrip-save'/>
+ <feature name='nx'/>
+ <feature name='osvw'/>
+ <feature name='pae'/>
+ <feature name='pat'/>
+ <feature name='pclmuldq'/>
+ <feature name='pdpe1gb'/>
+ <feature name='perfctr_core'/>
+ <feature name='pge'/>
+ <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='svm'/>
+ <feature name='syscall'/>
+ <feature name='tsc'/>
+ <feature name='umip'/>
+ <feature name='vme'/>
+ <feature name='wbnoinvd'/>
+ <feature name='xgetbv1'/>
+ <feature name='xsave'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveerptr'/>
+ <feature name='xsaveopt'/>
+ </model>
+</cpus>
diff --git a/src/cpu_map/x86_EPYC-v3.xml b/src/cpu_map/x86_EPYC-v3.xml
new file mode 100644
index 0000000000..fb587218c7
--- /dev/null
+++ b/src/cpu_map/x86_EPYC-v3.xml
@@ -0,0 +1,87 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '2'
+ 'model.xlevel': '0x8000001E'
+ 'model.model_id': 'AMD EPYC Processor'
+ 'model.cache_info': '&epyc_cache_info'
+ 'property.model-id': 'AMD EPYC Processor'
+-->
+<cpus>
+ <model name='EPYC-v3'>
+ <decode host='on' guest='on'/>
+ <signature family='23' model='1'/>
+ <vendor name='AMD'/>
+ <feature name='3dnowprefetch'/>
+ <feature name='abm'/>
+ <feature name='adx'/>
+ <feature name='aes'/>
+ <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='clzero'/>
+ <feature name='cmov'/>
+ <feature name='cr8legacy'/>
+ <feature name='cx16'/>
+ <feature name='cx8'/>
+ <feature name='de'/>
+ <feature name='f16c'/>
+ <feature name='fma'/>
+ <feature name='fpu'/>
+ <feature name='fsgsbase'/>
+ <feature name='fxsr'/>
+ <feature name='fxsr_opt'/>
+ <feature name='ibpb'/>
+ <feature name='lahf_lm'/>
+ <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='npt'/>
+ <feature name='nrip-save'/>
+ <feature name='nx'/>
+ <feature name='osvw'/>
+ <feature name='pae'/>
+ <feature name='pat'/>
+ <feature name='pclmuldq'/>
+ <feature name='pdpe1gb'/>
+ <feature name='perfctr_core'/>
+ <feature name='pge'/>
+ <feature name='pni'/>
+ <feature name='popcnt'/>
+ <feature name='pse'/>
+ <feature name='pse36'/>
+ <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='svm'/>
+ <feature name='syscall'/>
+ <feature name='tsc'/>
+ <feature name='vme'/>
+ <feature name='xgetbv1'/>
+ <feature name='xsave'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveerptr'/>
+ <feature name='xsaveopt'/>
+ <feature name='xsaves'/>
+ </model>
+</cpus>
diff --git a/src/cpu_map/x86_EPYC-v4.xml b/src/cpu_map/x86_EPYC-v4.xml
new file mode 100644
index 0000000000..e714d9e622
--- /dev/null
+++ b/src/cpu_map/x86_EPYC-v4.xml
@@ -0,0 +1,88 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '2'
+ 'model.xlevel': '0x8000001E'
+ 'model.model_id': 'AMD EPYC Processor'
+ 'model.cache_info': '&epyc_cache_info'
+ 'property.model-id': 'AMD EPYC-v4 Processor'
+ 'version.cache_info': '&epyc_v4_cache_info'
+-->
+<cpus>
+ <model name='EPYC-v4'>
+ <decode host='on' guest='on'/>
+ <signature family='23' model='1'/>
+ <vendor name='AMD'/>
+ <feature name='3dnowprefetch'/>
+ <feature name='abm'/>
+ <feature name='adx'/>
+ <feature name='aes'/>
+ <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='clzero'/>
+ <feature name='cmov'/>
+ <feature name='cr8legacy'/>
+ <feature name='cx16'/>
+ <feature name='cx8'/>
+ <feature name='de'/>
+ <feature name='f16c'/>
+ <feature name='fma'/>
+ <feature name='fpu'/>
+ <feature name='fsgsbase'/>
+ <feature name='fxsr'/>
+ <feature name='fxsr_opt'/>
+ <feature name='ibpb'/>
+ <feature name='lahf_lm'/>
+ <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='npt'/>
+ <feature name='nrip-save'/>
+ <feature name='nx'/>
+ <feature name='osvw'/>
+ <feature name='pae'/>
+ <feature name='pat'/>
+ <feature name='pclmuldq'/>
+ <feature name='pdpe1gb'/>
+ <feature name='perfctr_core'/>
+ <feature name='pge'/>
+ <feature name='pni'/>
+ <feature name='popcnt'/>
+ <feature name='pse'/>
+ <feature name='pse36'/>
+ <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='svm'/>
+ <feature name='syscall'/>
+ <feature name='tsc'/>
+ <feature name='vme'/>
+ <feature name='xgetbv1'/>
+ <feature name='xsave'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveerptr'/>
+ <feature name='xsaveopt'/>
+ <feature name='xsaves'/>
+ </model>
+</cpus>
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 e348e0f6f6..c9ad653497 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,12 @@
<cpu>
<arch>x86_64</arch>
- <model>EPYC-Rome</model>
+ <model>EPYC-Rome-v3</model>
<vendor>AMD</vendor>
<signature family='23' model='49' stepping='0'/>
<feature name='ht'/>
<feature name='monitor'/>
<feature name='osxsave'/>
<feature name='cmt'/>
- <feature name='xsaves'/>
<feature name='mbm_total'/>
<feature name='mbm_local'/>
<feature name='cmp_legacy'/>
@@ -19,8 +18,6 @@
<feature name='topoext'/>
<feature name='perfctr_nb'/>
<feature name='invtsc'/>
- <feature name='ibrs'/>
- <feature name='amd-ssbd'/>
<feature name='lbrv'/>
<feature name='svm-lock'/>
<feature name='tsc-scale'/>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml
b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml
index 486b41815d..f3e5164efc 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml
@@ -1,25 +1,19 @@
<cpu mode='custom' match='exact'>
- <model fallback='forbid'>EPYC</model>
+ <model fallback='forbid'>EPYC-v4</model>
<vendor>AMD</vendor>
<feature policy='require' name='ht'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='osxsave'/>
- <feature policy='require' name='xsaves'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='extapic'/>
<feature policy='require' name='skinit'/>
<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='npt'/>
<feature policy='require' name='lbrv'/>
<feature policy='require' name='svm-lock'/>
- <feature policy='require' name='nrip-save'/>
<feature policy='require' name='tsc-scale'/>
<feature policy='require' name='vmcb-clean'/>
<feature policy='require' name='flushbyasid'/>
@@ -29,4 +23,5 @@
<feature policy='require' name='avic'/>
<feature policy='require' name='v-vmsave-vmload'/>
<feature policy='require' name='vgif'/>
+ <feature policy='disable' name='ibpb'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml
b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml
index 42b8b5f986..1a6ecf839e 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml
@@ -1,27 +1,21 @@
<cpu>
<arch>x86_64</arch>
- <model>EPYC-IBPB</model>
+ <model>EPYC-v4</model>
<vendor>AMD</vendor>
<signature family='23' model='1' stepping='2'/>
<feature name='ht'/>
<feature name='monitor'/>
<feature name='osxsave'/>
- <feature name='xsaves'/>
<feature name='cmp_legacy'/>
<feature name='extapic'/>
<feature name='skinit'/>
<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='npt'/>
<feature name='lbrv'/>
<feature name='svm-lock'/>
- <feature name='nrip-save'/>
<feature name='tsc-scale'/>
<feature name='vmcb-clean'/>
<feature name='flushbyasid'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml
b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml
index 486b41815d..f3e5164efc 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml
@@ -1,25 +1,19 @@
<cpu mode='custom' match='exact'>
- <model fallback='forbid'>EPYC</model>
+ <model fallback='forbid'>EPYC-v4</model>
<vendor>AMD</vendor>
<feature policy='require' name='ht'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='osxsave'/>
- <feature policy='require' name='xsaves'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='extapic'/>
<feature policy='require' name='skinit'/>
<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='npt'/>
<feature policy='require' name='lbrv'/>
<feature policy='require' name='svm-lock'/>
- <feature policy='require' name='nrip-save'/>
<feature policy='require' name='tsc-scale'/>
<feature policy='require' name='vmcb-clean'/>
<feature policy='require' name='flushbyasid'/>
@@ -29,4 +23,5 @@
<feature policy='require' name='avic'/>
<feature policy='require' name='v-vmsave-vmload'/>
<feature policy='require' name='vgif'/>
+ <feature policy='disable' name='ibpb'/>
</cpu>
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 1d29a40f74..60f65fdffe 100644
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
@@ -170,6 +170,7 @@
<model usable='yes'
vendor='Intel'>Haswell-noTSX</model>
<model usable='yes'
vendor='Intel'>Haswell-IBRS</model>
<model usable='yes' vendor='Intel'>Haswell</model>
+ <model usable='no' vendor='AMD'>EPYC-v3</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC</model>
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 7b7420ff8e..01906a6277 100644
--- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
@@ -115,6 +115,7 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='no' vendor='AMD'>EPYC-v3</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC</model>
diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
index f3b3adb19e..12a5d8f66e 100644
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
@@ -169,6 +169,7 @@
<model usable='yes'
vendor='Intel'>Haswell-noTSX</model>
<model usable='yes'
vendor='Intel'>Haswell-IBRS</model>
<model usable='yes' vendor='Intel'>Haswell</model>
+ <model usable='no' vendor='AMD'>EPYC-v3</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC</model>
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 2a8a784813..88291c60de 100644
--- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
@@ -103,6 +103,7 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='yes' vendor='AMD'>EPYC-v3</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
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 272d9bed08..a2bce1003a 100644
--- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
@@ -115,6 +115,7 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='no' vendor='AMD'>EPYC-v3</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC</model>
diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
index 735cd42466..954025cb33 100644
--- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
@@ -102,6 +102,7 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='yes' vendor='AMD'>EPYC-v3</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
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 968cfe68e8..66753cef10 100644
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -103,6 +103,7 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='yes' vendor='AMD'>EPYC-v3</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
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 526f39254e..af223af1b8 100644
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -115,6 +115,7 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='no' vendor='AMD'>EPYC-v3</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC</model>
diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index 9bbb22b0d8..195d523fa7 100644
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -102,6 +102,7 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='yes' vendor='AMD'>EPYC-v3</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
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 66da296d8e..a96f1e23fd 100644
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -103,6 +103,8 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='yes' vendor='AMD'>EPYC-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
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 0ffd95aee6..1a00383168 100644
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -116,6 +116,8 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='no' vendor='AMD'>EPYC-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index 0af8b9d064..e21b8dc2df 100644
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -102,6 +102,8 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='yes' vendor='AMD'>EPYC-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
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 cc2081955d..bfecc6ffe0 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -104,6 +104,8 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='yes' vendor='AMD'>EPYC-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
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 a80c86df4f..5762bc0b90 100644
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -116,6 +116,8 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='no' vendor='AMD'>EPYC-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index 22f8c8a397..ef3ab32795 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -103,6 +103,8 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='yes' vendor='AMD'>EPYC-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
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 782aa792a9..850762a81b 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -104,6 +104,8 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='yes' vendor='AMD'>EPYC-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
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 7ed62fb522..f90c826e27 100644
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -118,6 +118,8 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='no' vendor='AMD'>EPYC-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index e6283ff153..77feb230c9 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -103,6 +103,8 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='yes' vendor='AMD'>EPYC-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
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 50b2ee2ffe..587843dc95 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -105,6 +105,8 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='yes' vendor='AMD'>EPYC-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
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 3a71b54847..7ef5615473 100644
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -119,6 +119,8 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='no' vendor='AMD'>EPYC-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index fa4b912168..1fbfdc229d 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -104,6 +104,8 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='yes' vendor='AMD'>EPYC-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
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 2eec2e3162..8247daf1da 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -104,6 +104,8 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='yes' vendor='AMD'>EPYC-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
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 1ae2a7c342..df0d5c1b86 100644
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -117,6 +117,8 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='no' vendor='AMD'>EPYC-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index 449e1b51d1..197e088d32 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -103,6 +103,8 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='yes' vendor='AMD'>EPYC-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
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 e48a07da28..0e06734522 100644
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -109,6 +109,8 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='yes' vendor='AMD'>EPYC-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
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 69b6be7616..841b640c15 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
@@ -106,6 +106,8 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='no' vendor='AMD'>EPYC-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
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 69b6be7616..841b640c15 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -106,6 +106,8 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='no' vendor='AMD'>EPYC-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
index d116cf2e48..9cafaf2f0f 100644
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -108,6 +108,8 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='yes' vendor='AMD'>EPYC-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
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 2815064abc..564546cf41 100644
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -110,6 +110,8 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='yes' vendor='AMD'>EPYC-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
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 efb5fcb99d..58ce3d8d69 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -111,6 +111,8 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='no' vendor='AMD'>EPYC-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index 07d1d06115..eb5897671c 100644
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -109,6 +109,8 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='yes' vendor='AMD'>EPYC-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
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 4d438efdf7..d865028850 100644
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -41,7 +41,7 @@
</enum>
</mode>
<mode name='host-model' supported='yes'>
- <model fallback='forbid'>EPYC-Rome</model>
+ <model fallback='forbid'>EPYC-Rome-v4</model>
<vendor>AMD</vendor>
<maxphysaddr mode='passthrough' limit='64'/>
<feature policy='require' name='x2apic'/>
@@ -53,7 +53,6 @@
<feature policy='require' name='ssbd'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='invtsc'/>
- <feature policy='require' name='amd-ssbd'/>
<feature policy='require' name='virt-ssbd'/>
<feature policy='require' name='lbrv'/>
<feature policy='require' name='tsc-scale'/>
@@ -69,7 +68,7 @@
<feature policy='require' name='skip-l1dfl-vmentry'/>
<feature policy='require' name='mds-no'/>
<feature policy='require' name='pschange-mc-no'/>
- <feature policy='disable' name='xsaves'/>
+ <feature policy='disable' name='ibrs'/>
</mode>
<mode name='custom' supported='yes'>
<model usable='yes' vendor='unknown'>qemu64</model>
@@ -112,7 +111,13 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='no' vendor='AMD'>EPYC-v4</model>
+ <model usable='no' vendor='AMD'>EPYC-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v4</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v2</model>
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC-Genoa</model>
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 e32cd80c17..192fa20c72 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -112,7 +112,13 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='no' vendor='AMD'>EPYC-v4</model>
+ <model usable='no' vendor='AMD'>EPYC-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v4</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v2</model>
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC-Genoa</model>
diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index 919357e577..51cba16a35 100644
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -40,7 +40,7 @@
</enum>
</mode>
<mode name='host-model' supported='yes'>
- <model fallback='forbid'>EPYC-Rome</model>
+ <model fallback='forbid'>EPYC-Rome-v4</model>
<vendor>AMD</vendor>
<maxphysaddr mode='passthrough' limit='64'/>
<feature policy='require' name='x2apic'/>
@@ -52,7 +52,6 @@
<feature policy='require' name='ssbd'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='invtsc'/>
- <feature policy='require' name='amd-ssbd'/>
<feature policy='require' name='virt-ssbd'/>
<feature policy='require' name='lbrv'/>
<feature policy='require' name='tsc-scale'/>
@@ -68,7 +67,7 @@
<feature policy='require' name='skip-l1dfl-vmentry'/>
<feature policy='require' name='mds-no'/>
<feature policy='require' name='pschange-mc-no'/>
- <feature policy='disable' name='xsaves'/>
+ <feature policy='disable' name='ibrs'/>
</mode>
<mode name='custom' supported='yes'>
<model usable='yes' vendor='unknown'>qemu64</model>
@@ -111,7 +110,13 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='no' vendor='AMD'>EPYC-v4</model>
+ <model usable='no' vendor='AMD'>EPYC-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v4</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v2</model>
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC-Genoa</model>
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 f711a51044..f24fe4789e 100644
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -41,7 +41,7 @@
</enum>
</mode>
<mode name='host-model' supported='yes'>
- <model fallback='forbid'>EPYC-Rome</model>
+ <model fallback='forbid'>EPYC-Rome-v4</model>
<vendor>AMD</vendor>
<maxphysaddr mode='passthrough' limit='64'/>
<feature policy='require' name='x2apic'/>
@@ -53,7 +53,6 @@
<feature policy='require' name='ssbd'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='invtsc'/>
- <feature policy='require' name='amd-ssbd'/>
<feature policy='require' name='virt-ssbd'/>
<feature policy='require' name='lbrv'/>
<feature policy='require' name='tsc-scale'/>
@@ -70,7 +69,7 @@
<feature policy='require' name='mds-no'/>
<feature policy='require' name='pschange-mc-no'/>
<feature policy='require' name='gds-no'/>
- <feature policy='disable' name='xsaves'/>
+ <feature policy='disable' name='ibrs'/>
</mode>
<mode name='custom' supported='yes'>
<model usable='yes' vendor='unknown'>qemu64</model>
@@ -113,7 +112,13 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='no' vendor='AMD'>EPYC-v4</model>
+ <model usable='no' vendor='AMD'>EPYC-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v4</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v2</model>
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC-Genoa</model>
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 784a29acd9..1945ec6561 100644
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -111,7 +111,13 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='no' vendor='AMD'>EPYC-v4</model>
+ <model usable='no' vendor='AMD'>EPYC-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v4</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v2</model>
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC-Genoa</model>
diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index bc060e21b6..2252f8f05e 100644
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -40,7 +40,7 @@
</enum>
</mode>
<mode name='host-model' supported='yes'>
- <model fallback='forbid'>EPYC-Rome</model>
+ <model fallback='forbid'>EPYC-Rome-v4</model>
<vendor>AMD</vendor>
<maxphysaddr mode='passthrough' limit='64'/>
<feature policy='require' name='x2apic'/>
@@ -52,7 +52,6 @@
<feature policy='require' name='ssbd'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='invtsc'/>
- <feature policy='require' name='amd-ssbd'/>
<feature policy='require' name='virt-ssbd'/>
<feature policy='require' name='lbrv'/>
<feature policy='require' name='tsc-scale'/>
@@ -69,7 +68,7 @@
<feature policy='require' name='mds-no'/>
<feature policy='require' name='pschange-mc-no'/>
<feature policy='require' name='gds-no'/>
- <feature policy='disable' name='xsaves'/>
+ <feature policy='disable' name='ibrs'/>
</mode>
<mode name='custom' supported='yes'>
<model usable='yes' vendor='unknown'>qemu64</model>
@@ -112,7 +111,13 @@
<model usable='no'
vendor='Intel'>Haswell-noTSX</model>
<model usable='no' vendor='Intel'>Haswell-IBRS</model>
<model usable='no' vendor='Intel'>Haswell</model>
+ <model usable='no' vendor='AMD'>EPYC-v4</model>
+ <model usable='no' vendor='AMD'>EPYC-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v4</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v3</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v2</model>
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC-Genoa</model>
diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-8.1.0.args
b/tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-8.1.0.args
index 3b733a3c5d..ebc6ca5403 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-8.1.0.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-8.1.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.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel kvm \
--cpu
EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,xsaves=off
\
+-cpu
EPYC-Rome-v4,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,ibrs=off
\
-m size=219136k \
-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-latest.args
b/tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-latest.args
index c11c2118bf..38badeabe8 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-latest.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,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel kvm \
--cpu
EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,xsaves=off
\
+-cpu
EPYC-Rome-v4,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,ibrs=off
\
-m size=219136k \
-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-8.1.0.args
b/tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-8.1.0.args
index 901f279a02..24d88b98de 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-8.1.0.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-8.1.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-q35-8.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel kvm \
--cpu
EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,xsaves=off
\
+-cpu
EPYC-Rome-v4,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,ibrs=off
\
-m size=219136k \
-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-latest.args
b/tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-latest.args
index a9b8f5a7d4..2a114a28d5 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-latest.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 q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel kvm \
--cpu
EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,xsaves=off
\
+-cpu
EPYC-Rome-v4,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,ibrs=off
\
-m size=219136k \
-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-8.1.0.args
b/tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-8.1.0.args
index 3b733a3c5d..ebc6ca5403 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-8.1.0.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-8.1.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.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel kvm \
--cpu
EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,xsaves=off
\
+-cpu
EPYC-Rome-v4,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,ibrs=off
\
-m size=219136k \
-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-latest.args
b/tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-latest.args
index c11c2118bf..38badeabe8 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-latest.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,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel kvm \
--cpu
EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,xsaves=off
\
+-cpu
EPYC-Rome-v4,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,gds-no=on,ibrs=off
\
-m size=219136k \
-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
--
2.41.0
4:07 p.m.
New subject: [PATCH v2 3/9] cpu_map: Add versioned Intel Skylake CPUs
Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com>
---
src/cpu_map/index.xml | 3 +
src/cpu_map/meson.build | 3 +
src/cpu_map/x86_Skylake-Client-v4.xml | 77 +++++++++++++++++
src/cpu_map/x86_Skylake-Server-v4.xml | 83 ++++++++++++++++++
src/cpu_map/x86_Skylake-Server-v5.xml | 85 +++++++++++++++++++
.../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 3 +
.../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 3 +
tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 3 +
.../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 3 +
.../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 3 +
tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 3 +
.../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 3 +
.../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 3 +
tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 3 +
.../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 3 +
.../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 3 +
tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 3 +
.../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 3 +
.../qemu_7.2.0-tcg.x86_64+hvf.xml | 3 +
.../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 3 +
tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 3 +
.../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 3 +
.../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 3 +
tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 3 +
.../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 3 +
.../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 3 +
tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 3 +
.../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 3 +
.../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 3 +
tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 3 +
39 files changed, 335 insertions(+)
create mode 100644 src/cpu_map/x86_Skylake-Client-v4.xml
create mode 100644 src/cpu_map/x86_Skylake-Server-v4.xml
create mode 100644 src/cpu_map/x86_Skylake-Server-v5.xml
diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index 861edc3bb7..a4fe2ec781 100644
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -45,9 +45,12 @@
<include filename='x86_Skylake-Client.xml'/>
<include filename='x86_Skylake-Client-IBRS.xml'/>
<include filename='x86_Skylake-Client-noTSX-IBRS.xml'/>
+ <include filename='x86_Skylake-Client-v4.xml'/>
<include filename='x86_Skylake-Server.xml'/>
<include filename='x86_Skylake-Server-IBRS.xml'/>
<include filename='x86_Skylake-Server-noTSX-IBRS.xml'/>
+ <include filename='x86_Skylake-Server-v4.xml'/>
+ <include filename='x86_Skylake-Server-v5.xml'/>
<include filename='x86_Cascadelake-Server.xml'/>
<include filename='x86_Cascadelake-Server-noTSX.xml'/>
<include filename='x86_Icelake-Client.xml'/>
diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index 68e093e041..f6b95863b3 100644
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -82,9 +82,12 @@ cpumap_data = [
'x86_SapphireRapids.xml',
'x86_Skylake-Client-IBRS.xml',
'x86_Skylake-Client-noTSX-IBRS.xml',
+ 'x86_Skylake-Client-v4.xml',
'x86_Skylake-Client.xml',
'x86_Skylake-Server-IBRS.xml',
'x86_Skylake-Server-noTSX-IBRS.xml',
+ 'x86_Skylake-Server-v4.xml',
+ 'x86_Skylake-Server-v5.xml',
'x86_Skylake-Server.xml',
'x86_Snowridge.xml',
'x86_vendors.xml',
diff --git a/src/cpu_map/x86_Skylake-Client-v4.xml
b/src/cpu_map/x86_Skylake-Client-v4.xml
new file mode 100644
index 0000000000..038ac376b6
--- /dev/null
+++ b/src/cpu_map/x86_Skylake-Client-v4.xml
@@ -0,0 +1,77 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '3'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Core Processor (Skylake)'
+ 'property.model-id': 'Intel Core Processor (Skylake, IBRS, no TSX)'
+ 'version.note': 'IBRS, XSAVES, no TSX'
+-->
+<cpus>
+ <model name='Skylake-Client-v4'>
+ <decode host='on' guest='on'/>
+ <signature family='6' model='94'/>
+ <vendor name='Intel'/>
+ <feature name='3dnowprefetch'/>
+ <feature name='abm'/>
+ <feature name='adx'/>
+ <feature name='aes'/>
+ <feature name='apic'/>
+ <feature name='arat'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='bmi1'/>
+ <feature name='bmi2'/>
+ <feature name='clflush'/>
+ <feature name='cmov'/>
+ <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='fxsr'/>
+ <feature name='invpcid'/>
+ <feature name='lahf_lm'/>
+ <feature name='lm'/>
+ <feature name='mca'/>
+ <feature name='mce'/>
+ <feature name='mmx'/>
+ <feature name='movbe'/>
+ <feature name='msr'/>
+ <feature name='mtrr'/>
+ <feature name='nx'/>
+ <feature name='pae'/>
+ <feature name='pat'/>
+ <feature name='pcid'/>
+ <feature name='pclmuldq'/>
+ <feature name='pge'/>
+ <feature name='pni'/>
+ <feature name='popcnt'/>
+ <feature name='pse'/>
+ <feature name='pse36'/>
+ <feature name='rdrand'/>
+ <feature name='rdseed'/>
+ <feature name='rdtscp'/>
+ <feature name='sep'/>
+ <feature name='smap'/>
+ <feature name='smep'/>
+ <feature name='spec-ctrl'/>
+ <feature name='sse'/>
+ <feature name='sse2'/>
+ <feature name='sse4.1'/>
+ <feature name='sse4.2'/>
+ <feature name='ssse3'/>
+ <feature name='syscall'/>
+ <feature name='tsc'/>
+ <feature name='tsc-deadline'/>
+ <feature name='vme'/>
+ <feature name='x2apic'/>
+ <feature name='xgetbv1'/>
+ <feature name='xsave'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveopt'/>
+ <feature name='xsaves'/>
+ </model>
+</cpus>
diff --git a/src/cpu_map/x86_Skylake-Server-v4.xml
b/src/cpu_map/x86_Skylake-Server-v4.xml
new file mode 100644
index 0000000000..6c864f6b9c
--- /dev/null
+++ b/src/cpu_map/x86_Skylake-Server-v4.xml
@@ -0,0 +1,83 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '4'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Xeon Processor (Skylake)'
+ 'property.model-id': 'Intel Xeon Processor (Skylake, IBRS, no TSX)'
+-->
+<cpus>
+ <model name='Skylake-Server-v4'>
+ <decode host='on' guest='on'/>
+ <signature family='6' model='85'/>
+ <vendor name='Intel'/>
+ <feature name='3dnowprefetch'/>
+ <feature name='abm'/>
+ <feature name='adx'/>
+ <feature name='aes'/>
+ <feature name='apic'/>
+ <feature name='arat'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='bmi1'/>
+ <feature name='bmi2'/>
+ <feature name='clflush'/>
+ <feature name='clwb'/>
+ <feature name='cmov'/>
+ <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='fxsr'/>
+ <feature name='invpcid'/>
+ <feature name='lahf_lm'/>
+ <feature name='lm'/>
+ <feature name='mca'/>
+ <feature name='mce'/>
+ <feature name='mmx'/>
+ <feature name='movbe'/>
+ <feature name='msr'/>
+ <feature name='mtrr'/>
+ <feature name='nx'/>
+ <feature name='pae'/>
+ <feature name='pat'/>
+ <feature name='pcid'/>
+ <feature name='pclmuldq'/>
+ <feature name='pdpe1gb'/>
+ <feature name='pge'/>
+ <feature name='pku'/>
+ <feature name='pni'/>
+ <feature name='popcnt'/>
+ <feature name='pse'/>
+ <feature name='pse36'/>
+ <feature name='rdrand'/>
+ <feature name='rdseed'/>
+ <feature name='rdtscp'/>
+ <feature name='sep'/>
+ <feature name='smap'/>
+ <feature name='smep'/>
+ <feature name='spec-ctrl'/>
+ <feature name='sse'/>
+ <feature name='sse2'/>
+ <feature name='sse4.1'/>
+ <feature name='sse4.2'/>
+ <feature name='ssse3'/>
+ <feature name='syscall'/>
+ <feature name='tsc'/>
+ <feature name='tsc-deadline'/>
+ <feature name='vme'/>
+ <feature name='x2apic'/>
+ <feature name='xgetbv1'/>
+ <feature name='xsave'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveopt'/>
+ </model>
+</cpus>
diff --git a/src/cpu_map/x86_Skylake-Server-v5.xml
b/src/cpu_map/x86_Skylake-Server-v5.xml
new file mode 100644
index 0000000000..f3d49fb5d2
--- /dev/null
+++ b/src/cpu_map/x86_Skylake-Server-v5.xml
@@ -0,0 +1,85 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '4'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Xeon Processor (Skylake)'
+ 'property.model-id': 'Intel Xeon Processor (Skylake, IBRS, no TSX)'
+ 'version.note': 'IBRS, XSAVES, EPT switching, no TSX'
+-->
+<cpus>
+ <model name='Skylake-Server-v5'>
+ <decode host='on' guest='on'/>
+ <signature family='6' model='85'/>
+ <vendor name='Intel'/>
+ <feature name='3dnowprefetch'/>
+ <feature name='abm'/>
+ <feature name='adx'/>
+ <feature name='aes'/>
+ <feature name='apic'/>
+ <feature name='arat'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='bmi1'/>
+ <feature name='bmi2'/>
+ <feature name='clflush'/>
+ <feature name='clwb'/>
+ <feature name='cmov'/>
+ <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='fxsr'/>
+ <feature name='invpcid'/>
+ <feature name='lahf_lm'/>
+ <feature name='lm'/>
+ <feature name='mca'/>
+ <feature name='mce'/>
+ <feature name='mmx'/>
+ <feature name='movbe'/>
+ <feature name='msr'/>
+ <feature name='mtrr'/>
+ <feature name='nx'/>
+ <feature name='pae'/>
+ <feature name='pat'/>
+ <feature name='pcid'/>
+ <feature name='pclmuldq'/>
+ <feature name='pdpe1gb'/>
+ <feature name='pge'/>
+ <feature name='pku'/>
+ <feature name='pni'/>
+ <feature name='popcnt'/>
+ <feature name='pse'/>
+ <feature name='pse36'/>
+ <feature name='rdrand'/>
+ <feature name='rdseed'/>
+ <feature name='rdtscp'/>
+ <feature name='sep'/>
+ <feature name='smap'/>
+ <feature name='smep'/>
+ <feature name='spec-ctrl'/>
+ <feature name='sse'/>
+ <feature name='sse2'/>
+ <feature name='sse4.1'/>
+ <feature name='sse4.2'/>
+ <feature name='ssse3'/>
+ <feature name='syscall'/>
+ <feature name='tsc'/>
+ <feature name='tsc-deadline'/>
+ <feature name='vme'/>
+ <feature name='x2apic'/>
+ <feature name='xgetbv1'/>
+ <feature name='xsave'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveopt'/>
+ <feature name='xsaves'/>
+ </model>
+</cpus>
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 88291c60de..b12748fdd0 100644
--- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
@@ -77,6 +77,7 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
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 a2bce1003a..484c5e96d5 100644
--- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
@@ -89,6 +89,7 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
index 954025cb33..bf636b4b7f 100644
--- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
@@ -76,6 +76,7 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
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 66753cef10..3a21985040 100644
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -77,6 +77,7 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
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 af223af1b8..fcff1c2748 100644
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -89,6 +89,7 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index 195d523fa7..fb3d0d9509 100644
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -76,6 +76,7 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
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 a96f1e23fd..d5ce19b1ab 100644
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -77,6 +77,7 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
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 1a00383168..b50ea993ae 100644
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -90,6 +90,7 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index e21b8dc2df..927ac1a36a 100644
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -76,6 +76,7 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
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 bfecc6ffe0..7244db6d2a 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -78,9 +78,12 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
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 5762bc0b90..4628fba179 100644
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -90,9 +90,12 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index ef3ab32795..9e3c5cd9f1 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -77,9 +77,12 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
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 850762a81b..647c455cff 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -78,9 +78,12 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
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 f90c826e27..39d4b24087 100644
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -92,9 +92,12 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index 77feb230c9..9b58adbf79 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -77,9 +77,12 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
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 587843dc95..4f11b288ec 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -79,9 +79,12 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
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 7ef5615473..b235b3ab7d 100644
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -93,9 +93,12 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index 1fbfdc229d..16b0bc952f 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -78,9 +78,12 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
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 8247daf1da..4f697b85fb 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -80,9 +80,12 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
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 df0d5c1b86..7ef47f9618 100644
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -93,9 +93,12 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index 197e088d32..035335fa43 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -79,9 +79,12 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
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 0e06734522..1a28924082 100644
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -85,9 +85,12 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
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 841b640c15..defb547029 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
@@ -82,9 +82,12 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
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 841b640c15..defb547029 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -82,9 +82,12 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
index 9cafaf2f0f..cbb99f747e 100644
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -84,9 +84,12 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
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 564546cf41..52b1f41b8e 100644
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -85,9 +85,12 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
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 58ce3d8d69..6b778d16be 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -86,9 +86,12 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index eb5897671c..cbd557b0f1 100644
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -84,9 +84,12 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
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 d865028850..af8cf93f0a 100644
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -86,9 +86,12 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
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 192fa20c72..8edbcf5e97 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -87,9 +87,12 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index 51cba16a35..c048ca0a7c 100644
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -85,9 +85,12 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
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 f24fe4789e..d9552ecf2b 100644
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -87,9 +87,12 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
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 1945ec6561..fd65a4479a 100644
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -86,9 +86,12 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index 2252f8f05e..d211300033 100644
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -86,9 +86,12 @@
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
--
2.41.0
4:07 p.m.
New subject: [PATCH v2 4/9] cpu_map: Add versioned Intel Cascadelake CPUs
Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com>
---
src/cpu_map/index.xml | 3 +
src/cpu_map/meson.build | 3 +
src/cpu_map/x86_Cascadelake-Server-v2.xml | 93 +++++++++++++++++++
src/cpu_map/x86_Cascadelake-Server-v4.xml | 91 ++++++++++++++++++
src/cpu_map/x86_Cascadelake-Server-v5.xml | 92 ++++++++++++++++++
.../x86_64-cpuid-Xeon-Platinum-8268-guest.xml | 9 +-
.../x86_64-cpuid-Xeon-Platinum-8268-host.xml | 9 +-
.../x86_64-cpuid-Xeon-Platinum-9242-guest.xml | 9 +-
.../x86_64-cpuid-Xeon-Platinum-9242-host.xml | 9 +-
.../x86_64-cpuid-Xeon-Platinum-9242-json.xml | 9 +-
..._64-cpuid-baseline-Cascadelake+Icelake.xml | 9 +-
...-cpuid-baseline-Cooperlake+Cascadelake.xml | 9 +-
...6_64-cpuid-baseline-Cooperlake+Icelake.xml | 9 +-
.../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 2 +
.../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 2 +
tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 2 +
.../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 2 +
.../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 2 +
tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 2 +
.../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 2 +
.../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 2 +
tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 2 +
.../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 3 +
.../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 3 +
tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 3 +
.../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 3 +
.../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 3 +
tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 3 +
.../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 3 +
.../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 3 +
tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 3 +
.../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 3 +
.../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 3 +
tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 3 +
.../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 3 +
.../qemu_7.2.0-tcg.x86_64+hvf.xml | 3 +
.../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 3 +
tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 3 +
.../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 3 +
.../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 3 +
tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 3 +
.../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 3 +
.../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 3 +
tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 3 +
.../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 3 +
.../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 3 +
tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 3 +
53 files changed, 399 insertions(+), 54 deletions(-)
create mode 100644 src/cpu_map/x86_Cascadelake-Server-v2.xml
create mode 100644 src/cpu_map/x86_Cascadelake-Server-v4.xml
create mode 100644 src/cpu_map/x86_Cascadelake-Server-v5.xml
diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index a4fe2ec781..ad6361ee51 100644
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -53,6 +53,9 @@
<include filename='x86_Skylake-Server-v5.xml'/>
<include filename='x86_Cascadelake-Server.xml'/>
<include filename='x86_Cascadelake-Server-noTSX.xml'/>
+ <include filename='x86_Cascadelake-Server-v2.xml'/>
+ <include filename='x86_Cascadelake-Server-v4.xml'/>
+ <include filename='x86_Cascadelake-Server-v5.xml'/>
<include filename='x86_Icelake-Client.xml'/>
<include filename='x86_Icelake-Client-noTSX.xml'/>
<include filename='x86_Icelake-Server.xml'/>
diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index f6b95863b3..7a3712280a 100644
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -29,6 +29,9 @@ cpumap_data = [
'x86_Broadwell-noTSX.xml',
'x86_Broadwell.xml',
'x86_Cascadelake-Server-noTSX.xml',
+ 'x86_Cascadelake-Server-v2.xml',
+ 'x86_Cascadelake-Server-v4.xml',
+ 'x86_Cascadelake-Server-v5.xml',
'x86_Cascadelake-Server.xml',
'x86_Conroe.xml',
'x86_Cooperlake.xml',
diff --git a/src/cpu_map/x86_Cascadelake-Server-v2.xml
b/src/cpu_map/x86_Cascadelake-Server-v2.xml
new file mode 100644
index 0000000000..5152f0390b
--- /dev/null
+++ b/src/cpu_map/x86_Cascadelake-Server-v2.xml
@@ -0,0 +1,93 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '6'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Xeon Processor (Cascadelake)'
+ 'version.note': 'ARCH_CAPABILITIES'
+-->
+<cpus>
+ <model name='Cascadelake-Server-v2'>
+ <decode host='on' guest='on'/>
+ <signature family='6' model='85'/>
+ <vendor name='Intel'/>
+ <feature name='3dnowprefetch'/>
+ <feature name='abm'/>
+ <feature name='adx'/>
+ <feature name='aes'/>
+ <feature name='apic'/>
+ <feature name='arat'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='bmi1'/>
+ <feature name='bmi2'/>
+ <feature name='clflush'/>
+ <feature name='clflushopt'/>
+ <feature name='clwb'/>
+ <feature name='cmov'/>
+ <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='fxsr'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='lahf_lm'/>
+ <feature name='lm'/>
+ <feature name='mca'/>
+ <feature name='mce'/>
+ <feature name='mds-no'/>
+ <feature name='mmx'/>
+ <feature name='movbe'/>
+ <feature name='msr'/>
+ <feature name='mtrr'/>
+ <feature name='nx'/>
+ <feature name='pae'/>
+ <feature name='pat'/>
+ <feature name='pcid'/>
+ <feature name='pclmuldq'/>
+ <feature name='pdpe1gb'/>
+ <feature name='pge'/>
+ <feature name='pku'/>
+ <feature name='pni'/>
+ <feature name='popcnt'/>
+ <feature name='pse'/>
+ <feature name='pse36'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdrand'/>
+ <feature name='rdseed'/>
+ <feature name='rdtscp'/>
+ <feature name='rtm'/>
+ <feature name='sep'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='smap'/>
+ <feature name='smep'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='sse'/>
+ <feature name='sse2'/>
+ <feature name='sse4.1'/>
+ <feature name='sse4.2'/>
+ <feature name='ssse3'/>
+ <feature name='syscall'/>
+ <feature name='tsc'/>
+ <feature name='tsc-deadline'/>
+ <feature name='vme'/>
+ <feature name='x2apic'/>
+ <feature name='xgetbv1'/>
+ <feature name='xsave'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveopt'/>
+ </model>
+</cpus>
diff --git a/src/cpu_map/x86_Cascadelake-Server-v4.xml
b/src/cpu_map/x86_Cascadelake-Server-v4.xml
new file mode 100644
index 0000000000..b2173d1308
--- /dev/null
+++ b/src/cpu_map/x86_Cascadelake-Server-v4.xml
@@ -0,0 +1,91 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '6'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Xeon Processor (Cascadelake)'
+ 'version.note': 'ARCH_CAPABILITIES, no TSX'
+-->
+<cpus>
+ <model name='Cascadelake-Server-v4'>
+ <decode host='on' guest='on'/>
+ <signature family='6' model='85'/>
+ <vendor name='Intel'/>
+ <feature name='3dnowprefetch'/>
+ <feature name='abm'/>
+ <feature name='adx'/>
+ <feature name='aes'/>
+ <feature name='apic'/>
+ <feature name='arat'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='bmi1'/>
+ <feature name='bmi2'/>
+ <feature name='clflush'/>
+ <feature name='clflushopt'/>
+ <feature name='clwb'/>
+ <feature name='cmov'/>
+ <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='fxsr'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='lahf_lm'/>
+ <feature name='lm'/>
+ <feature name='mca'/>
+ <feature name='mce'/>
+ <feature name='mds-no'/>
+ <feature name='mmx'/>
+ <feature name='movbe'/>
+ <feature name='msr'/>
+ <feature name='mtrr'/>
+ <feature name='nx'/>
+ <feature name='pae'/>
+ <feature name='pat'/>
+ <feature name='pcid'/>
+ <feature name='pclmuldq'/>
+ <feature name='pdpe1gb'/>
+ <feature name='pge'/>
+ <feature name='pku'/>
+ <feature name='pni'/>
+ <feature name='popcnt'/>
+ <feature name='pse'/>
+ <feature name='pse36'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdrand'/>
+ <feature name='rdseed'/>
+ <feature name='rdtscp'/>
+ <feature name='sep'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='smap'/>
+ <feature name='smep'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='sse'/>
+ <feature name='sse2'/>
+ <feature name='sse4.1'/>
+ <feature name='sse4.2'/>
+ <feature name='ssse3'/>
+ <feature name='syscall'/>
+ <feature name='tsc'/>
+ <feature name='tsc-deadline'/>
+ <feature name='vme'/>
+ <feature name='x2apic'/>
+ <feature name='xgetbv1'/>
+ <feature name='xsave'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveopt'/>
+ </model>
+</cpus>
diff --git a/src/cpu_map/x86_Cascadelake-Server-v5.xml
b/src/cpu_map/x86_Cascadelake-Server-v5.xml
new file mode 100644
index 0000000000..f5d15cadb6
--- /dev/null
+++ b/src/cpu_map/x86_Cascadelake-Server-v5.xml
@@ -0,0 +1,92 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '6'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Xeon Processor (Cascadelake)'
+ 'version.note': 'ARCH_CAPABILITIES, EPT switching, XSAVES, no TSX'
+-->
+<cpus>
+ <model name='Cascadelake-Server-v5'>
+ <decode host='on' guest='on'/>
+ <signature family='6' model='85'/>
+ <vendor name='Intel'/>
+ <feature name='3dnowprefetch'/>
+ <feature name='abm'/>
+ <feature name='adx'/>
+ <feature name='aes'/>
+ <feature name='apic'/>
+ <feature name='arat'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='bmi1'/>
+ <feature name='bmi2'/>
+ <feature name='clflush'/>
+ <feature name='clflushopt'/>
+ <feature name='clwb'/>
+ <feature name='cmov'/>
+ <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='fxsr'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='lahf_lm'/>
+ <feature name='lm'/>
+ <feature name='mca'/>
+ <feature name='mce'/>
+ <feature name='mds-no'/>
+ <feature name='mmx'/>
+ <feature name='movbe'/>
+ <feature name='msr'/>
+ <feature name='mtrr'/>
+ <feature name='nx'/>
+ <feature name='pae'/>
+ <feature name='pat'/>
+ <feature name='pcid'/>
+ <feature name='pclmuldq'/>
+ <feature name='pdpe1gb'/>
+ <feature name='pge'/>
+ <feature name='pku'/>
+ <feature name='pni'/>
+ <feature name='popcnt'/>
+ <feature name='pse'/>
+ <feature name='pse36'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdrand'/>
+ <feature name='rdseed'/>
+ <feature name='rdtscp'/>
+ <feature name='sep'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='smap'/>
+ <feature name='smep'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='sse'/>
+ <feature name='sse2'/>
+ <feature name='sse4.1'/>
+ <feature name='sse4.2'/>
+ <feature name='ssse3'/>
+ <feature name='syscall'/>
+ <feature name='tsc'/>
+ <feature name='tsc-deadline'/>
+ <feature name='vme'/>
+ <feature name='x2apic'/>
+ <feature name='xgetbv1'/>
+ <feature name='xsave'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveopt'/>
+ <feature name='xsaves'/>
+ </model>
+</cpus>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
index 8fd1611842..9cd04b3f9a 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
@@ -1,5 +1,5 @@
<cpu mode='custom' match='exact'>
- <model fallback='forbid'>Cascadelake-Server</model>
+ <model fallback='forbid'>Cascadelake-Server-v2</model>
<vendor>Intel</vendor>
<feature policy='require' name='ds'/>
<feature policy='require' name='acpi'/>
@@ -20,19 +20,14 @@
<feature policy='require' name='osxsave'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmt'/>
+ <feature policy='require' name='mpx'/>
<feature policy='require' name='intel-pt'/>
- <feature policy='require' name='pku'/>
<feature policy='require' name='ospke'/>
<feature policy='require' name='md-clear'/>
<feature policy='require' name='stibp'/>
<feature policy='require' name='flush-l1d'/>
- <feature policy='require' name='arch-capabilities'/>
<feature policy='require' name='xsaves'/>
<feature policy='require' name='mbm_total'/>
<feature policy='require' name='mbm_local'/>
<feature policy='require' name='invtsc'/>
- <feature policy='require' name='rdctl-no'/>
- <feature policy='require' name='ibrs-all'/>
- <feature policy='require' name='skip-l1dfl-vmentry'/>
- <feature policy='require' name='mds-no'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
index 7055c72112..b143b792f6 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
@@ -1,6 +1,6 @@
<cpu>
<arch>x86_64</arch>
- <model>Cascadelake-Server</model>
+ <model>Cascadelake-Server-v2</model>
<vendor>Intel</vendor>
<signature family='6' model='85' stepping='6'/>
<feature name='ds'/>
@@ -22,19 +22,14 @@
<feature name='osxsave'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
+ <feature name='mpx'/>
<feature name='intel-pt'/>
- <feature name='pku'/>
<feature name='ospke'/>
<feature name='md-clear'/>
<feature name='stibp'/>
<feature name='flush-l1d'/>
- <feature name='arch-capabilities'/>
<feature name='xsaves'/>
<feature name='mbm_total'/>
<feature name='mbm_local'/>
<feature name='invtsc'/>
- <feature name='rdctl-no'/>
- <feature name='ibrs-all'/>
- <feature name='skip-l1dfl-vmentry'/>
- <feature name='mds-no'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml
index 88c2d84d65..d14d8a325f 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml
@@ -1,5 +1,5 @@
<cpu mode='custom' match='exact'>
- <model fallback='forbid'>Cascadelake-Server</model>
+ <model fallback='forbid'>Cascadelake-Server-v2</model>
<vendor>Intel</vendor>
<feature policy='require' name='ds'/>
<feature policy='require' name='acpi'/>
@@ -20,20 +20,15 @@
<feature policy='require' name='osxsave'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmt'/>
+ <feature policy='require' name='mpx'/>
<feature policy='require' name='intel-pt'/>
- <feature policy='require' name='pku'/>
<feature policy='require' name='ospke'/>
<feature policy='require' name='md-clear'/>
<feature policy='require' name='stibp'/>
<feature policy='require' name='flush-l1d'/>
- <feature policy='require' name='arch-capabilities'/>
<feature policy='require' name='xsaves'/>
<feature policy='require' name='mbm_total'/>
<feature policy='require' name='mbm_local'/>
<feature policy='require' name='invtsc'/>
- <feature policy='require' name='rdctl-no'/>
- <feature policy='require' name='ibrs-all'/>
- <feature policy='require' name='skip-l1dfl-vmentry'/>
- <feature policy='require' name='mds-no'/>
<feature policy='require' name='tsx-ctrl'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
index 5e59520919..332507b4c6 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
@@ -1,6 +1,6 @@
<cpu>
<arch>x86_64</arch>
- <model>Cascadelake-Server</model>
+ <model>Cascadelake-Server-v2</model>
<vendor>Intel</vendor>
<signature family='6' model='85' stepping='7'/>
<feature name='ds'/>
@@ -22,20 +22,15 @@
<feature name='osxsave'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
+ <feature name='mpx'/>
<feature name='intel-pt'/>
- <feature name='pku'/>
<feature name='ospke'/>
<feature name='md-clear'/>
<feature name='stibp'/>
<feature name='flush-l1d'/>
- <feature name='arch-capabilities'/>
<feature name='xsaves'/>
<feature name='mbm_total'/>
<feature name='mbm_local'/>
<feature name='invtsc'/>
- <feature name='rdctl-no'/>
- <feature name='ibrs-all'/>
- <feature name='skip-l1dfl-vmentry'/>
- <feature name='mds-no'/>
<feature name='tsx-ctrl'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
index ac0e520767..035959858e 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
@@ -1,22 +1,17 @@
<cpu mode='custom' match='exact'>
- <model fallback='forbid'>Cascadelake-Server</model>
+ <model fallback='forbid'>Cascadelake-Server-v2</model>
<vendor>Intel</vendor>
<feature policy='require' name='ss'/>
<feature policy='require' name='vmx'/>
<feature policy='require' name='hypervisor'/>
<feature policy='require' name='tsc_adjust'/>
+ <feature policy='require' name='mpx'/>
<feature policy='require' name='umip'/>
- <feature policy='require' name='pku'/>
<feature policy='require' name='md-clear'/>
<feature policy='require' name='stibp'/>
- <feature policy='require' name='arch-capabilities'/>
<feature policy='require' name='xsaves'/>
<feature policy='require' name='ibpb'/>
<feature policy='require' name='amd-ssbd'/>
- <feature policy='require' name='rdctl-no'/>
- <feature policy='require' name='ibrs-all'/>
- <feature policy='require' name='skip-l1dfl-vmentry'/>
- <feature policy='require' name='mds-no'/>
<feature policy='require' name='pschange-mc-no'/>
<feature policy='require' name='tsx-ctrl'/>
<feature policy='require' name='vmx-ins-outs'/>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Icelake.xml
b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Icelake.xml
index 071c799ba2..3e1f526c7b 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Icelake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Icelake.xml
@@ -1,15 +1,12 @@
<cpu mode='custom' match='exact'>
- <model fallback='allow'>Cascadelake-Server</model>
+ <model fallback='allow'>Cascadelake-Server-v2</model>
<vendor>Intel</vendor>
<feature policy='require' name='ss'/>
<feature policy='require' name='hypervisor'/>
<feature policy='require' name='tsc_adjust'/>
+ <feature policy='require' name='mpx'/>
<feature policy='require' name='umip'/>
- <feature policy='require' name='pku'/>
<feature policy='require' name='stibp'/>
- <feature policy='require' name='arch-capabilities'/>
<feature policy='require' name='xsaves'/>
- <feature policy='require' name='rdctl-no'/>
- <feature policy='require' name='ibrs-all'/>
- <feature policy='require' name='skip-l1dfl-vmentry'/>
+ <feature policy='disable' name='mds-no'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml
b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml
index f9e9c476b5..010071e634 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml
@@ -1,22 +1,17 @@
<cpu mode='custom' match='exact'>
- <model fallback='allow'>Cascadelake-Server</model>
+ <model fallback='allow'>Cascadelake-Server-v2</model>
<vendor>Intel</vendor>
<feature policy='require' name='ss'/>
<feature policy='require' name='vmx'/>
<feature policy='require' name='hypervisor'/>
<feature policy='require' name='tsc_adjust'/>
+ <feature policy='require' name='mpx'/>
<feature policy='require' name='umip'/>
- <feature policy='require' name='pku'/>
<feature policy='require' name='md-clear'/>
<feature policy='require' name='stibp'/>
- <feature policy='require' name='arch-capabilities'/>
<feature policy='require' name='xsaves'/>
<feature policy='require' name='ibpb'/>
<feature policy='require' name='amd-ssbd'/>
- <feature policy='require' name='rdctl-no'/>
- <feature policy='require' name='ibrs-all'/>
- <feature policy='require' name='skip-l1dfl-vmentry'/>
- <feature policy='require' name='mds-no'/>
<feature policy='require' name='pschange-mc-no'/>
<feature policy='require' name='tsx-ctrl'/>
<feature policy='require' name='vmx-ins-outs'/>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Icelake.xml
b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Icelake.xml
index 071c799ba2..3e1f526c7b 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Icelake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Icelake.xml
@@ -1,15 +1,12 @@
<cpu mode='custom' match='exact'>
- <model fallback='allow'>Cascadelake-Server</model>
+ <model fallback='allow'>Cascadelake-Server-v2</model>
<vendor>Intel</vendor>
<feature policy='require' name='ss'/>
<feature policy='require' name='hypervisor'/>
<feature policy='require' name='tsc_adjust'/>
+ <feature policy='require' name='mpx'/>
<feature policy='require' name='umip'/>
- <feature policy='require' name='pku'/>
<feature policy='require' name='stibp'/>
- <feature policy='require' name='arch-capabilities'/>
<feature policy='require' name='xsaves'/>
- <feature policy='require' name='rdctl-no'/>
- <feature policy='require' name='ibrs-all'/>
- <feature policy='require' name='skip-l1dfl-vmentry'/>
+ <feature policy='disable' name='mds-no'/>
</cpu>
diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
index 152f201ff9..fa42d6eca4 100644
--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
@@ -174,6 +174,7 @@
<model usable='no' vendor='AMD'>EPYC</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='yes'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
index cea9377cfe..1efdd0aa97 100644
--- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
@@ -119,6 +119,7 @@
<model usable='no' vendor='AMD'>EPYC</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
index 8b7cf44d6d..d83a7f112d 100644
--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
@@ -173,6 +173,7 @@
<model usable='no' vendor='AMD'>EPYC</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='yes'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
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 60f65fdffe..5de4260314 100644
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
@@ -177,6 +177,7 @@
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='yes'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
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 01906a6277..4eb1986759 100644
--- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
@@ -122,6 +122,7 @@
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
index 12a5d8f66e..f84b220e8e 100644
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
@@ -176,6 +176,7 @@
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='yes'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
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 b12748fdd0..cb94e1e1c8 100644
--- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
@@ -111,6 +111,8 @@
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
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 484c5e96d5..3f30474a73 100644
--- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
@@ -123,6 +123,8 @@
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
index bf636b4b7f..eaad6e8cca 100644
--- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
@@ -110,6 +110,8 @@
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
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 3a21985040..c2043d7f08 100644
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -111,6 +111,8 @@
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
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 fcff1c2748..7c9b66939a 100644
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -123,6 +123,8 @@
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index fb3d0d9509..d86f352621 100644
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -110,6 +110,8 @@
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
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 d5ce19b1ab..0ff9c7eba2 100644
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -113,6 +113,8 @@
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
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 b50ea993ae..78eb7fcbc6 100644
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -126,6 +126,8 @@
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index 927ac1a36a..dce08a5a1c 100644
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -112,6 +112,8 @@
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
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 7244db6d2a..5d19c3a90b 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -116,6 +116,9 @@
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
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 4628fba179..1b4cc4864f 100644
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -128,6 +128,9 @@
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index 9e3c5cd9f1..31f3758a55 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -115,6 +115,9 @@
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
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 647c455cff..5576cdf6c8 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -116,6 +116,9 @@
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
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 39d4b24087..fd9d5579b5 100644
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -130,6 +130,9 @@
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index 9b58adbf79..f0353dd8f6 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -115,6 +115,9 @@
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
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 4f11b288ec..620f0fb599 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -117,6 +117,9 @@
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
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 b235b3ab7d..3f02ef2c6a 100644
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -131,6 +131,9 @@
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index 16b0bc952f..dac66dd7db 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -116,6 +116,9 @@
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
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 4f697b85fb..b4b77472a3 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -116,6 +116,9 @@
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
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 7ef47f9618..4f6bd7150d 100644
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -129,6 +129,9 @@
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index 035335fa43..4fc18217b8 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -115,6 +115,9 @@
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
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 1a28924082..6980a3bb98 100644
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -121,6 +121,9 @@
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
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 defb547029..0b4eef2e3d 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
@@ -118,6 +118,9 @@
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
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 defb547029..0b4eef2e3d 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -118,6 +118,9 @@
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
index cbb99f747e..bbca4704a9 100644
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -120,6 +120,9 @@
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
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 52b1f41b8e..2271fd3b9a 100644
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -122,6 +122,9 @@
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
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 6b778d16be..57265614a3 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -123,6 +123,9 @@
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index cbd557b0f1..122a363d29 100644
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -121,6 +121,9 @@
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
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 af8cf93f0a..c80f817963 100644
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -128,6 +128,9 @@
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
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 8edbcf5e97..4806b18901 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -129,6 +129,9 @@
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index c048ca0a7c..7a61de39c3 100644
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -127,6 +127,9 @@
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
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 d9552ecf2b..cd068f19e2 100644
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -129,6 +129,9 @@
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
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 fd65a4479a..5416f5e6b1 100644
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -128,6 +128,9 @@
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index d211300033..c11ffd3015 100644
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -128,6 +128,9 @@
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
--
2.41.0
4:07 p.m.
New subject: [PATCH v2 5/9] cpu_map: Add versioned Intel Icelake CPUs
Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com>
---
src/cpu_map/index.xml | 4 +
src/cpu_map/meson.build | 4 +
src/cpu_map/x86_Icelake-Server-v3.xml | 103 +++++++++++++++++
src/cpu_map/x86_Icelake-Server-v4.xml | 108 +++++++++++++++++
src/cpu_map/x86_Icelake-Server-v5.xml | 109 ++++++++++++++++++
src/cpu_map/x86_Icelake-Server-v6.xml | 109 ++++++++++++++++++
.../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 2 +
.../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 2 +
tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 2 +
.../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 2 +
.../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 2 +
tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 2 +
.../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 2 +
.../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 2 +
tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 2 +
.../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 3 +
.../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 3 +
tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 3 +
.../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 3 +
.../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 3 +
tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 3 +
.../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 4 +
.../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 4 +
tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 4 +
.../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 4 +
.../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 4 +
tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 4 +
.../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 4 +
.../qemu_7.2.0-tcg.x86_64+hvf.xml | 4 +
.../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 4 +
tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 4 +
.../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 4 +
.../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 4 +
tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 4 +
.../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 4 +
.../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 4 +
tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 4 +
.../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 4 +
.../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 4 +
tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 4 +
43 files changed, 552 insertions(+)
create mode 100644 src/cpu_map/x86_Icelake-Server-v3.xml
create mode 100644 src/cpu_map/x86_Icelake-Server-v4.xml
create mode 100644 src/cpu_map/x86_Icelake-Server-v5.xml
create mode 100644 src/cpu_map/x86_Icelake-Server-v6.xml
diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index ad6361ee51..c0971c9391 100644
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -60,6 +60,10 @@
<include filename='x86_Icelake-Client-noTSX.xml'/>
<include filename='x86_Icelake-Server.xml'/>
<include filename='x86_Icelake-Server-noTSX.xml'/>
+ <include filename='x86_Icelake-Server-v3.xml'/>
+ <include filename='x86_Icelake-Server-v4.xml'/>
+ <include filename='x86_Icelake-Server-v5.xml'/>
+ <include filename='x86_Icelake-Server-v6.xml'/>
<include filename='x86_Cooperlake.xml'/>
<include filename='x86_Snowridge.xml'/>
<include filename='x86_SapphireRapids.xml'/>
diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index 7a3712280a..6e77f78b1c 100644
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -59,6 +59,10 @@ cpumap_data = [
'x86_Icelake-Client-noTSX.xml',
'x86_Icelake-Client.xml',
'x86_Icelake-Server-noTSX.xml',
+ 'x86_Icelake-Server-v3.xml',
+ 'x86_Icelake-Server-v4.xml',
+ 'x86_Icelake-Server-v5.xml',
+ 'x86_Icelake-Server-v6.xml',
'x86_Icelake-Server.xml',
'x86_IvyBridge-IBRS.xml',
'x86_IvyBridge.xml',
diff --git a/src/cpu_map/x86_Icelake-Server-v3.xml
b/src/cpu_map/x86_Icelake-Server-v3.xml
new file mode 100644
index 0000000000..070951108a
--- /dev/null
+++ b/src/cpu_map/x86_Icelake-Server-v3.xml
@@ -0,0 +1,103 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '0'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Xeon Processor (Icelake)'
+ 'version.note': 'no TSX'
+-->
+<cpus>
+ <model name='Icelake-Server-v3'>
+ <decode host='on' guest='on'/>
+ <signature family='6' model='134'/>
+ <vendor name='Intel'/>
+ <feature name='3dnowprefetch'/>
+ <feature name='abm'/>
+ <feature name='adx'/>
+ <feature name='aes'/>
+ <feature name='apic'/>
+ <feature name='arat'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512bitalg'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vbmi'/>
+ <feature name='avx512vbmi2'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='bmi1'/>
+ <feature name='bmi2'/>
+ <feature name='clflush'/>
+ <feature name='clflushopt'/>
+ <feature name='clwb'/>
+ <feature name='cmov'/>
+ <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='fxsr'/>
+ <feature name='gfni'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='la57'/>
+ <feature name='lahf_lm'/>
+ <feature name='lm'/>
+ <feature name='mca'/>
+ <feature name='mce'/>
+ <feature name='mds-no'/>
+ <feature name='mmx'/>
+ <feature name='movbe'/>
+ <feature name='msr'/>
+ <feature name='mtrr'/>
+ <feature name='nx'/>
+ <feature name='pae'/>
+ <feature name='pat'/>
+ <feature name='pcid'/>
+ <feature name='pclmuldq'/>
+ <feature name='pdpe1gb'/>
+ <feature name='pge'/>
+ <feature name='pku'/>
+ <feature name='pni'/>
+ <feature name='popcnt'/>
+ <feature name='pschange-mc-no'/>
+ <feature name='pse'/>
+ <feature name='pse36'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdrand'/>
+ <feature name='rdseed'/>
+ <feature name='rdtscp'/>
+ <feature name='sep'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='smap'/>
+ <feature name='smep'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='sse'/>
+ <feature name='sse2'/>
+ <feature name='sse4.1'/>
+ <feature name='sse4.2'/>
+ <feature name='ssse3'/>
+ <feature name='syscall'/>
+ <feature name='taa-no'/>
+ <feature name='tsc'/>
+ <feature name='tsc-deadline'/>
+ <feature name='umip'/>
+ <feature name='vaes'/>
+ <feature name='vme'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='wbnoinvd'/>
+ <feature name='x2apic'/>
+ <feature name='xgetbv1'/>
+ <feature name='xsave'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveopt'/>
+ </model>
+</cpus>
diff --git a/src/cpu_map/x86_Icelake-Server-v4.xml
b/src/cpu_map/x86_Icelake-Server-v4.xml
new file mode 100644
index 0000000000..a65271e801
--- /dev/null
+++ b/src/cpu_map/x86_Icelake-Server-v4.xml
@@ -0,0 +1,108 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '0'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Xeon Processor (Icelake)'
+ 'version.note': 'no TSX'
+ 'property.model': '106'
+-->
+<cpus>
+ <model name='Icelake-Server-v4'>
+ <decode host='on' guest='on'/>
+ <signature family='6' model='134'/>
+ <vendor name='Intel'/>
+ <feature name='3dnowprefetch'/>
+ <feature name='abm'/>
+ <feature name='adx'/>
+ <feature name='aes'/>
+ <feature name='apic'/>
+ <feature name='arat'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512bitalg'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512ifma'/>
+ <feature name='avx512vbmi'/>
+ <feature name='avx512vbmi2'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='bmi1'/>
+ <feature name='bmi2'/>
+ <feature name='clflush'/>
+ <feature name='clflushopt'/>
+ <feature name='clwb'/>
+ <feature name='cmov'/>
+ <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='gfni'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='la57'/>
+ <feature name='lahf_lm'/>
+ <feature name='lm'/>
+ <feature name='mca'/>
+ <feature name='mce'/>
+ <feature name='mds-no'/>
+ <feature name='mmx'/>
+ <feature name='movbe'/>
+ <feature name='msr'/>
+ <feature name='mtrr'/>
+ <feature name='nx'/>
+ <feature name='pae'/>
+ <feature name='pat'/>
+ <feature name='pcid'/>
+ <feature name='pclmuldq'/>
+ <feature name='pdpe1gb'/>
+ <feature name='pge'/>
+ <feature name='pku'/>
+ <feature name='pni'/>
+ <feature name='popcnt'/>
+ <feature name='pschange-mc-no'/>
+ <feature name='pse'/>
+ <feature name='pse36'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdpid'/>
+ <feature name='rdrand'/>
+ <feature name='rdseed'/>
+ <feature name='rdtscp'/>
+ <feature name='sep'/>
+ <feature name='sha-ni'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='smap'/>
+ <feature name='smep'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='sse'/>
+ <feature name='sse2'/>
+ <feature name='sse4.1'/>
+ <feature name='sse4.2'/>
+ <feature name='ssse3'/>
+ <feature name='syscall'/>
+ <feature name='taa-no'/>
+ <feature name='tsc'/>
+ <feature name='tsc-deadline'/>
+ <feature name='umip'/>
+ <feature name='vaes'/>
+ <feature name='vme'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='wbnoinvd'/>
+ <feature name='x2apic'/>
+ <feature name='xgetbv1'/>
+ <feature name='xsave'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveopt'/>
+ </model>
+</cpus>
diff --git a/src/cpu_map/x86_Icelake-Server-v5.xml
b/src/cpu_map/x86_Icelake-Server-v5.xml
new file mode 100644
index 0000000000..f908d06b0d
--- /dev/null
+++ b/src/cpu_map/x86_Icelake-Server-v5.xml
@@ -0,0 +1,109 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '0'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Xeon Processor (Icelake)'
+ 'version.note': 'XSAVES'
+ 'property.model': '106'
+-->
+<cpus>
+ <model name='Icelake-Server-v5'>
+ <decode host='on' guest='on'/>
+ <signature family='6' model='134'/>
+ <vendor name='Intel'/>
+ <feature name='3dnowprefetch'/>
+ <feature name='abm'/>
+ <feature name='adx'/>
+ <feature name='aes'/>
+ <feature name='apic'/>
+ <feature name='arat'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512bitalg'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512ifma'/>
+ <feature name='avx512vbmi'/>
+ <feature name='avx512vbmi2'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='bmi1'/>
+ <feature name='bmi2'/>
+ <feature name='clflush'/>
+ <feature name='clflushopt'/>
+ <feature name='clwb'/>
+ <feature name='cmov'/>
+ <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='gfni'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='la57'/>
+ <feature name='lahf_lm'/>
+ <feature name='lm'/>
+ <feature name='mca'/>
+ <feature name='mce'/>
+ <feature name='mds-no'/>
+ <feature name='mmx'/>
+ <feature name='movbe'/>
+ <feature name='msr'/>
+ <feature name='mtrr'/>
+ <feature name='nx'/>
+ <feature name='pae'/>
+ <feature name='pat'/>
+ <feature name='pcid'/>
+ <feature name='pclmuldq'/>
+ <feature name='pdpe1gb'/>
+ <feature name='pge'/>
+ <feature name='pku'/>
+ <feature name='pni'/>
+ <feature name='popcnt'/>
+ <feature name='pschange-mc-no'/>
+ <feature name='pse'/>
+ <feature name='pse36'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdpid'/>
+ <feature name='rdrand'/>
+ <feature name='rdseed'/>
+ <feature name='rdtscp'/>
+ <feature name='sep'/>
+ <feature name='sha-ni'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='smap'/>
+ <feature name='smep'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='sse'/>
+ <feature name='sse2'/>
+ <feature name='sse4.1'/>
+ <feature name='sse4.2'/>
+ <feature name='ssse3'/>
+ <feature name='syscall'/>
+ <feature name='taa-no'/>
+ <feature name='tsc'/>
+ <feature name='tsc-deadline'/>
+ <feature name='umip'/>
+ <feature name='vaes'/>
+ <feature name='vme'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='wbnoinvd'/>
+ <feature name='x2apic'/>
+ <feature name='xgetbv1'/>
+ <feature name='xsave'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveopt'/>
+ <feature name='xsaves'/>
+ </model>
+</cpus>
diff --git a/src/cpu_map/x86_Icelake-Server-v6.xml
b/src/cpu_map/x86_Icelake-Server-v6.xml
new file mode 100644
index 0000000000..c38d3b7763
--- /dev/null
+++ b/src/cpu_map/x86_Icelake-Server-v6.xml
@@ -0,0 +1,109 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '0'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Xeon Processor (Icelake)'
+ 'version.note': '5-level EPT'
+ 'property.model': '106'
+-->
+<cpus>
+ <model name='Icelake-Server-v6'>
+ <decode host='on' guest='on'/>
+ <signature family='6' model='134'/>
+ <vendor name='Intel'/>
+ <feature name='3dnowprefetch'/>
+ <feature name='abm'/>
+ <feature name='adx'/>
+ <feature name='aes'/>
+ <feature name='apic'/>
+ <feature name='arat'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512bitalg'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512ifma'/>
+ <feature name='avx512vbmi'/>
+ <feature name='avx512vbmi2'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='bmi1'/>
+ <feature name='bmi2'/>
+ <feature name='clflush'/>
+ <feature name='clflushopt'/>
+ <feature name='clwb'/>
+ <feature name='cmov'/>
+ <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='gfni'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='la57'/>
+ <feature name='lahf_lm'/>
+ <feature name='lm'/>
+ <feature name='mca'/>
+ <feature name='mce'/>
+ <feature name='mds-no'/>
+ <feature name='mmx'/>
+ <feature name='movbe'/>
+ <feature name='msr'/>
+ <feature name='mtrr'/>
+ <feature name='nx'/>
+ <feature name='pae'/>
+ <feature name='pat'/>
+ <feature name='pcid'/>
+ <feature name='pclmuldq'/>
+ <feature name='pdpe1gb'/>
+ <feature name='pge'/>
+ <feature name='pku'/>
+ <feature name='pni'/>
+ <feature name='popcnt'/>
+ <feature name='pschange-mc-no'/>
+ <feature name='pse'/>
+ <feature name='pse36'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdpid'/>
+ <feature name='rdrand'/>
+ <feature name='rdseed'/>
+ <feature name='rdtscp'/>
+ <feature name='sep'/>
+ <feature name='sha-ni'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='smap'/>
+ <feature name='smep'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='sse'/>
+ <feature name='sse2'/>
+ <feature name='sse4.1'/>
+ <feature name='sse4.2'/>
+ <feature name='ssse3'/>
+ <feature name='syscall'/>
+ <feature name='taa-no'/>
+ <feature name='tsc'/>
+ <feature name='tsc-deadline'/>
+ <feature name='umip'/>
+ <feature name='vaes'/>
+ <feature name='vme'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='wbnoinvd'/>
+ <feature name='x2apic'/>
+ <feature name='xgetbv1'/>
+ <feature name='xsave'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveopt'/>
+ <feature name='xsaves'/>
+ </model>
+</cpus>
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 5de4260314..615758a10b 100644
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
@@ -162,6 +162,7 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='yes'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no'
vendor='Intel'>Icelake-Client-noTSX</model>
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 4eb1986759..cfa2ae336a 100644
--- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
@@ -107,6 +107,7 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no'
vendor='Intel'>Icelake-Client-noTSX</model>
diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
index f84b220e8e..ba44e0b363 100644
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
@@ -161,6 +161,7 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='yes'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no'
vendor='Intel'>Icelake-Client-noTSX</model>
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 cb94e1e1c8..08d088d133 100644
--- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
@@ -96,6 +96,8 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no'
vendor='Intel'>Icelake-Client-noTSX</model>
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 3f30474a73..4cb34baa8e 100644
--- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
@@ -108,6 +108,8 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no'
vendor='Intel'>Icelake-Client-noTSX</model>
diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
index eaad6e8cca..0fc5a5ae79 100644
--- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
@@ -95,6 +95,8 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no'
vendor='Intel'>Icelake-Client-noTSX</model>
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 c2043d7f08..386e56d169 100644
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -96,6 +96,8 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no' deprecated='yes'
vendor='Intel'>Icelake-Client-noTSX</model>
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 7c9b66939a..cc975a0c62 100644
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -108,6 +108,8 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no' deprecated='yes'
vendor='Intel'>Icelake-Client-noTSX</model>
diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index d86f352621..ff8a9cd9d2 100644
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -95,6 +95,8 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no' deprecated='yes'
vendor='Intel'>Icelake-Client-noTSX</model>
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 0ff9c7eba2..e8f11904fb 100644
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -96,6 +96,8 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no' deprecated='yes'
vendor='Intel'>Icelake-Client-noTSX</model>
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 78eb7fcbc6..c52dccff40 100644
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -109,6 +109,8 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no' deprecated='yes'
vendor='Intel'>Icelake-Client-noTSX</model>
diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index dce08a5a1c..64b7bb3e51 100644
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -95,6 +95,8 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no' deprecated='yes'
vendor='Intel'>Icelake-Client-noTSX</model>
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 5d19c3a90b..3385f64440 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -99,6 +99,9 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no' deprecated='yes'
vendor='Intel'>Icelake-Client-noTSX</model>
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 1b4cc4864f..b26fad77d0 100644
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -111,6 +111,9 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no' deprecated='yes'
vendor='Intel'>Icelake-Client-noTSX</model>
diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index 31f3758a55..0c02963502 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -98,6 +98,9 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no' deprecated='yes'
vendor='Intel'>Icelake-Client-noTSX</model>
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 5576cdf6c8..bc93fb8412 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -99,6 +99,9 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no' deprecated='yes'
vendor='Intel'>Icelake-Client-noTSX</model>
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 fd9d5579b5..09c604c797 100644
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -113,6 +113,9 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no' deprecated='yes'
vendor='Intel'>Icelake-Client-noTSX</model>
diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index f0353dd8f6..3b0bbe823e 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -98,6 +98,9 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no' deprecated='yes'
vendor='Intel'>Icelake-Client-noTSX</model>
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 620f0fb599..ca315678ce 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -100,6 +100,10 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v6</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no' deprecated='yes'
vendor='Intel'>Icelake-Client-noTSX</model>
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 3f02ef2c6a..02ee330a5b 100644
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -114,6 +114,10 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v6</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no' deprecated='yes'
vendor='Intel'>Icelake-Client-noTSX</model>
diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index dac66dd7db..de80d21084 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -99,6 +99,10 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v6</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no' deprecated='yes'
vendor='Intel'>Icelake-Client-noTSX</model>
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 b4b77472a3..4eb3253abf 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -101,6 +101,10 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v6</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
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 4f6bd7150d..7037c3be1c 100644
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -114,6 +114,10 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v6</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index 4fc18217b8..9654b0e063 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -100,6 +100,10 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v6</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
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 6980a3bb98..f2944c26c9 100644
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -106,6 +106,10 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v6</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
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 0b4eef2e3d..06ef8d7047 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
@@ -103,6 +103,10 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v6</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
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 0b4eef2e3d..06ef8d7047 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -103,6 +103,10 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v6</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
index bbca4704a9..2f856f0b22 100644
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -105,6 +105,10 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v6</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
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 2271fd3b9a..3d6c246946 100644
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -107,6 +107,10 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v6</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
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 57265614a3..881686aed1 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -108,6 +108,10 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v6</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index 122a363d29..d04d71eb88 100644
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -106,6 +106,10 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v6</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
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 c80f817963..e07ab65e1e 100644
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -108,6 +108,10 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v6</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
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 4806b18901..07e77a5614 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -109,6 +109,10 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v6</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index 7a61de39c3..9c5e92ece2 100644
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -107,6 +107,10 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v6</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
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 cd068f19e2..c884ab8562 100644
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -109,6 +109,10 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v6</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
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 5416f5e6b1..cd7d5ec1d7 100644
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -108,6 +108,10 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v6</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index c11ffd3015..3afe6a0320 100644
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -108,6 +108,10 @@
<model usable='yes' vendor='Intel'>Nehalem</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v6</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v5</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
--
2.41.0
4:07 p.m.
New subject: [PATCH v2 6/9] cpu_map: Add versioned Intel Cooperlake CPUs
Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com>
---
src/cpu_map/index.xml | 1 +
src/cpu_map/meson.build | 1 +
src/cpu_map/x86_Cooperlake-v2.xml | 98 +++++++++++++++++++
.../x86_64-cpuid-Cooperlake-host.xml | 3 +-
.../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 1 +
.../qemu_7.2.0-tcg.x86_64+hvf.xml | 1 +
.../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 1 +
29 files changed, 126 insertions(+), 2 deletions(-)
create mode 100644 src/cpu_map/x86_Cooperlake-v2.xml
diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index c0971c9391..3d8be6e41a 100644
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -65,6 +65,7 @@
<include filename='x86_Icelake-Server-v5.xml'/>
<include filename='x86_Icelake-Server-v6.xml'/>
<include filename='x86_Cooperlake.xml'/>
+ <include filename='x86_Cooperlake-v2.xml'/>
<include filename='x86_Snowridge.xml'/>
<include filename='x86_SapphireRapids.xml'/>
diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index 6e77f78b1c..a6db0b1503 100644
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -34,6 +34,7 @@ cpumap_data = [
'x86_Cascadelake-Server-v5.xml',
'x86_Cascadelake-Server.xml',
'x86_Conroe.xml',
+ 'x86_Cooperlake-v2.xml',
'x86_Cooperlake.xml',
'x86_core2duo.xml',
'x86_coreduo.xml',
diff --git a/src/cpu_map/x86_Cooperlake-v2.xml b/src/cpu_map/x86_Cooperlake-v2.xml
new file mode 100644
index 0000000000..bf0ba626d6
--- /dev/null
+++ b/src/cpu_map/x86_Cooperlake-v2.xml
@@ -0,0 +1,98 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '10'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Xeon Processor (Cooperlake)'
+ 'version.note': 'XSAVES'
+-->
+<cpus>
+ <model name='Cooperlake-v2'>
+ <decode host='on' guest='on'/>
+ <signature family='6' model='85'/>
+ <vendor name='Intel'/>
+ <feature name='3dnowprefetch'/>
+ <feature name='abm'/>
+ <feature name='adx'/>
+ <feature name='aes'/>
+ <feature name='apic'/>
+ <feature name='arat'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx'/>
+ <feature name='avx2'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='bmi1'/>
+ <feature name='bmi2'/>
+ <feature name='clflush'/>
+ <feature name='clflushopt'/>
+ <feature name='clwb'/>
+ <feature name='cmov'/>
+ <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='fxsr'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='lahf_lm'/>
+ <feature name='lm'/>
+ <feature name='mca'/>
+ <feature name='mce'/>
+ <feature name='mds-no'/>
+ <feature name='mmx'/>
+ <feature name='movbe'/>
+ <feature name='msr'/>
+ <feature name='mtrr'/>
+ <feature name='nx'/>
+ <feature name='pae'/>
+ <feature name='pat'/>
+ <feature name='pcid'/>
+ <feature name='pclmuldq'/>
+ <feature name='pdpe1gb'/>
+ <feature name='pge'/>
+ <feature name='pku'/>
+ <feature name='pni'/>
+ <feature name='popcnt'/>
+ <feature name='pschange-mc-no'/>
+ <feature name='pse'/>
+ <feature name='pse36'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdrand'/>
+ <feature name='rdseed'/>
+ <feature name='rdtscp'/>
+ <feature name='rtm'/>
+ <feature name='sep'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='smap'/>
+ <feature name='smep'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='sse'/>
+ <feature name='sse2'/>
+ <feature name='sse4.1'/>
+ <feature name='sse4.2'/>
+ <feature name='ssse3'/>
+ <feature name='stibp'/>
+ <feature name='syscall'/>
+ <feature name='taa-no'/>
+ <feature name='tsc'/>
+ <feature name='tsc-deadline'/>
+ <feature name='vme'/>
+ <feature name='x2apic'/>
+ <feature name='xgetbv1'/>
+ <feature name='xsave'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveopt'/>
+ <feature name='xsaves'/>
+ </model>
+</cpus>
diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
b/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
index 8dfc62a5c1..dea9bc9b9f 100644
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
@@ -1,6 +1,6 @@
<cpu>
<arch>x86_64</arch>
- <model>Cooperlake</model>
+ <model>Cooperlake-v2</model>
<vendor>Intel</vendor>
<signature family='6' model='85' stepping='11'/>
<feature name='ds'/>
@@ -27,7 +27,6 @@
<feature name='ospke'/>
<feature name='md-clear'/>
<feature name='flush-l1d'/>
- <feature name='xsaves'/>
<feature name='mbm_total'/>
<feature name='mbm_local'/>
<feature name='invtsc'/>
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 3385f64440..ec469d2ef2 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -117,6 +117,7 @@
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
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 b26fad77d0..ecdf591638 100644
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -129,6 +129,7 @@
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index 0c02963502..5059e61c87 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -116,6 +116,7 @@
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
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 bc93fb8412..d4d90817b1 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -117,6 +117,7 @@
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
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 09c604c797..d92c03e747 100644
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -131,6 +131,7 @@
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index 3b0bbe823e..2ba919f4cf 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -116,6 +116,7 @@
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
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 ca315678ce..42d96d9c4c 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -119,6 +119,7 @@
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
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 02ee330a5b..a57129bcbc 100644
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -133,6 +133,7 @@
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index de80d21084..85fbdd798a 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -118,6 +118,7 @@
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
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 4eb3253abf..faa7b38b3f 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -118,6 +118,7 @@
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
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 7037c3be1c..71285e0f9d 100644
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -131,6 +131,7 @@
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index 9654b0e063..1ad413fb52 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -117,6 +117,7 @@
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
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 f2944c26c9..2f06584b12 100644
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -123,6 +123,7 @@
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
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 06ef8d7047..adeb2e6993 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
@@ -120,6 +120,7 @@
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
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 06ef8d7047..adeb2e6993 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -120,6 +120,7 @@
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
index 2f856f0b22..48d0ca30e3 100644
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -122,6 +122,7 @@
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
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 3d6c246946..a23c283479 100644
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -124,6 +124,7 @@
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
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 881686aed1..2967f11391 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -125,6 +125,7 @@
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index d04d71eb88..2d36a04a67 100644
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -123,6 +123,7 @@
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
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 e07ab65e1e..93af44b638 100644
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -130,6 +130,7 @@
<model usable='no' vendor='AMD'>EPYC-Genoa</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
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 07e77a5614..f133cb71a2 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -131,6 +131,7 @@
<model usable='no' vendor='AMD'>EPYC-Genoa</model>
<model usable='no' vendor='AMD'>EPYC</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index 9c5e92ece2..8ea03e63ed 100644
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -129,6 +129,7 @@
<model usable='no' vendor='AMD'>EPYC-Genoa</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
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 c884ab8562..d34917038b 100644
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -131,6 +131,7 @@
<model usable='no' vendor='AMD'>EPYC-Genoa</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
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 cd7d5ec1d7..2db6fa32e1 100644
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -130,6 +130,7 @@
<model usable='no' vendor='AMD'>EPYC-Genoa</model>
<model usable='no' vendor='AMD'>EPYC</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index 3afe6a0320..365f61be84 100644
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -130,6 +130,7 @@
<model usable='no' vendor='AMD'>EPYC-Genoa</model>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v5</model>
--
2.41.0
4:07 p.m.
New subject: [PATCH v2 7/9] cpu_map: Add versioned Intel Snowridge CPUs
Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com>
---
src/cpu_map/index.xml | 3 +
src/cpu_map/meson.build | 3 +
src/cpu_map/x86_Snowridge-v2.xml | 78 ++++++++++++++++++
src/cpu_map/x86_Snowridge-v3.xml | 80 +++++++++++++++++++
src/cpu_map/x86_Snowridge-v4.xml | 78 ++++++++++++++++++
.../x86_64-cpuid-Atom-P5362-guest.xml | 3 +-
.../x86_64-cpuid-Atom-P5362-json.xml | 3 +-
.../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 2 +
.../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 2 +
tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 2 +
.../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 3 +
.../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 3 +
tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 3 +
.../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 3 +
.../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 3 +
tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 3 +
.../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 3 +
.../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 3 +
tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 3 +
.../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 3 +
.../qemu_7.2.0-tcg.x86_64+hvf.xml | 3 +
.../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 3 +
tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 3 +
.../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 3 +
.../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 3 +
tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 3 +
.../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 3 +
.../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 3 +
tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 3 +
.../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 3 +
.../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 3 +
tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 3 +
47 files changed, 331 insertions(+), 4 deletions(-)
create mode 100644 src/cpu_map/x86_Snowridge-v2.xml
create mode 100644 src/cpu_map/x86_Snowridge-v3.xml
create mode 100644 src/cpu_map/x86_Snowridge-v4.xml
diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index 3d8be6e41a..449abbd8f3 100644
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -67,6 +67,9 @@
<include filename='x86_Cooperlake.xml'/>
<include filename='x86_Cooperlake-v2.xml'/>
<include filename='x86_Snowridge.xml'/>
+ <include filename='x86_Snowridge-v2.xml'/>
+ <include filename='x86_Snowridge-v3.xml'/>
+ <include filename='x86_Snowridge-v4.xml'/>
<include filename='x86_SapphireRapids.xml'/>
<!-- AMD CPUs -->
diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index a6db0b1503..073fd66bec 100644
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -97,6 +97,9 @@ cpumap_data = [
'x86_Skylake-Server-v4.xml',
'x86_Skylake-Server-v5.xml',
'x86_Skylake-Server.xml',
+ 'x86_Snowridge-v2.xml',
+ 'x86_Snowridge-v3.xml',
+ 'x86_Snowridge-v4.xml',
'x86_Snowridge.xml',
'x86_vendors.xml',
'x86_Westmere-IBRS.xml',
diff --git a/src/cpu_map/x86_Snowridge-v2.xml b/src/cpu_map/x86_Snowridge-v2.xml
new file mode 100644
index 0000000000..59b7aafe8d
--- /dev/null
+++ b/src/cpu_map/x86_Snowridge-v2.xml
@@ -0,0 +1,78 @@
+<!-- extra info from qemu:
+ 'model.level': '27'
+ 'model.stepping': '1'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Atom Processor (SnowRidge)'
+ 'property.model-id': 'Intel Atom Processor (Snowridge, no MPX)'
+-->
+<cpus>
+ <model name='Snowridge-v2'>
+ <decode host='on' guest='on'/>
+ <signature family='6' model='134'/>
+ <vendor name='Intel'/>
+ <feature name='3dnowprefetch'/>
+ <feature name='aes'/>
+ <feature name='apic'/>
+ <feature name='arat'/>
+ <feature name='arch-capabilities'/>
+ <feature name='cldemote'/>
+ <feature name='clflush'/>
+ <feature name='clflushopt'/>
+ <feature name='clwb'/>
+ <feature name='cmov'/>
+ <feature name='core-capability'/>
+ <feature name='cx16'/>
+ <feature name='cx8'/>
+ <feature name='de'/>
+ <feature name='erms'/>
+ <feature name='fpu'/>
+ <feature name='fsgsbase'/>
+ <feature name='fxsr'/>
+ <feature name='gfni'/>
+ <feature name='lahf_lm'/>
+ <feature name='lm'/>
+ <feature name='mca'/>
+ <feature name='mce'/>
+ <feature name='mmx'/>
+ <feature name='movbe'/>
+ <feature name='movdir64b'/>
+ <feature name='movdiri'/>
+ <feature name='msr'/>
+ <feature name='mtrr'/>
+ <feature name='nx'/>
+ <feature name='pae'/>
+ <feature name='pat'/>
+ <feature name='pclmuldq'/>
+ <feature name='pdpe1gb'/>
+ <feature name='pge'/>
+ <feature name='pni'/>
+ <feature name='popcnt'/>
+ <feature name='pse'/>
+ <feature name='pse36'/>
+ <feature name='rdrand'/>
+ <feature name='rdseed'/>
+ <feature name='rdtscp'/>
+ <feature name='sep'/>
+ <feature name='sha-ni'/>
+ <feature name='smap'/>
+ <feature name='smep'/>
+ <feature name='spec-ctrl'/>
+ <feature name='split-lock-detect'/>
+ <feature name='ssbd'/>
+ <feature name='sse'/>
+ <feature name='sse2'/>
+ <feature name='sse4.1'/>
+ <feature name='sse4.2'/>
+ <feature name='ssse3'/>
+ <feature name='syscall'/>
+ <feature name='tsc'/>
+ <feature name='tsc-deadline'/>
+ <feature name='umip'/>
+ <feature name='vme'/>
+ <feature name='x2apic'/>
+ <feature name='xgetbv1'/>
+ <feature name='xsave'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveopt'/>
+ </model>
+</cpus>
diff --git a/src/cpu_map/x86_Snowridge-v3.xml b/src/cpu_map/x86_Snowridge-v3.xml
new file mode 100644
index 0000000000..949c5d2633
--- /dev/null
+++ b/src/cpu_map/x86_Snowridge-v3.xml
@@ -0,0 +1,80 @@
+<!-- extra info from qemu:
+ 'model.level': '27'
+ 'model.stepping': '1'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Atom Processor (SnowRidge)'
+ 'property.model-id': 'Intel Atom Processor (Snowridge, no MPX)'
+ 'version.note': 'XSAVES, no MPX'
+-->
+<cpus>
+ <model name='Snowridge-v3'>
+ <decode host='on' guest='on'/>
+ <signature family='6' model='134'/>
+ <vendor name='Intel'/>
+ <feature name='3dnowprefetch'/>
+ <feature name='aes'/>
+ <feature name='apic'/>
+ <feature name='arat'/>
+ <feature name='arch-capabilities'/>
+ <feature name='cldemote'/>
+ <feature name='clflush'/>
+ <feature name='clflushopt'/>
+ <feature name='clwb'/>
+ <feature name='cmov'/>
+ <feature name='core-capability'/>
+ <feature name='cx16'/>
+ <feature name='cx8'/>
+ <feature name='de'/>
+ <feature name='erms'/>
+ <feature name='fpu'/>
+ <feature name='fsgsbase'/>
+ <feature name='fxsr'/>
+ <feature name='gfni'/>
+ <feature name='lahf_lm'/>
+ <feature name='lm'/>
+ <feature name='mca'/>
+ <feature name='mce'/>
+ <feature name='mmx'/>
+ <feature name='movbe'/>
+ <feature name='movdir64b'/>
+ <feature name='movdiri'/>
+ <feature name='msr'/>
+ <feature name='mtrr'/>
+ <feature name='nx'/>
+ <feature name='pae'/>
+ <feature name='pat'/>
+ <feature name='pclmuldq'/>
+ <feature name='pdpe1gb'/>
+ <feature name='pge'/>
+ <feature name='pni'/>
+ <feature name='popcnt'/>
+ <feature name='pse'/>
+ <feature name='pse36'/>
+ <feature name='rdrand'/>
+ <feature name='rdseed'/>
+ <feature name='rdtscp'/>
+ <feature name='sep'/>
+ <feature name='sha-ni'/>
+ <feature name='smap'/>
+ <feature name='smep'/>
+ <feature name='spec-ctrl'/>
+ <feature name='split-lock-detect'/>
+ <feature name='ssbd'/>
+ <feature name='sse'/>
+ <feature name='sse2'/>
+ <feature name='sse4.1'/>
+ <feature name='sse4.2'/>
+ <feature name='ssse3'/>
+ <feature name='syscall'/>
+ <feature name='tsc'/>
+ <feature name='tsc-deadline'/>
+ <feature name='umip'/>
+ <feature name='vme'/>
+ <feature name='x2apic'/>
+ <feature name='xgetbv1'/>
+ <feature name='xsave'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveopt'/>
+ <feature name='xsaves'/>
+ </model>
+</cpus>
diff --git a/src/cpu_map/x86_Snowridge-v4.xml b/src/cpu_map/x86_Snowridge-v4.xml
new file mode 100644
index 0000000000..818e75f90d
--- /dev/null
+++ b/src/cpu_map/x86_Snowridge-v4.xml
@@ -0,0 +1,78 @@
+<!-- extra info from qemu:
+ 'model.level': '27'
+ 'model.stepping': '1'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Atom Processor (SnowRidge)'
+ 'property.model-id': 'Intel Atom Processor (Snowridge, no MPX)'
+ 'version.note': 'no split lock detect, no core-capability'
+-->
+<cpus>
+ <model name='Snowridge-v4'>
+ <decode host='on' guest='on'/>
+ <signature family='6' model='134'/>
+ <vendor name='Intel'/>
+ <feature name='3dnowprefetch'/>
+ <feature name='aes'/>
+ <feature name='apic'/>
+ <feature name='arat'/>
+ <feature name='arch-capabilities'/>
+ <feature name='cldemote'/>
+ <feature name='clflush'/>
+ <feature name='clflushopt'/>
+ <feature name='clwb'/>
+ <feature name='cmov'/>
+ <feature name='cx16'/>
+ <feature name='cx8'/>
+ <feature name='de'/>
+ <feature name='erms'/>
+ <feature name='fpu'/>
+ <feature name='fsgsbase'/>
+ <feature name='fxsr'/>
+ <feature name='gfni'/>
+ <feature name='lahf_lm'/>
+ <feature name='lm'/>
+ <feature name='mca'/>
+ <feature name='mce'/>
+ <feature name='mmx'/>
+ <feature name='movbe'/>
+ <feature name='movdir64b'/>
+ <feature name='movdiri'/>
+ <feature name='msr'/>
+ <feature name='mtrr'/>
+ <feature name='nx'/>
+ <feature name='pae'/>
+ <feature name='pat'/>
+ <feature name='pclmuldq'/>
+ <feature name='pdpe1gb'/>
+ <feature name='pge'/>
+ <feature name='pni'/>
+ <feature name='popcnt'/>
+ <feature name='pse'/>
+ <feature name='pse36'/>
+ <feature name='rdrand'/>
+ <feature name='rdseed'/>
+ <feature name='rdtscp'/>
+ <feature name='sep'/>
+ <feature name='sha-ni'/>
+ <feature name='smap'/>
+ <feature name='smep'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='sse'/>
+ <feature name='sse2'/>
+ <feature name='sse4.1'/>
+ <feature name='sse4.2'/>
+ <feature name='ssse3'/>
+ <feature name='syscall'/>
+ <feature name='tsc'/>
+ <feature name='tsc-deadline'/>
+ <feature name='umip'/>
+ <feature name='vme'/>
+ <feature name='x2apic'/>
+ <feature name='xgetbv1'/>
+ <feature name='xsave'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveopt'/>
+ <feature name='xsaves'/>
+ </model>
+</cpus>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml
b/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml
index c595f04e32..5e42928198 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml
@@ -1,5 +1,5 @@
<cpu mode='custom' match='exact'>
- <model fallback='forbid'>Snowridge</model>
+ <model fallback='forbid'>Snowridge-v2</model>
<vendor>Intel</vendor>
<feature policy='require' name='ds'/>
<feature policy='require' name='acpi'/>
@@ -36,7 +36,6 @@
<feature policy='require' name='mds-no'/>
<feature policy='require' name='pschange-mc-no'/>
<feature policy='require' name='taa-no'/>
- <feature policy='disable' name='mpx'/>
<feature policy='disable' name='core-capability'/>
<feature policy='disable' name='pdpe1gb'/>
<feature policy='disable' name='split-lock-detect'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml
b/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml
index ff7ac5b391..42fceee288 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml
@@ -1,5 +1,5 @@
<cpu mode='custom' match='exact'>
- <model fallback='forbid'>Snowridge</model>
+ <model fallback='forbid'>Snowridge-v2</model>
<vendor>Intel</vendor>
<feature policy='require' name='ss'/>
<feature policy='require' name='vmx'/>
@@ -88,7 +88,6 @@
<feature policy='require' name='vmx-entry-load-pat'/>
<feature policy='require' name='vmx-entry-load-efer'/>
<feature policy='require' name='vmx-eptp-switching'/>
- <feature policy='disable' name='mpx'/>
<feature policy='disable' name='core-capability'/>
<feature policy='disable' name='pdpe1gb'/>
<feature policy='disable' name='split-lock-detect'/>
diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
index fa42d6eca4..e235218346 100644
--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
@@ -143,6 +143,7 @@
<model usable='no' vendor='AMD'>athlon</model>
<model usable='yes'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
index 1efdd0aa97..7b499f6950 100644
--- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
@@ -88,6 +88,7 @@
<model usable='yes' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='no' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
index d83a7f112d..0929149731 100644
--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
@@ -142,6 +142,7 @@
<model usable='no' vendor='AMD'>athlon</model>
<model usable='yes'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
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 615758a10b..ef3e66c100 100644
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
@@ -143,6 +143,7 @@
<model usable='no' vendor='AMD'>athlon</model>
<model usable='yes'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
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 cfa2ae336a..2caae4a70d 100644
--- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
@@ -88,6 +88,7 @@
<model usable='yes' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
index ba44e0b363..6fff706563 100644
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
@@ -142,6 +142,7 @@
<model usable='no' vendor='AMD'>athlon</model>
<model usable='yes'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Server-IBRS</model>
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 08d088d133..bfac05c7b7 100644
--- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
@@ -76,6 +76,7 @@
<model usable='no' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
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 4cb34baa8e..96e3e9fc0c 100644
--- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
@@ -88,6 +88,7 @@
<model usable='yes' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
index 0fc5a5ae79..06afc7559c 100644
--- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
@@ -75,6 +75,7 @@
<model usable='no' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
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 386e56d169..29a2a197ff 100644
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -76,6 +76,7 @@
<model usable='no' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
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 cc975a0c62..b37b2ea770 100644
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -88,6 +88,7 @@
<model usable='yes' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index ff8a9cd9d2..f1d14fe8ca 100644
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -75,6 +75,7 @@
<model usable='no' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
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 e8f11904fb..cbb572b933 100644
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -76,6 +76,7 @@
<model usable='no' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
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 c52dccff40..485b5f97d2 100644
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -89,6 +89,7 @@
<model usable='yes' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index 64b7bb3e51..364ad7379d 100644
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -75,6 +75,7 @@
<model usable='no' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
<model usable='no'
vendor='Intel'>Skylake-Server-noTSX-IBRS</model>
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 ec469d2ef2..59276428c1 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -77,6 +77,8 @@
<model usable='no' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v3</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
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 ecdf591638..eff9d4c8eb 100644
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -89,6 +89,8 @@
<model usable='yes' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v3</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index 5059e61c87..4a17fb7f33 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -76,6 +76,8 @@
<model usable='no' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v3</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
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 d4d90817b1..2dd951b5c0 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -77,6 +77,9 @@
<model usable='no' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v4</model>
+ <model usable='no' vendor='Intel'>Snowridge-v3</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
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 d92c03e747..d181c8a741 100644
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -91,6 +91,9 @@
<model usable='yes' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v4</model>
+ <model usable='no' vendor='Intel'>Snowridge-v3</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index 2ba919f4cf..5115308eed 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -76,6 +76,9 @@
<model usable='no' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v4</model>
+ <model usable='no' vendor='Intel'>Snowridge-v3</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
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 42d96d9c4c..91f64e32a5 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -78,6 +78,9 @@
<model usable='no' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v4</model>
+ <model usable='no' vendor='Intel'>Snowridge-v3</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
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 a57129bcbc..44b193d522 100644
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -92,6 +92,9 @@
<model usable='yes' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v4</model>
+ <model usable='no' vendor='Intel'>Snowridge-v3</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index 85fbdd798a..3a6dc40374 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -77,6 +77,9 @@
<model usable='no' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v4</model>
+ <model usable='no' vendor='Intel'>Snowridge-v3</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
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 faa7b38b3f..2543185b61 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -79,6 +79,9 @@
<model usable='no' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v4</model>
+ <model usable='no' vendor='Intel'>Snowridge-v3</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
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 71285e0f9d..60639421ee 100644
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -92,6 +92,9 @@
<model usable='yes' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v4</model>
+ <model usable='no' vendor='Intel'>Snowridge-v3</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index 1ad413fb52..64cbc4fb0e 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -78,6 +78,9 @@
<model usable='no' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v4</model>
+ <model usable='no' vendor='Intel'>Snowridge-v3</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
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 2f06584b12..6a2acdfe15 100644
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -84,6 +84,9 @@
<model usable='no' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v4</model>
+ <model usable='no' vendor='Intel'>Snowridge-v3</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
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 adeb2e6993..4369c43bd3 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
@@ -81,6 +81,9 @@
<model usable='yes' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v4</model>
+ <model usable='no' vendor='Intel'>Snowridge-v3</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
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 adeb2e6993..4369c43bd3 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -81,6 +81,9 @@
<model usable='yes' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v4</model>
+ <model usable='no' vendor='Intel'>Snowridge-v3</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
index 48d0ca30e3..c3a23058d9 100644
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -83,6 +83,9 @@
<model usable='no' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v4</model>
+ <model usable='no' vendor='Intel'>Snowridge-v3</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
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 a23c283479..8dd912fe29 100644
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -84,6 +84,9 @@
<model usable='no' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v4</model>
+ <model usable='no' vendor='Intel'>Snowridge-v3</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
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 2967f11391..d826858151 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -85,6 +85,9 @@
<model usable='yes' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v4</model>
+ <model usable='no' vendor='Intel'>Snowridge-v3</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index 2d36a04a67..5ffa4f4571 100644
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -83,6 +83,9 @@
<model usable='no' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v4</model>
+ <model usable='no' vendor='Intel'>Snowridge-v3</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
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 93af44b638..c80455a6b5 100644
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -85,6 +85,9 @@
<model usable='no' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v4</model>
+ <model usable='no' vendor='Intel'>Snowridge-v3</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
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 f133cb71a2..ee67181b3e 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -86,6 +86,9 @@
<model usable='yes' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v4</model>
+ <model usable='no' vendor='Intel'>Snowridge-v3</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index 8ea03e63ed..00b6d45314 100644
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -84,6 +84,9 @@
<model usable='no' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v4</model>
+ <model usable='no' vendor='Intel'>Snowridge-v3</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
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 d34917038b..4aebd4a128 100644
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -86,6 +86,9 @@
<model usable='no' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v4</model>
+ <model usable='no' vendor='Intel'>Snowridge-v3</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
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 2db6fa32e1..c9fc385bfa 100644
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -85,6 +85,9 @@
<model usable='yes' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v4</model>
+ <model usable='no' vendor='Intel'>Snowridge-v3</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index 365f61be84..0e424db1d8 100644
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -85,6 +85,9 @@
<model usable='no' vendor='AMD'>athlon</model>
<model usable='no'
vendor='Intel'>Westmere-IBRS</model>
<model usable='yes' vendor='Intel'>Westmere</model>
+ <model usable='no' vendor='Intel'>Snowridge-v4</model>
+ <model usable='no' vendor='Intel'>Snowridge-v3</model>
+ <model usable='no' vendor='Intel'>Snowridge-v2</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v5</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
--
2.41.0
4:07 p.m.
New subject: [PATCH v2 8/9] cpu_map: Add versioned Intel SapphireRapids CPUs
Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com>
---
src/cpu_map/index.xml | 1 +
src/cpu_map/meson.build | 1 +
src/cpu_map/x86_SapphireRapids-v2.xml | 125 ++++++++++++++++++
.../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 1 +
9 files changed, 133 insertions(+)
create mode 100644 src/cpu_map/x86_SapphireRapids-v2.xml
diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index 449abbd8f3..9b3719c5ef 100644
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -71,6 +71,7 @@
<include filename='x86_Snowridge-v3.xml'/>
<include filename='x86_Snowridge-v4.xml'/>
<include filename='x86_SapphireRapids.xml'/>
+ <include filename='x86_SapphireRapids-v2.xml'/>
<!-- AMD CPUs -->
<include filename='x86_athlon.xml'/>
diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index 073fd66bec..4b2a90fd74 100644
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -87,6 +87,7 @@ cpumap_data = [
'x86_qemu64.xml',
'x86_SandyBridge-IBRS.xml',
'x86_SandyBridge.xml',
+ 'x86_SapphireRapids-v2.xml',
'x86_SapphireRapids.xml',
'x86_Skylake-Client-IBRS.xml',
'x86_Skylake-Client-noTSX-IBRS.xml',
diff --git a/src/cpu_map/x86_SapphireRapids-v2.xml
b/src/cpu_map/x86_SapphireRapids-v2.xml
new file mode 100644
index 0000000000..0d90d50f5f
--- /dev/null
+++ b/src/cpu_map/x86_SapphireRapids-v2.xml
@@ -0,0 +1,125 @@
+<!-- extra info from qemu:
+ 'model.level': '0x20'
+ 'model.stepping': '4'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Xeon Processor (SapphireRapids)'
+-->
+<cpus>
+ <model name='SapphireRapids-v2'>
+ <decode host='on' guest='on'/>
+ <signature family='6' model='143'/>
+ <vendor name='Intel'/>
+ <feature name='3dnowprefetch'/>
+ <feature name='abm'/>
+ <feature name='adx'/>
+ <feature name='aes'/>
+ <feature name='amx-bf16'/>
+ <feature name='amx-int8'/>
+ <feature name='amx-tile'/>
+ <feature name='apic'/>
+ <feature name='arat'/>
+ <feature name='arch-capabilities'/>
+ <feature name='avx'/>
+ <feature name='avx-vnni'/>
+ <feature name='avx2'/>
+ <feature name='avx512-bf16'/>
+ <feature name='avx512-fp16'/>
+ <feature name='avx512-vpopcntdq'/>
+ <feature name='avx512bitalg'/>
+ <feature name='avx512bw'/>
+ <feature name='avx512cd'/>
+ <feature name='avx512dq'/>
+ <feature name='avx512f'/>
+ <feature name='avx512ifma'/>
+ <feature name='avx512vbmi'/>
+ <feature name='avx512vbmi2'/>
+ <feature name='avx512vl'/>
+ <feature name='avx512vnni'/>
+ <feature name='bmi1'/>
+ <feature name='bmi2'/>
+ <feature name='bus-lock-detect'/>
+ <feature name='clflush'/>
+ <feature name='clflushopt'/>
+ <feature name='clwb'/>
+ <feature name='cmov'/>
+ <feature name='cx16'/>
+ <feature name='cx8'/>
+ <feature name='de'/>
+ <feature name='erms'/>
+ <feature name='f16c'/>
+ <feature name='fbsdp-no'/>
+ <feature name='fma'/>
+ <feature name='fpu'/>
+ <feature name='fsgsbase'/>
+ <feature name='fsrc'/>
+ <feature name='fsrm'/>
+ <feature name='fsrs'/>
+ <feature name='fxsr'/>
+ <feature name='fzrm'/>
+ <feature name='gfni'/>
+ <feature name='hle'/>
+ <feature name='ibrs-all'/>
+ <feature name='invpcid'/>
+ <feature name='la57'/>
+ <feature name='lahf_lm'/>
+ <feature name='lm'/>
+ <feature name='mca'/>
+ <feature name='mce'/>
+ <feature name='mds-no'/>
+ <feature name='mmx'/>
+ <feature name='movbe'/>
+ <feature name='msr'/>
+ <feature name='mtrr'/>
+ <feature name='nx'/>
+ <feature name='pae'/>
+ <feature name='pat'/>
+ <feature name='pcid'/>
+ <feature name='pclmuldq'/>
+ <feature name='pdpe1gb'/>
+ <feature name='pge'/>
+ <feature name='pku'/>
+ <feature name='pni'/>
+ <feature name='popcnt'/>
+ <feature name='pschange-mc-no'/>
+ <feature name='psdp-no'/>
+ <feature name='pse'/>
+ <feature name='pse36'/>
+ <feature name='rdctl-no'/>
+ <feature name='rdpid'/>
+ <feature name='rdrand'/>
+ <feature name='rdseed'/>
+ <feature name='rdtscp'/>
+ <feature name='rtm'/>
+ <feature name='sbdr-ssdp-no'/>
+ <feature name='sep'/>
+ <feature name='serialize'/>
+ <feature name='sha-ni'/>
+ <feature name='skip-l1dfl-vmentry'/>
+ <feature name='smap'/>
+ <feature name='smep'/>
+ <feature name='spec-ctrl'/>
+ <feature name='ssbd'/>
+ <feature name='sse'/>
+ <feature name='sse2'/>
+ <feature name='sse4.1'/>
+ <feature name='sse4.2'/>
+ <feature name='ssse3'/>
+ <feature name='syscall'/>
+ <feature name='taa-no'/>
+ <feature name='tsc'/>
+ <feature name='tsc-deadline'/>
+ <feature name='tsx-ldtrk'/>
+ <feature name='umip'/>
+ <feature name='vaes'/>
+ <feature name='vme'/>
+ <feature name='vpclmulqdq'/>
+ <feature name='wbnoinvd'/>
+ <feature name='x2apic'/>
+ <feature name='xfd'/>
+ <feature name='xgetbv1'/>
+ <feature name='xsave'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveopt'/>
+ <feature name='xsaves'/>
+ </model>
+</cpus>
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 c80455a6b5..4067720049 100644
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -98,6 +98,7 @@
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
+ <model usable='no'
vendor='Intel'>SapphireRapids-v2</model>
<model usable='no'
vendor='Intel'>SapphireRapids</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>SandyBridge</model>
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 ee67181b3e..7c836af7e6 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -99,6 +99,7 @@
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
+ <model usable='no'
vendor='Intel'>SapphireRapids-v2</model>
<model usable='no'
vendor='Intel'>SapphireRapids</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='no' vendor='Intel'>SandyBridge</model>
diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index 00b6d45314..6ff2ebbde8 100644
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -97,6 +97,7 @@
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
+ <model usable='no'
vendor='Intel'>SapphireRapids-v2</model>
<model usable='no'
vendor='Intel'>SapphireRapids</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>SandyBridge</model>
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 4aebd4a128..8e504436cf 100644
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -99,6 +99,7 @@
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
+ <model usable='no'
vendor='Intel'>SapphireRapids-v2</model>
<model usable='no'
vendor='Intel'>SapphireRapids</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>SandyBridge</model>
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 c9fc385bfa..7f0b057d97 100644
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -98,6 +98,7 @@
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
+ <model usable='no'
vendor='Intel'>SapphireRapids-v2</model>
<model usable='no'
vendor='Intel'>SapphireRapids</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='no' vendor='Intel'>SandyBridge</model>
diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index 0e424db1d8..0f43f5b543 100644
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -98,6 +98,7 @@
<model usable='no'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='no'
vendor='Intel'>Skylake-Client</model>
+ <model usable='no'
vendor='Intel'>SapphireRapids-v2</model>
<model usable='no'
vendor='Intel'>SapphireRapids</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>SandyBridge</model>
--
2.41.0
4:07 p.m.
New subject: [PATCH v2 9/9] cpu_map: Add versioned Dhyana CPUs
Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com>
---
src/cpu_map/index.xml | 1 +
src/cpu_map/meson.build | 1 +
src/cpu_map/x86_Dhyana-v2.xml | 81 +++++++++++++++++++
..._64-cpuid-Hygon-C86-7185-32-core-guest.xml | 5 +-
...6_64-cpuid-Hygon-C86-7185-32-core-host.xml | 5 +-
...6_64-cpuid-Hygon-C86-7185-32-core-json.xml | 6 +-
.../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 1 +
.../qemu_7.2.0-tcg.x86_64+hvf.xml | 1 +
.../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 1 +
.../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 1 +
tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 1 +
31 files changed, 112 insertions(+), 12 deletions(-)
create mode 100644 src/cpu_map/x86_Dhyana-v2.xml
diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index 9b3719c5ef..e643aa01be 100644
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -95,6 +95,7 @@
<!-- Hygon CPU models -->
<include filename='x86_Dhyana.xml'/>
+ <include filename='x86_Dhyana-v2.xml'/>
</arch>
<arch name='ppc64'>
diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index 4b2a90fd74..e16a16c276 100644
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -40,6 +40,7 @@ cpumap_data = [
'x86_coreduo.xml',
'x86_cpu64-rhel5.xml',
'x86_cpu64-rhel6.xml',
+ 'x86_Dhyana-v2.xml',
'x86_Dhyana.xml',
'x86_EPYC-IBPB.xml',
'x86_EPYC.xml',
diff --git a/src/cpu_map/x86_Dhyana-v2.xml b/src/cpu_map/x86_Dhyana-v2.xml
new file mode 100644
index 0000000000..d5568e77b3
--- /dev/null
+++ b/src/cpu_map/x86_Dhyana-v2.xml
@@ -0,0 +1,81 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '1'
+ 'model.xlevel': '0x8000001E'
+ 'model.model_id': 'Hygon Dhyana Processor'
+ 'model.cache_info': '&epyc_cache_info'
+ 'version.note': 'XSAVES'
+-->
+<cpus>
+ <model name='Dhyana-v2'>
+ <decode host='on' guest='on'/>
+ <signature family='24' model='0'/>
+ <vendor name='Hygon'/>
+ <feature name='3dnowprefetch'/>
+ <feature name='abm'/>
+ <feature name='adx'/>
+ <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='cmov'/>
+ <feature name='cr8legacy'/>
+ <feature name='cx16'/>
+ <feature name='cx8'/>
+ <feature name='de'/>
+ <feature name='f16c'/>
+ <feature name='fma'/>
+ <feature name='fpu'/>
+ <feature name='fsgsbase'/>
+ <feature name='fxsr'/>
+ <feature name='fxsr_opt'/>
+ <feature name='ibpb'/>
+ <feature name='lahf_lm'/>
+ <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='npt'/>
+ <feature name='nrip-save'/>
+ <feature name='nx'/>
+ <feature name='osvw'/>
+ <feature name='pae'/>
+ <feature name='pat'/>
+ <feature name='pdpe1gb'/>
+ <feature name='pge'/>
+ <feature name='pni'/>
+ <feature name='popcnt'/>
+ <feature name='pse'/>
+ <feature name='pse36'/>
+ <feature name='rdrand'/>
+ <feature name='rdseed'/>
+ <feature name='rdtscp'/>
+ <feature name='sep'/>
+ <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='svm'/>
+ <feature name='syscall'/>
+ <feature name='tsc'/>
+ <feature name='vme'/>
+ <feature name='xgetbv1'/>
+ <feature name='xsave'/>
+ <feature name='xsavec'/>
+ <feature name='xsaveopt'/>
+ <feature name='xsaves'/>
+ </model>
+</cpus>
diff --git a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml
b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml
index 8669e5bd1b..0b318b94c4 100644
--- a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml
@@ -1,10 +1,9 @@
<cpu mode='custom' match='exact'>
- <model fallback='forbid'>Dhyana</model>
+ <model fallback='forbid'>Dhyana-v2</model>
<vendor>Hygon</vendor>
<feature policy='require' name='ht'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='osxsave'/>
- <feature policy='require' name='xsaves'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='extapic'/>
<feature policy='require' name='skinit'/>
@@ -16,10 +15,8 @@
<feature policy='require' name='invtsc'/>
<feature policy='require' name='clzero'/>
<feature policy='require' name='xsaveerptr'/>
- <feature policy='require' name='npt'/>
<feature policy='require' name='lbrv'/>
<feature policy='require' name='svm-lock'/>
- <feature policy='require' name='nrip-save'/>
<feature policy='require' name='tsc-scale'/>
<feature policy='require' name='vmcb-clean'/>
<feature policy='require' name='flushbyasid'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml
b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml
index ddb14c0440..74c751ad1f 100644
--- a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml
@@ -1,12 +1,11 @@
<cpu>
<arch>x86_64</arch>
- <model>Dhyana</model>
+ <model>Dhyana-v2</model>
<vendor>Hygon</vendor>
<signature family='24' model='0' stepping='1'/>
<feature name='ht'/>
<feature name='monitor'/>
<feature name='osxsave'/>
- <feature name='xsaves'/>
<feature name='cmp_legacy'/>
<feature name='extapic'/>
<feature name='skinit'/>
@@ -18,10 +17,8 @@
<feature name='invtsc'/>
<feature name='clzero'/>
<feature name='xsaveerptr'/>
- <feature name='npt'/>
<feature name='lbrv'/>
<feature name='svm-lock'/>
- <feature name='nrip-save'/>
<feature name='tsc-scale'/>
<feature name='vmcb-clean'/>
<feature name='flushbyasid'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-json.xml
b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-json.xml
index 0408d51c10..2ff92e2c15 100644
--- a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-json.xml
@@ -1,5 +1,5 @@
<cpu mode='custom' match='exact'>
- <model fallback='forbid'>Dhyana</model>
+ <model fallback='forbid'>Dhyana-v2</model>
<vendor>Hygon</vendor>
<feature policy='require' name='x2apic'/>
<feature policy='require' name='tsc-deadline'/>
@@ -7,8 +7,6 @@
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='virt-ssbd'/>
- <feature policy='require' name='npt'/>
- <feature policy='require' name='nrip-save'/>
+ <feature policy='disable' name='xsaves'/>
<feature policy='disable' name='svm'/>
- <feature policy='disable' name='monitor'/>
</cpu>
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 59276428c1..31c8a5d4ed 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -118,6 +118,7 @@
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
+ <model usable='yes' vendor='Hygon'>Dhyana-v2</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
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 eff9d4c8eb..b9e671e1f7 100644
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -130,6 +130,7 @@
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC</model>
+ <model usable='no' vendor='Hygon'>Dhyana-v2</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index 4a17fb7f33..5503ae4ee4 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -117,6 +117,7 @@
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
+ <model usable='yes' vendor='Hygon'>Dhyana-v2</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
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 2dd951b5c0..2c52ccb6a4 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -119,6 +119,7 @@
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
+ <model usable='yes' vendor='Hygon'>Dhyana-v2</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
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 d181c8a741..7d7034e17f 100644
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -133,6 +133,7 @@
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC</model>
+ <model usable='no' vendor='Hygon'>Dhyana-v2</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index 5115308eed..b174edf499 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -118,6 +118,7 @@
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
+ <model usable='yes' vendor='Hygon'>Dhyana-v2</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
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 91f64e32a5..41b144edcf 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -121,6 +121,7 @@
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
+ <model usable='yes' vendor='Hygon'>Dhyana-v2</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
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 44b193d522..d4ded73fa3 100644
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -135,6 +135,7 @@
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC</model>
+ <model usable='no' vendor='Hygon'>Dhyana-v2</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index 3a6dc40374..faf560814f 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -120,6 +120,7 @@
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
+ <model usable='yes' vendor='Hygon'>Dhyana-v2</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
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 2543185b61..adcf46bce4 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -120,6 +120,7 @@
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
+ <model usable='yes' vendor='Hygon'>Dhyana-v2</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
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 60639421ee..c0333c2947 100644
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -133,6 +133,7 @@
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC</model>
+ <model usable='no' vendor='Hygon'>Dhyana-v2</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index 64cbc4fb0e..3dba9d606a 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -119,6 +119,7 @@
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
+ <model usable='yes' vendor='Hygon'>Dhyana-v2</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
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 6a2acdfe15..24f15b0088 100644
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -125,6 +125,7 @@
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
+ <model usable='yes' vendor='Hygon'>Dhyana-v2</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
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 4369c43bd3..8ed48763ca 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
@@ -122,6 +122,7 @@
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC</model>
+ <model usable='no' vendor='Hygon'>Dhyana-v2</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
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 4369c43bd3..8ed48763ca 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -122,6 +122,7 @@
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC</model>
+ <model usable='no' vendor='Hygon'>Dhyana-v2</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
index c3a23058d9..abe84f4aa8 100644
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -124,6 +124,7 @@
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
+ <model usable='yes' vendor='Hygon'>Dhyana-v2</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
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 8dd912fe29..add9f49ca3 100644
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -126,6 +126,7 @@
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
+ <model usable='yes' vendor='Hygon'>Dhyana-v2</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
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 d826858151..e3c90bf8f6 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -127,6 +127,7 @@
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC</model>
+ <model usable='no' vendor='Hygon'>Dhyana-v2</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index 5ffa4f4571..3c9af01790 100644
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -125,6 +125,7 @@
<model usable='no' vendor='AMD'>EPYC-Milan</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
+ <model usable='yes' vendor='Hygon'>Dhyana-v2</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
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 4067720049..f4f3e8fa18 100644
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -133,6 +133,7 @@
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC-Genoa</model>
<model usable='yes' vendor='AMD'>EPYC</model>
+ <model usable='no' vendor='Hygon'>Dhyana-v2</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
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 7c836af7e6..504a90a7fa 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -134,6 +134,7 @@
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC-Genoa</model>
<model usable='no' vendor='AMD'>EPYC</model>
+ <model usable='no' vendor='Hygon'>Dhyana-v2</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index 6ff2ebbde8..e935519f9f 100644
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -132,6 +132,7 @@
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC-Genoa</model>
<model usable='yes' vendor='AMD'>EPYC</model>
+ <model usable='no' vendor='Hygon'>Dhyana-v2</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
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 8e504436cf..53024eb6ac 100644
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -134,6 +134,7 @@
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC-Genoa</model>
<model usable='yes' vendor='AMD'>EPYC</model>
+ <model usable='no' vendor='Hygon'>Dhyana-v2</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
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 7f0b057d97..73461c324a 100644
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -133,6 +133,7 @@
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC-Genoa</model>
<model usable='no' vendor='AMD'>EPYC</model>
+ <model usable='no' vendor='Hygon'>Dhyana-v2</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index 0f43f5b543..37ff19df08 100644
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -133,6 +133,7 @@
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC-Genoa</model>
<model usable='yes' vendor='AMD'>EPYC</model>
+ <model usable='no' vendor='Hygon'>Dhyana-v2</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
--
2.41.0
5:03 a.m.
On Thu, Dec 07, 2023 at 04:07:48PM -0600, Jonathon Jongsma wrote:
For SEV-SNP support we will need to be able to specify versioned CPU
models
that are not yet available in libvirt. Rather than just adding a versioned CPU
or two that would satisfy that immediate need, I decided to try to add
versioned CPUs in a more standard way. This series generates CPU definitions
for all cpu versions that are defined in upstream qemu (at least for
recent Intel and AMD CPUs).
libvirt already provides a select subset of these versions as configurable CPU
models. But we only include the ones that have defined aliases in qemu, such as
EPYC-IBPB. After this patchset, all verisioned cpu models supported by qemu
will be available in libvirt.
Note that I'm only adding versions that are not already available via their
alias. For example, I am not adding an EPYC-v2 CPU model since it is already
available as EPYC-IBPB.
That is not reliable, as the alias mapping between a short name "EPYC"
and a version is set by the choice of machine type.
ie one machine type might map EPYC to v1, and another machine type
might map EPYC to v2.
It just happens to be the case that currently all machine types have
the same alias expansion, but that's not guaranteed.
So if we're going down this route, we need to bring in all versioned
machine types.
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
9:42 a.m.
On 12/8/23 5:03 AM, Daniel P. Berrangé wrote:
On Thu, Dec 07, 2023 at 04:07:48PM -0600, Jonathon Jongsma wrote:
> For SEV-SNP support we will need to be able to specify versioned CPU models
> that are not yet available in libvirt. Rather than just adding a versioned CPU
> or two that would satisfy that immediate need, I decided to try to add
> versioned CPUs in a more standard way. This series generates CPU definitions
> for all cpu versions that are defined in upstream qemu (at least for
> recent Intel and AMD CPUs).
>
> libvirt already provides a select subset of these versions as configurable CPU
> models. But we only include the ones that have defined aliases in qemu, such as
> EPYC-IBPB. After this patchset, all verisioned cpu models supported by qemu
> will be available in libvirt.
>
> Note that I'm only adding versions that are not already available via their
> alias. For example, I am not adding an EPYC-v2 CPU model since it is already
> available as EPYC-IBPB.
That is not reliable, as the alias mapping between a short name "EPYC"
and a version is set by the choice of machine type.
ie one machine type might map EPYC to v1, and another machine type
might map EPYC to v2.
It just happens to be the case that currently all machine types have
the same alias expansion, but that's not guaranteed.
So if we're going down this route, we need to bring in all versioned
machine types.
I suppose this is true, but it doesn't seem meaningfully different than
our current situation where we have already introduced a subset of
versioned types. It's just that we've only added the ones with
human-readable names. So while this patch doesn't solve the issue you
mentioned, I don't think that it makes the situation any worse. We are
already susceptible to any changes that qemu might make with respect to
machine-specific CPU aliases. But I'll try to figure out a more
comprehensive approach.
Jonathon
351
days inactive
352
days old
11 comments
2 participants
participants (2)
-
Daniel P. Berrangé -
Jonathon Jongsma