4:21 p.m.
This is not necessarily intended as a finished proposal, but as a discussion
starter. I mentioned in an email last week that for SEV-SNP support we will
need to be able to specify versioned CPU models that are not yet supported by
libvirt. Rather than just adding a versioned CPU or two that would satisfy my
immediate need, I decided to try to add versioned CPUs in a standard way. This
involves adding the concept of an 'alias' for a CPU model in libvirt. Qemu
already has the concept of a CPU alias for a versioned CPU. In fact, libvirt
already provides a select subset of these as configurable CPU models (e.g.
'EPYC-IBPB'). After this patchset, these aliased CPU versions would be
configurable by either their versioned name ('EPYC-v2') or their alias
('EPYC-IBPB'). And it would also provide non-aliased CPU versions as options
within libvirt ('EPYC-v4').
Assuming that we want to offer all versioned CPUs like this, there are two
approaches to naming. I chose to maintain the existing names (e.g. EPYC-IBPB)
as the primary name where available, and use the versioned name (EPYC-v2) as
the alias. However, some CPU models don't have an alias, so their versioned
name would be their primary name. So we have the following set of 'EPYC' CPU
models:
- EPYC (alias = EPYC-v1)
- EPYC-IBPB (alias = EPYC-v2)
- EPYC-v3 (no alias)
- EPYC-v4 (no alias)
An alternative approach is something more like:
- EPYC-v1 (alias = EPYC)
- EPYC-v2 (alias = EPYC-IBPB)
- EPYC-v3 (no alias)
- EPYC-v4 (no alias)
The naming of the second set is more consistent, but it could result in slight
changes to behavior. For example, any call to cpuDecode() that returned
EPYC-IBPB in the past might now return EPYC-v2. These two CPUs are just two
different names for the same model, so I'm not sure it would result in any
issues. But in this patch series I went with the first approach since it
maintained stability and resulted in less churn in the test output.
Note also that there are a couple of patches that update existing CPU models by
re-running this script against the current qemu source code. For example, the
patch "cpu_map: Update EPYC cpu definitions from qemu" results in some minor
changes to the existing EPYC CPUs by adding a couple of feature flags. In
theory, it seems like a good idea for our libvirt models to match how the model
is defined in qemu, but I admit that I don't have a great understanding of
whether this will result in undesirable side-effects. I'm hoping those of you
with deeper knowledge will tell me why this is or is not a good idea. In the
same vein, I've included the last patch of the series showing what it would
look like if we regenerated all of the other CPU definitions from the qemu
source code.
Jonathon Jongsma (19):
cpu_map: update script to generate versioned CPUs
cpu: handle aliases in CPU definitions
cpu_map: Update EPYC cpu definitions from qemu
cpu_map: Add versioned EPYC CPUs
cpu_map: Add versioned Intel Nehalem CPUs
cpu_map: Add versioned Intel Westmere CPUs
cpu_map: Add versioned Intel SandyBridge CPUs
cpu_map: Add versioned Intel IvyBridge CPUs
cpu_map: Add versioned Intel Haswell CPUs
cpu_map: Add versioned Intel Broadwell 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
cpu: advertise CPU aliases
NOMERGE: RFC: regenerate all cpu definitions
src/cpu/cpu_x86.c | 88 ++++++++----
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_Broadwell-IBRS.xml | 19 ++-
src/cpu_map/x86_Broadwell-noTSX-IBRS.xml | 19 ++-
src/cpu_map/x86_Broadwell-noTSX.xml | 19 ++-
src/cpu_map/x86_Broadwell.xml | 18 ++-
src/cpu_map/x86_Cascadelake-Server-noTSX.xml | 19 ++-
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_Cascadelake-Server.xml | 11 +-
src/cpu_map/x86_Cooperlake-v2.xml | 98 ++++++++++++++
src/cpu_map/x86_Cooperlake.xml | 9 +-
src/cpu_map/x86_Dhyana-v2.xml | 81 ++++++++++++
src/cpu_map/x86_Dhyana.xml | 13 +-
src/cpu_map/x86_EPYC-Genoa.xml | 7 +
src/cpu_map/x86_EPYC-IBPB.xml | 14 +-
src/cpu_map/x86_EPYC-Milan-v2.xml | 108 +++++++++++++++
src/cpu_map/x86_EPYC-Milan.xml | 8 ++
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-Rome.xml | 9 ++
src/cpu_map/x86_EPYC-v3.xml | 87 ++++++++++++
src/cpu_map/x86_EPYC-v4.xml | 88 ++++++++++++
src/cpu_map/x86_EPYC.xml | 13 +-
src/cpu_map/x86_Haswell-IBRS.xml | 20 ++-
src/cpu_map/x86_Haswell-noTSX-IBRS.xml | 20 ++-
src/cpu_map/x86_Haswell-noTSX.xml | 20 ++-
src/cpu_map/x86_Haswell.xml | 18 ++-
src/cpu_map/x86_Icelake-Server-noTSX.xml | 14 +-
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_Icelake-Server.xml | 11 +-
src/cpu_map/x86_IvyBridge-IBRS.xml | 13 +-
src/cpu_map/x86_IvyBridge.xml | 12 +-
src/cpu_map/x86_Nehalem-IBRS.xml | 14 +-
src/cpu_map/x86_Nehalem.xml | 13 +-
src/cpu_map/x86_SandyBridge-IBRS.xml | 14 +-
src/cpu_map/x86_SandyBridge.xml | 13 +-
src/cpu_map/x86_SapphireRapids-v2.xml | 125 ++++++++++++++++++
src/cpu_map/x86_SapphireRapids.xml | 7 +
src/cpu_map/x86_Skylake-Client-IBRS.xml | 16 ++-
src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml | 18 +--
src/cpu_map/x86_Skylake-Client-v4.xml | 77 +++++++++++
src/cpu_map/x86_Skylake-Client.xml | 15 ++-
src/cpu_map/x86_Skylake-Server-IBRS.xml | 12 +-
src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml | 14 +-
src/cpu_map/x86_Skylake-Server-v4.xml | 83 ++++++++++++
src/cpu_map/x86_Skylake-Server-v5.xml | 85 ++++++++++++
src/cpu_map/x86_Skylake-Server.xml | 12 +-
src/cpu_map/x86_Snowridge-v2.xml | 78 +++++++++++
src/cpu_map/x86_Snowridge-v3.xml | 80 +++++++++++
src/cpu_map/x86_Snowridge-v4.xml | 78 +++++++++++
src/cpu_map/x86_Snowridge.xml | 10 +-
src/cpu_map/x86_Westmere-IBRS.xml | 13 +-
src/cpu_map/x86_Westmere.xml | 14 +-
...4-baseline-Westmere+Nehalem-migratable.xml | 4 +-
...86_64-baseline-Westmere+Nehalem-result.xml | 4 +-
.../x86_64-baseline-features-expanded.xml | 1 +
.../x86_64-baseline-features-result.xml | 2 -
.../x86_64-baseline-simple-expanded.xml | 3 +
.../x86_64-cpuid-Atom-P5362-guest.xml | 3 +-
.../x86_64-cpuid-Atom-P5362-host.xml | 3 -
.../x86_64-cpuid-Atom-P5362-json.xml | 3 +-
.../x86_64-cpuid-Cooperlake-host.xml | 3 +-
.../x86_64-cpuid-Core-i5-2500-guest.xml | 3 -
.../x86_64-cpuid-Core-i5-2500-host.xml | 3 -
.../x86_64-cpuid-Core-i5-2500-json.xml | 3 -
.../x86_64-cpuid-Core-i5-2540M-guest.xml | 3 -
.../x86_64-cpuid-Core-i5-2540M-host.xml | 3 -
.../x86_64-cpuid-Core-i5-2540M-json.xml | 3 -
.../x86_64-cpuid-Core-i5-4670T-guest.xml | 6 +-
.../x86_64-cpuid-Core-i5-4670T-host.xml | 19 ++-
.../x86_64-cpuid-Core-i5-4670T-json.xml | 6 +-
.../x86_64-cpuid-Core-i5-650-guest.xml | 3 -
.../x86_64-cpuid-Core-i5-650-host.xml | 3 -
.../x86_64-cpuid-Core-i5-650-json.xml | 3 -
.../x86_64-cpuid-Core-i5-6600-guest.xml | 1 +
.../x86_64-cpuid-Core-i5-6600-host.xml | 1 +
.../x86_64-cpuid-Core-i5-6600-json.xml | 1 +
.../x86_64-cpuid-Core-i7-2600-guest.xml | 3 -
.../x86_64-cpuid-Core-i7-2600-host.xml | 3 -
.../x86_64-cpuid-Core-i7-2600-json.xml | 3 -
...6_64-cpuid-Core-i7-2600-xsaveopt-guest.xml | 2 -
...86_64-cpuid-Core-i7-2600-xsaveopt-host.xml | 9 +-
...86_64-cpuid-Core-i7-2600-xsaveopt-json.xml | 2 -
.../x86_64-cpuid-Core-i7-3520M-guest.xml | 2 -
.../x86_64-cpuid-Core-i7-3520M-host.xml | 2 -
.../x86_64-cpuid-Core-i7-3740QM-guest.xml | 2 +-
.../x86_64-cpuid-Core-i7-3740QM-host.xml | 13 +-
.../x86_64-cpuid-Core-i7-3740QM-json.xml | 2 +-
.../x86_64-cpuid-Core-i7-3770-guest.xml | 2 -
.../x86_64-cpuid-Core-i7-3770-host.xml | 2 -
.../x86_64-cpuid-Core-i7-3770-json.xml | 2 +-
.../x86_64-cpuid-Core-i7-4510U-guest.xml | 6 -
.../x86_64-cpuid-Core-i7-4510U-host.xml | 3 -
.../x86_64-cpuid-Core-i7-4510U-json.xml | 6 -
.../x86_64-cpuid-Core-i7-4600U-guest.xml | 6 -
.../x86_64-cpuid-Core-i7-4600U-host.xml | 6 -
.../x86_64-cpuid-Core-i7-4600U-json.xml | 6 -
.../x86_64-cpuid-Core-i7-5600U-arat-guest.xml | 6 -
.../x86_64-cpuid-Core-i7-5600U-arat-host.xml | 6 -
.../x86_64-cpuid-Core-i7-5600U-arat-json.xml | 6 +-
.../x86_64-cpuid-Core-i7-5600U-guest.xml | 6 -
.../x86_64-cpuid-Core-i7-5600U-host.xml | 6 -
.../x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml | 6 -
.../x86_64-cpuid-Core-i7-5600U-ibrs-host.xml | 6 -
.../x86_64-cpuid-Core-i7-5600U-ibrs-json.xml | 6 -
.../x86_64-cpuid-Core-i7-5600U-json.xml | 6 -
.../x86_64-cpuid-Core-i7-7600U-guest.xml | 1 +
.../x86_64-cpuid-Core-i7-7600U-host.xml | 1 +
.../x86_64-cpuid-Core-i7-7600U-json.xml | 1 +
.../x86_64-cpuid-Core-i7-7700-guest.xml | 1 +
.../x86_64-cpuid-Core-i7-7700-host.xml | 1 +
.../x86_64-cpuid-Core-i7-7700-json.xml | 1 +
.../x86_64-cpuid-Core-i7-8550U-guest.xml | 5 +-
.../x86_64-cpuid-Core-i7-8550U-host.xml | 4 +-
.../x86_64-cpuid-Core-i7-8550U-json.xml | 5 +-
.../x86_64-cpuid-Core-i7-8700-guest.xml | 1 +
.../x86_64-cpuid-Core-i7-8700-host.xml | 1 +
.../x86_64-cpuid-Core-i7-8700-json.xml | 1 +
.../x86_64-cpuid-EPYC-7502-32-Core-guest.xml | 1 -
.../x86_64-cpuid-EPYC-7502-32-Core-host.xml | 5 +-
.../x86_64-cpuid-EPYC-7502-32-Core-json.xml | 1 -
.../x86_64-cpuid-EPYC-7601-32-Core-guest.xml | 9 +-
.../x86_64-cpuid-EPYC-7601-32-Core-host.xml | 2 -
..._64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml | 2 -
...6_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml | 8 +-
...6_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml | 3 -
.../x86_64-cpuid-EPYC-7601-32-Core-json.xml | 3 -
..._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 | 3 -
.../x86_64-cpuid-Ice-Lake-Server-guest.xml | 1 +
.../x86_64-cpuid-Ice-Lake-Server-host.xml | 1 +
.../x86_64-cpuid-Ice-Lake-Server-json.xml | 2 +-
.../x86_64-cpuid-Pentium-P6100-guest.xml | 10 +-
...4-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml | 9 +-
...64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml | 2 -
...64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml | 3 -
...6_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml | 1 -
...86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml | 1 -
...86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml | 1 -
.../x86_64-cpuid-Xeon-E3-1225-v5-guest.xml | 1 +
.../x86_64-cpuid-Xeon-E3-1225-v5-host.xml | 1 +
.../x86_64-cpuid-Xeon-E3-1225-v5-json.xml | 1 +
.../x86_64-cpuid-Xeon-E3-1245-v5-guest.xml | 1 +
.../x86_64-cpuid-Xeon-E3-1245-v5-host.xml | 1 +
.../x86_64-cpuid-Xeon-E3-1245-v5-json.xml | 1 +
.../x86_64-cpuid-Xeon-E5-2609-v3-guest.xml | 6 -
.../x86_64-cpuid-Xeon-E5-2609-v3-host.xml | 6 -
.../x86_64-cpuid-Xeon-E5-2609-v3-json.xml | 6 -
.../x86_64-cpuid-Xeon-E5-2623-v4-guest.xml | 6 -
.../x86_64-cpuid-Xeon-E5-2623-v4-host.xml | 6 -
.../x86_64-cpuid-Xeon-E5-2623-v4-json.xml | 6 -
.../x86_64-cpuid-Xeon-E5-2630-v3-guest.xml | 6 -
.../x86_64-cpuid-Xeon-E5-2630-v3-host.xml | 6 -
.../x86_64-cpuid-Xeon-E5-2630-v3-json.xml | 6 +-
.../x86_64-cpuid-Xeon-E5-2630-v4-guest.xml | 6 -
.../x86_64-cpuid-Xeon-E5-2630-v4-host.xml | 6 -
.../x86_64-cpuid-Xeon-E5-2630-v4-json.xml | 6 -
.../x86_64-cpuid-Xeon-E5-2650-guest.xml | 3 -
.../x86_64-cpuid-Xeon-E5-2650-host.xml | 3 -
.../x86_64-cpuid-Xeon-E5-2650-json.xml | 3 -
.../x86_64-cpuid-Xeon-E5-2650-v3-guest.xml | 6 -
.../x86_64-cpuid-Xeon-E5-2650-v3-host.xml | 6 -
.../x86_64-cpuid-Xeon-E5-2650-v3-json.xml | 6 +-
.../x86_64-cpuid-Xeon-E5-2650-v4-guest.xml | 6 -
.../x86_64-cpuid-Xeon-E5-2650-v4-host.xml | 6 -
.../x86_64-cpuid-Xeon-E5-2650-v4-json.xml | 6 -
.../x86_64-cpuid-Xeon-E7-4820-guest.xml | 3 -
.../x86_64-cpuid-Xeon-E7-4820-host.xml | 3 -
.../x86_64-cpuid-Xeon-E7-4820-json.xml | 4 +-
.../x86_64-cpuid-Xeon-E7-4830-guest.xml | 3 -
.../x86_64-cpuid-Xeon-E7-4830-host.xml | 3 -
.../x86_64-cpuid-Xeon-E7-4830-json.xml | 3 -
.../x86_64-cpuid-Xeon-E7-8890-v3-guest.xml | 6 -
.../x86_64-cpuid-Xeon-E7-8890-v3-host.xml | 6 -
.../x86_64-cpuid-Xeon-E7-8890-v3-json.xml | 6 -
.../x86_64-cpuid-Xeon-E7540-guest.xml | 1 -
.../x86_64-cpuid-Xeon-E7540-host.xml | 1 -
.../x86_64-cpuid-Xeon-E7540-json.xml | 1 -
.../x86_64-cpuid-Xeon-Gold-5115-guest.xml | 2 +-
.../x86_64-cpuid-Xeon-Gold-5115-host.xml | 2 +-
.../x86_64-cpuid-Xeon-Gold-5115-json.xml | 2 +
.../x86_64-cpuid-Xeon-Gold-6130-guest.xml | 2 +-
.../x86_64-cpuid-Xeon-Gold-6130-host.xml | 2 +-
.../x86_64-cpuid-Xeon-Gold-6130-json.xml | 2 +-
.../x86_64-cpuid-Xeon-Gold-6148-guest.xml | 3 +-
.../x86_64-cpuid-Xeon-Gold-6148-host.xml | 3 +-
.../x86_64-cpuid-Xeon-Gold-6148-json.xml | 3 +-
.../x86_64-cpuid-Xeon-Platinum-8268-guest.xml | 9 +-
.../x86_64-cpuid-Xeon-Platinum-8268-host.xml | 9 +-
.../x86_64-cpuid-Xeon-Platinum-8268-json.xml | 2 +-
.../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 +-
.../x86_64-cpuid-Xeon-W3520-guest.xml | 1 -
.../x86_64-cpuid-Xeon-W3520-host.xml | 1 -
.../x86_64-cpuid-Xeon-W3520-json.xml | 1 -
...id-baseline-Broadwell-IBRS+Cascadelake.xml | 6 -
..._64-cpuid-baseline-Cascadelake+Icelake.xml | 9 +-
...puid-baseline-Cascadelake+Skylake-IBRS.xml | 2 +-
..._64-cpuid-baseline-Cascadelake+Skylake.xml | 3 +-
...-cpuid-baseline-Cooperlake+Cascadelake.xml | 9 +-
...6_64-cpuid-baseline-Cooperlake+Icelake.xml | 9 +-
.../x86_64-cpuid-baseline-EPYC+Rome.xml | 3 -
.../x86_64-cpuid-baseline-Haswell+Skylake.xml | 6 -
...-baseline-Haswell-noTSX-IBRS+Broadwell.xml | 6 -
...seline-Haswell-noTSX-IBRS+Skylake-IBRS.xml | 6 -
...id-baseline-Haswell-noTSX-IBRS+Skylake.xml | 6 -
.../x86_64-cpuid-baseline-Ryzen+Rome.xml | 3 -
...4-cpuid-baseline-Skylake-Client+Server.xml | 1 +
.../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 33 +++++
.../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 32 +++++
tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 33 +++++
.../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 37 ++++++
.../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 36 +++++
tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 37 ++++++
.../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 40 +++++-
.../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 39 ++++++
tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 40 +++++-
.../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 40 +++++-
.../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 39 ++++++
tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 40 +++++-
.../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 42 +++++-
.../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 41 ++++++
tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 42 +++++-
.../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 49 ++++++-
.../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 48 +++++++
tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 49 ++++++-
.../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 50 ++++++-
.../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 49 +++++++
tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 50 ++++++-
.../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 51 ++++++-
.../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 50 +++++++
tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 51 ++++++-
.../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 51 ++++++-
.../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 50 +++++++
tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 51 ++++++-
.../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 51 ++++++-
.../qemu_7.2.0-tcg.x86_64+hvf.xml | 51 ++++++-
.../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 51 ++++++-
tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 51 ++++++-
.../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 52 +++++++-
.../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 52 +++++++-
tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 52 +++++++-
.../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 61 ++++++++-
.../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 57 +++++++-
tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 61 ++++++++-
.../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 61 ++++++++-
.../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 57 +++++++-
tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 61 ++++++++-
...-Icelake-Server-pconfig.x86_64-latest.args | 2 +-
.../cpu-fallback.x86_64-5.2.0.args | 2 +-
.../cpu-fallback.x86_64-8.0.0.args | 2 +-
tests/qemuxml2argvdata/cpu-fallback.xml | 1 -
.../cpu-host-model-fallback.x86_64-7.2.0.args | 2 +-
.../cpu-host-model-fallback.x86_64-8.0.0.args | 2 +-
...cpu-host-model-fallback.x86_64-latest.args | 2 +-
...pu-host-model-nofallback.x86_64-7.2.0.args | 2 +-
...pu-host-model-nofallback.x86_64-8.0.0.args | 2 +-
...u-host-model-nofallback.x86_64-latest.args | 2 +-
.../cpu-host-model.x86_64-4.2.0.args | 2 +-
.../cpu-host-model.x86_64-5.0.0.args | 2 +-
.../cpu-host-model.x86_64-5.1.0.args | 2 +-
.../cpu-host-model.x86_64-5.2.0.args | 2 +-
.../cpu-host-model.x86_64-6.0.0.args | 2 +-
.../cpu-host-model.x86_64-6.1.0.args | 2 +-
.../cpu-host-model.x86_64-6.2.0.args | 2 +-
.../cpu-host-model.x86_64-7.0.0.args | 2 +-
.../cpu-host-model.x86_64-7.1.0.args | 2 +-
.../cpu-host-model.x86_64-7.2.0.args | 2 +-
.../cpu-host-model.x86_64-8.0.0.args | 2 +-
.../cpu-host-model.x86_64-latest.args | 2 +-
.../cpu-nofallback.x86_64-8.0.0.args | 2 +-
tests/qemuxml2argvdata/cpu-nofallback.xml | 1 -
282 files changed, 4591 insertions(+), 692 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:21 p.m.
New subject: [libvirt PATCH 01/19] 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.
---
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:21 p.m.
New subject: [libvirt PATCH 02/19] cpu: handle aliases in CPU definitions
After modifying the sync_cpu_model_i386 script to generate an alias for
versioned CPUs, we need to add the ability to handle cpu model aliases.
This involves parsing and storing the alias in the virCPUx86Model
structure and also allowing the CPU to be looked up by its alias or its
official name.
Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com>
---
src/cpu/cpu_x86.c | 68 ++++++++++++++++++++++++++++++++---------------
1 file changed, 47 insertions(+), 21 deletions(-)
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 7a7f3b409d..4d4f6a8be8 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -148,6 +148,7 @@ struct _virCPUx86Model {
virCPUx86Signatures *signatures;
virCPUx86Data data;
GStrv removedFeatures;
+ char *alias;
};
typedef struct _virCPUx86Map virCPUx86Map;
@@ -1278,6 +1279,7 @@ x86ModelFree(virCPUx86Model *model)
return;
g_free(model->name);
+ g_free(model->alias);
virCPUx86SignaturesFree(model->signatures);
virCPUx86DataClear(&model->data);
g_strfreev(model->removedFeatures);
@@ -1309,7 +1311,8 @@ x86ModelFind(virCPUx86Map *map,
size_t i;
for (i = 0; i < map->nmodels; i++) {
- if (STREQ(map->models[i]->name, name))
+ if (STREQ(map->models[i]->name, name) ||
+ STREQ_NULLABLE(map->models[i]->alias, name))
return map->models[i];
}
@@ -1448,6 +1451,22 @@ x86ModelCompare(virCPUx86Model *model1,
}
+static int
+x86ModelParseAlias(virCPUx86Model *model,
+ xmlXPathContextPtr ctxt)
+{
+ xmlNodePtr alias_node = NULL;
+
+ if (!(alias_node = virXPathNode("./alias", ctxt)))
+ return 0;
+
+ if (!(model->alias = virXMLPropStringRequired(alias_node, "name")))
+ return -1;
+
+ return 0;
+}
+
+
static int
x86ModelParseDecode(virCPUx86Model *model,
xmlXPathContextPtr ctxt)
@@ -1665,6 +1684,9 @@ x86ModelParse(xmlXPathContextPtr ctxt,
model = g_new0(virCPUx86Model, 1);
model->name = g_strdup(name);
+ if (x86ModelParseAlias(model, ctxt) < 0)
+ return -1;
+
if (x86ModelParseDecode(model, ctxt) < 0)
return -1;
@@ -2184,26 +2206,30 @@ x86Decode(virCPUDef *cpu,
*/
for (i = map->nmodels - 1; i >= 0; i--) {
candidate = map->models[i];
- if (models &&
- !(hvModel = virDomainCapsCPUModelsGet(models, candidate->name))) {
- if (preferred &&
- !preferred[1] &&
- STREQ(candidate->name, preferred[0])) {
- if (cpu->fallback != VIR_CPU_FALLBACK_ALLOW) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- _("CPU model %1$s is not supported by
hypervisor"),
- preferred[0]);
- return -1;
- } else {
- VIR_WARN("Preferred CPU model %s not allowed by"
- " hypervisor; closest supported model will be"
- " used", preferred[0]);
- }
- } else {
- VIR_DEBUG("CPU model %s not allowed by hypervisor; ignoring",
- candidate->name);
- }
- continue;
+ if (models) {
+ hvModel = virDomainCapsCPUModelsGet(models, candidate->name);
+ if (!hvModel && candidate->alias)
+ hvModel = virDomainCapsCPUModelsGet(models, candidate->alias);
+ if (!hvModel) {
+ if (preferred &&
+ !preferred[1] &&
+ STREQ(candidate->name, preferred[0])) {
+ if (cpu->fallback != VIR_CPU_FALLBACK_ALLOW) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("CPU model %1$s is not supported by
hypervisor"),
+ preferred[0]);
+ return -1;
+ } else {
+ VIR_WARN("Preferred CPU model %s not allowed by"
+ " hypervisor; closest supported model will be"
+ " used", preferred[0]);
+ }
+ } else {
+ VIR_DEBUG("CPU model %s not allowed by hypervisor;
ignoring",
+ candidate->name);
+ }
+ continue;
+ }
}
/* Both vendor and candidate->vendor are pointers to a single list of
--
2.41.0
4:21 p.m.
New subject: [libvirt PATCH 03/19] cpu_map: Update EPYC cpu definitions from qemu
Since the EPYC CPUs were added to libvirt, some changes have been made
to these models in qemu, mostly adding features. Update these CPUS to
the latest values from qemu.
Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com>
---
src/cpu_map/x86_EPYC-IBPB.xml | 2 ++
src/cpu_map/x86_EPYC-Rome.xml | 1 +
src/cpu_map/x86_EPYC.xml | 2 ++
tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml | 1 -
tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-json.xml | 1 -
tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml | 2 --
tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml | 2 --
tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml | 2 --
tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml | 2 --
tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml | 2 --
tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-json.xml | 2 --
.../cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml | 2 --
.../cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml | 2 --
.../cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml | 2 --
tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml | 1 -
tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml | 1 -
tests/cputestdata/x86_64-cpuid-baseline-EPYC+Rome.xml | 2 --
tests/cputestdata/x86_64-cpuid-baseline-Ryzen+Rome.xml | 2 --
tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 1 -
tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 1 -
tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 1 -
tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 1 -
tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 1 -
tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 1 -
tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 1 -
tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 1 -
tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 1 -
tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 1 -
tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 1 -
tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 1 -
tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 1 -
tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 1 -
tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 1 -
tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 1 -
tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 1 -
tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 1 -
tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 1 -
tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 1 -
tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 1 -
tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 1 -
tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 1 -
tests/qemuxml2argvdata/cpu-fallback.x86_64-5.2.0.args | 2 +-
tests/qemuxml2argvdata/cpu-fallback.x86_64-8.0.0.args | 2 +-
tests/qemuxml2argvdata/cpu-fallback.xml | 1 -
.../qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.2.0.args | 2 +-
.../qemuxml2argvdata/cpu-host-model-fallback.x86_64-8.0.0.args | 2 +-
.../qemuxml2argvdata/cpu-host-model-fallback.x86_64-latest.args | 2 +-
.../cpu-host-model-nofallback.x86_64-7.2.0.args | 2 +-
.../cpu-host-model-nofallback.x86_64-8.0.0.args | 2 +-
.../cpu-host-model-nofallback.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/cpu-host-model.x86_64-5.1.0.args | 2 +-
tests/qemuxml2argvdata/cpu-host-model.x86_64-5.2.0.args | 2 +-
tests/qemuxml2argvdata/cpu-host-model.x86_64-6.0.0.args | 2 +-
tests/qemuxml2argvdata/cpu-host-model.x86_64-6.1.0.args | 2 +-
tests/qemuxml2argvdata/cpu-host-model.x86_64-6.2.0.args | 2 +-
tests/qemuxml2argvdata/cpu-host-model.x86_64-7.0.0.args | 2 +-
tests/qemuxml2argvdata/cpu-host-model.x86_64-7.1.0.args | 2 +-
tests/qemuxml2argvdata/cpu-host-model.x86_64-7.2.0.args | 2 +-
tests/qemuxml2argvdata/cpu-host-model.x86_64-8.0.0.args | 2 +-
tests/qemuxml2argvdata/cpu-nofallback.x86_64-8.0.0.args | 2 +-
tests/qemuxml2argvdata/cpu-nofallback.xml | 1 -
63 files changed, 23 insertions(+), 71 deletions(-)
diff --git a/src/cpu_map/x86_EPYC-IBPB.xml b/src/cpu_map/x86_EPYC-IBPB.xml
index fc5aadf52e..25cba0c0ab 100644
--- a/src/cpu_map/x86_EPYC-IBPB.xml
+++ b/src/cpu_map/x86_EPYC-IBPB.xml
@@ -38,6 +38,8 @@
<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'/>
diff --git a/src/cpu_map/x86_EPYC-Rome.xml b/src/cpu_map/x86_EPYC-Rome.xml
index e54d0a48d8..2b5744312b 100644
--- a/src/cpu_map/x86_EPYC-Rome.xml
+++ b/src/cpu_map/x86_EPYC-Rome.xml
@@ -79,5 +79,6 @@
<feature name='xsavec'/>
<feature name='xsaveerptr'/>
<feature name='xsaveopt'/>
+ <feature name='xsaves'/>
</model>
</cpus>
diff --git a/src/cpu_map/x86_EPYC.xml b/src/cpu_map/x86_EPYC.xml
index 3b406de37a..07319e182c 100644
--- a/src/cpu_map/x86_EPYC.xml
+++ b/src/cpu_map/x86_EPYC.xml
@@ -37,6 +37,8 @@
<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'/>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml
b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml
index 9b4ee7b959..2ce3b2d4ca 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml
@@ -5,7 +5,6 @@
<feature policy='require' name='monitor'/>
<feature policy='require' name='osxsave'/>
<feature policy='require' name='cmt'/>
- <feature policy='require' name='xsaves'/>
<feature policy='require' name='mbm_total'/>
<feature policy='require' name='mbm_local'/>
<feature policy='require' name='cmp_legacy'/>
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..3c9bb5854b 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
@@ -7,7 +7,6 @@
<feature name='monitor'/>
<feature name='osxsave'/>
<feature name='cmt'/>
- <feature name='xsaves'/>
<feature name='mbm_total'/>
<feature name='mbm_local'/>
<feature name='cmp_legacy'/>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-json.xml
b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-json.xml
index febfdfcf2b..01635daf5d 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-json.xml
@@ -9,7 +9,6 @@
<feature policy='require' name='stibp'/>
<feature policy='require' name='arch-capabilities'/>
<feature policy='require' name='ssbd'/>
- <feature policy='require' name='xsaves'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='amd-ssbd'/>
<feature policy='require' name='virt-ssbd'/>
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..770b83a9f4 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
@@ -16,10 +16,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-EPYC-7601-32-Core-host.xml
b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml
index 94f832071b..ccc8370be2 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml
@@ -18,10 +18,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-EPYC-7601-32-Core-ibpb-guest.xml
b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml
index ca877b867b..60988bb6fd 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml
@@ -16,10 +16,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-EPYC-7601-32-Core-ibpb-host.xml
b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml
index 42b8b5f986..057d202285 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
@@ -18,10 +18,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-EPYC-7601-32-Core-ibpb-json.xml
b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml
index 45f27a9a1f..69dd1d9a87 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml
@@ -6,8 +6,6 @@
<feature policy='require' name='hypervisor'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmp_legacy'/>
- <feature policy='require' name='npt'/>
- <feature policy='require' name='nrip-save'/>
<feature policy='disable' name='rdtscp'/>
<feature policy='disable' name='svm'/>
<feature policy='disable' name='monitor'/>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-json.xml
b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-json.xml
index 5af19749e7..214916cdf8 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-json.xml
@@ -6,8 +6,6 @@
<feature policy='require' name='hypervisor'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmp_legacy'/>
- <feature policy='require' name='npt'/>
- <feature policy='require' name='nrip-save'/>
<feature policy='disable' name='svm'/>
<feature policy='disable' name='monitor'/>
</cpu>
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..770b83a9f4 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
@@ -16,10 +16,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-Ryzen-7-1800X-Eight-Core-host.xml
b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml
index 1b0b0d4407..97a2b98b86 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml
@@ -18,10 +18,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-Ryzen-7-1800X-Eight-Core-json.xml
b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml
index 9b9af2a6f7..0ee1b03f8b 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml
@@ -6,8 +6,6 @@
<feature policy='require' name='hypervisor'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmp_legacy'/>
- <feature policy='require' name='npt'/>
- <feature policy='require' name='nrip-save'/>
<feature policy='disable' name='sha-ni'/>
<feature policy='disable' name='monitor'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml
b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml
index e934f4e8ef..8d919bdcf0 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml
@@ -5,7 +5,6 @@
<feature policy='require' name='monitor'/>
<feature policy='require' name='osxsave'/>
<feature policy='require' name='cmt'/>
- <feature policy='require' name='xsaves'/>
<feature policy='require' name='mbm_total'/>
<feature policy='require' name='mbm_local'/>
<feature policy='require' name='cmp_legacy'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml
b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml
index f1f4df1176..5566b2a8dd 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml
@@ -7,7 +7,6 @@
<feature name='monitor'/>
<feature name='osxsave'/>
<feature name='cmt'/>
- <feature name='xsaves'/>
<feature name='mbm_total'/>
<feature name='mbm_local'/>
<feature name='cmp_legacy'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml
b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml
index 7629a1b4a8..e5ae20005a 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml
@@ -8,7 +8,6 @@
<feature policy='require' name='stibp'/>
<feature policy='require' name='arch-capabilities'/>
<feature policy='require' name='ssbd'/>
- <feature policy='require' name='xsaves'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='amd-ssbd'/>
<feature policy='require' name='virt-ssbd'/>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-EPYC+Rome.xml
b/tests/cputestdata/x86_64-cpuid-baseline-EPYC+Rome.xml
index e1984b2890..66f89b118a 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-EPYC+Rome.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-EPYC+Rome.xml
@@ -6,8 +6,6 @@
<feature policy='require' name='hypervisor'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmp_legacy'/>
- <feature policy='require' name='npt'/>
- <feature policy='require' name='nrip-save'/>
<feature policy='disable' name='svm'/>
<feature policy='disable' name='monitor'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Ryzen+Rome.xml
b/tests/cputestdata/x86_64-cpuid-baseline-Ryzen+Rome.xml
index 051402b9d5..308869a308 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Ryzen+Rome.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Ryzen+Rome.xml
@@ -6,8 +6,6 @@
<feature policy='require' name='hypervisor'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmp_legacy'/>
- <feature policy='require' name='npt'/>
- <feature policy='require' name='nrip-save'/>
<feature policy='disable' name='sha-ni'/>
<feature policy='disable' name='monitor'/>
</cpu>
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..4ab5bedc1e 100644
--- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
@@ -51,7 +51,6 @@
<feature policy='require' name='stibp'/>
<feature policy='require' name='arch-capabilities'/>
<feature policy='require' name='ssbd'/>
- <feature policy='require' name='xsaves'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='invtsc'/>
<feature policy='require' name='amd-ssbd'/>
diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
index 735cd42466..499fa38c1d 100644
--- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
@@ -50,7 +50,6 @@
<feature policy='require' name='stibp'/>
<feature policy='require' name='arch-capabilities'/>
<feature policy='require' name='ssbd'/>
- <feature policy='require' name='xsaves'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='invtsc'/>
<feature policy='require' name='amd-ssbd'/>
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..8b20641da1 100644
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -51,7 +51,6 @@
<feature policy='require' name='stibp'/>
<feature policy='require' name='arch-capabilities'/>
<feature policy='require' name='ssbd'/>
- <feature policy='require' name='xsaves'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='invtsc'/>
<feature policy='require' name='amd-ssbd'/>
diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index 9bbb22b0d8..57d031b7ec 100644
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -50,7 +50,6 @@
<feature policy='require' name='stibp'/>
<feature policy='require' name='arch-capabilities'/>
<feature policy='require' name='ssbd'/>
- <feature policy='require' name='xsaves'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='invtsc'/>
<feature policy='require' name='amd-ssbd'/>
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..0da06a9499 100644
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -51,7 +51,6 @@
<feature policy='require' name='stibp'/>
<feature policy='require' name='arch-capabilities'/>
<feature policy='require' name='ssbd'/>
- <feature policy='require' name='xsaves'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='invtsc'/>
<feature policy='require' name='amd-ssbd'/>
diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index 0af8b9d064..a2c2f2f56f 100644
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -50,7 +50,6 @@
<feature policy='require' name='stibp'/>
<feature policy='require' name='arch-capabilities'/>
<feature policy='require' name='ssbd'/>
- <feature policy='require' name='xsaves'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='invtsc'/>
<feature policy='require' name='amd-ssbd'/>
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..d88d709fe2 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -51,7 +51,6 @@
<feature policy='require' name='stibp'/>
<feature policy='require' name='arch-capabilities'/>
<feature policy='require' name='ssbd'/>
- <feature policy='require' name='xsaves'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='invtsc'/>
<feature policy='require' name='amd-ssbd'/>
diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index 22f8c8a397..2187958750 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -50,7 +50,6 @@
<feature policy='require' name='stibp'/>
<feature policy='require' name='arch-capabilities'/>
<feature policy='require' name='ssbd'/>
- <feature policy='require' name='xsaves'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='invtsc'/>
<feature policy='require' name='amd-ssbd'/>
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..1f3a0c70ee 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -51,7 +51,6 @@
<feature policy='require' name='stibp'/>
<feature policy='require' name='arch-capabilities'/>
<feature policy='require' name='ssbd'/>
- <feature policy='require' name='xsaves'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='invtsc'/>
<feature policy='require' name='amd-ssbd'/>
diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index e6283ff153..f83ba1a949 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -50,7 +50,6 @@
<feature policy='require' name='stibp'/>
<feature policy='require' name='arch-capabilities'/>
<feature policy='require' name='ssbd'/>
- <feature policy='require' name='xsaves'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='invtsc'/>
<feature policy='require' name='amd-ssbd'/>
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..dbf5decd19 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -51,7 +51,6 @@
<feature policy='require' name='stibp'/>
<feature policy='require' name='arch-capabilities'/>
<feature policy='require' name='ssbd'/>
- <feature policy='require' name='xsaves'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='invtsc'/>
<feature policy='require' name='amd-ssbd'/>
diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index fa4b912168..c17c72061e 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -50,7 +50,6 @@
<feature policy='require' name='stibp'/>
<feature policy='require' name='arch-capabilities'/>
<feature policy='require' name='ssbd'/>
- <feature policy='require' name='xsaves'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='invtsc'/>
<feature policy='require' name='amd-ssbd'/>
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..7905d6ddd5 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -51,7 +51,6 @@
<feature policy='require' name='stibp'/>
<feature policy='require' name='arch-capabilities'/>
<feature policy='require' name='ssbd'/>
- <feature policy='require' name='xsaves'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='invtsc'/>
<feature policy='require' name='amd-ssbd'/>
diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index 449e1b51d1..65ac2414c8 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -50,7 +50,6 @@
<feature policy='require' name='stibp'/>
<feature policy='require' name='arch-capabilities'/>
<feature policy='require' name='ssbd'/>
- <feature policy='require' name='xsaves'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='invtsc'/>
<feature policy='require' name='amd-ssbd'/>
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..7a9ef1ffaa 100644
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -51,7 +51,6 @@
<feature policy='require' name='stibp'/>
<feature policy='require' name='arch-capabilities'/>
<feature policy='require' name='ssbd'/>
- <feature policy='require' name='xsaves'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='invtsc'/>
<feature policy='require' name='amd-ssbd'/>
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..ab7a3df9f3 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
@@ -52,7 +52,6 @@
<feature policy='require' name='pks'/>
<feature policy='require' name='3dnowext'/>
<feature policy='require' name='3dnow'/>
- <feature policy='require' name='npt'/>
<feature policy='require' name='vgif'/>
<feature policy='require' name='svme-addr-chk'/>
<feature policy='disable' name='vme'/>
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..ab7a3df9f3 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -52,7 +52,6 @@
<feature policy='require' name='pks'/>
<feature policy='require' name='3dnowext'/>
<feature policy='require' name='3dnow'/>
- <feature policy='require' name='npt'/>
<feature policy='require' name='vgif'/>
<feature policy='require' name='svme-addr-chk'/>
<feature policy='disable' name='vme'/>
diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
index d116cf2e48..f5ffc76a9c 100644
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -50,7 +50,6 @@
<feature policy='require' name='stibp'/>
<feature policy='require' name='arch-capabilities'/>
<feature policy='require' name='ssbd'/>
- <feature policy='require' name='xsaves'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='invtsc'/>
<feature policy='require' name='amd-ssbd'/>
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..2e6f13d873 100644
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -51,7 +51,6 @@
<feature policy='require' name='stibp'/>
<feature policy='require' name='arch-capabilities'/>
<feature policy='require' name='ssbd'/>
- <feature policy='require' name='xsaves'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='invtsc'/>
<feature policy='require' name='amd-ssbd'/>
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..404a6fcdad 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -56,7 +56,6 @@
<feature policy='require' name='fsrc'/>
<feature policy='require' name='3dnowext'/>
<feature policy='require' name='3dnow'/>
- <feature policy='require' name='npt'/>
<feature policy='require' name='vgif'/>
<feature policy='require' name='svme-addr-chk'/>
<feature policy='disable' name='vme'/>
diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index 07d1d06115..65740c2a27 100644
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -50,7 +50,6 @@
<feature policy='require' name='stibp'/>
<feature policy='require' name='arch-capabilities'/>
<feature policy='require' name='ssbd'/>
- <feature policy='require' name='xsaves'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='invtsc'/>
<feature policy='require' name='amd-ssbd'/>
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..2ddb945e37 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -59,7 +59,6 @@
<feature policy='require' name='3dnow'/>
<feature policy='require' name='xsaveerptr'/>
<feature policy='require' name='wbnoinvd'/>
- <feature policy='require' name='npt'/>
<feature policy='require' name='vgif'/>
<feature policy='require' name='svme-addr-chk'/>
<feature policy='disable' name='vme'/>
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 c6601496fe..5752d3cdc9 100644
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -59,7 +59,6 @@
<feature policy='require' name='3dnow'/>
<feature policy='require' name='xsaveerptr'/>
<feature policy='require' name='wbnoinvd'/>
- <feature policy='require' name='npt'/>
<feature policy='require' name='vgif'/>
<feature policy='require' name='svme-addr-chk'/>
<feature policy='disable' name='vme'/>
diff --git a/tests/qemuxml2argvdata/cpu-fallback.x86_64-5.2.0.args
b/tests/qemuxml2argvdata/cpu-fallback.x86_64-5.2.0.args
index ecc6bb3977..7d393ea3c7 100644
--- a/tests/qemuxml2argvdata/cpu-fallback.x86_64-5.2.0.args
+++ b/tests/qemuxml2argvdata/cpu-fallback.x86_64-5.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
-machine pc-i440fx-5.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel kvm \
--cpu EPYC-Rome,amd-ssbd=off,erms=off,fsrm=off,invpcid=off,pcid=off,pku=off,xsaves=off \
+-cpu EPYC-Rome,amd-ssbd=off,erms=off,fsrm=off,invpcid=off,pcid=off,pku=off \
-m size=219136k \
-object memory-backend-ram,id=pc.ram,size=224395264 \
-overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/cpu-fallback.x86_64-8.0.0.args
b/tests/qemuxml2argvdata/cpu-fallback.x86_64-8.0.0.args
index b0ce1dfcbd..9626a8cffd 100644
--- a/tests/qemuxml2argvdata/cpu-fallback.x86_64-8.0.0.args
+++ b/tests/qemuxml2argvdata/cpu-fallback.x86_64-8.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc-i440fx-8.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel kvm \
--cpu
EPYC-Milan,amd-ssbd=off,erms=off,fsrm=off,ibrs=off,invpcid=off,pcid=off,pku=off,svme-addr-chk=off,xsaves=off
\
+-cpu
EPYC-Milan,amd-ssbd=off,erms=off,fsrm=off,ibrs=off,invpcid=off,pcid=off,pku=off,svme-addr-chk=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-fallback.xml
b/tests/qemuxml2argvdata/cpu-fallback.xml
index d5674f6d17..5ac6b3ce9e 100644
--- a/tests/qemuxml2argvdata/cpu-fallback.xml
+++ b/tests/qemuxml2argvdata/cpu-fallback.xml
@@ -18,7 +18,6 @@
<feature policy='disable' name='pcid'/>
<feature policy='disable' name='pku'/>
<feature policy='disable' name='svme-addr-chk'/>
- <feature policy='disable' name='xsaves'/>
</cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.2.0.args
b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.2.0.args
index 1e7f444d73..9025de3d5f 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.2.0.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.2.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-7.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel tcg \
--cpu
EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,pks=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,rdseed=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,nrip-save=off
\
+-cpu
EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,pks=on,3dnowext=on,3dnow=on,vgif=on,svme-addr-chk=on,vme=off,rdseed=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,nrip-save=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.x86_64-8.0.0.args
b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-8.0.0.args
index 943b0d477b..178d7b335a 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-8.0.0.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-8.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc-i440fx-8.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
--cpu
EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,pks=on,fsrm=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,rdseed=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,nrip-save=off
\
+-cpu
EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,pks=on,fsrm=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,vgif=on,svme-addr-chk=on,vme=off,rdseed=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,nrip-save=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.x86_64-latest.args
b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-latest.args
index 135aed7287..754a00f4a0 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.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 tcg \
--cpu
EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,osvw=off,topoext=off,nrip-save=off
\
+-cpu
EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,vgif=on,svme-addr-chk=on,vme=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,osvw=off,topoext=off,nrip-save=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.x86_64-7.2.0.args
b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.2.0.args
index 1e7f444d73..9025de3d5f 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.2.0.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.2.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-7.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel tcg \
--cpu
EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,pks=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,rdseed=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,nrip-save=off
\
+-cpu
EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,pks=on,3dnowext=on,3dnow=on,vgif=on,svme-addr-chk=on,vme=off,rdseed=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,nrip-save=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.x86_64-8.0.0.args
b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-8.0.0.args
index 943b0d477b..178d7b335a 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-8.0.0.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-8.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc-i440fx-8.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
--cpu
EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,pks=on,fsrm=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,rdseed=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,nrip-save=off
\
+-cpu
EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,pks=on,fsrm=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,vgif=on,svme-addr-chk=on,vme=off,rdseed=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,nrip-save=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.x86_64-latest.args
b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-latest.args
index 135aed7287..754a00f4a0 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.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 tcg \
--cpu
EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,osvw=off,topoext=off,nrip-save=off
\
+-cpu
EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,vgif=on,svme-addr-chk=on,vme=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,osvw=off,topoext=off,nrip-save=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.x86_64-5.1.0.args
b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.1.0.args
index 0d2eea3e62..610e6ee143 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.1.0.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.1.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
-machine pc-q35-5.1,usb=off,dump-guest-core=off \
-accel kvm \
--cpu
EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on
\
+-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,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on
\
-m size=219136k \
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.2.0.args
b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.2.0.args
index 93c6a576e9..74fcdb56de 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.2.0.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
-machine pc-q35-5.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel kvm \
--cpu
EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on
\
+-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,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on
\
-m size=219136k \
-object memory-backend-ram,id=pc.ram,size=224395264 \
-overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.0.0.args
b/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.0.0.args
index 5f24227b8e..c687648cec 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.0.0.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc-q35-6.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel kvm \
--cpu
EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on
\
+-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,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on
\
-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.x86_64-6.1.0.args
b/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.1.0.args
index 2678b334d9..fe4a9aa46e 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.1.0.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.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-6.1,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel kvm \
--cpu
EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on
\
+-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,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on
\
-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.x86_64-6.2.0.args
b/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.2.0.args
index f65444948e..d539841587 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.2.0.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.2.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-6.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel kvm \
--cpu
EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on
\
+-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,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on
\
-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.x86_64-7.0.0.args
b/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.0.0.args
index 8f8b1645d5..05e9cc2dae 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.0.0.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc-q35-7.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel kvm \
--cpu
EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,tsc-scale=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on
\
+-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,tsc-scale=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on
\
-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.x86_64-7.1.0.args
b/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.1.0.args
index df03bafab3..ae0879d231 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.1.0.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.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-7.1,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel kvm \
--cpu
EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,tsc-scale=on,vmcb-clean=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on
\
+-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,tsc-scale=on,vmcb-clean=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on
\
-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.x86_64-7.2.0.args
b/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.2.0.args
index 7a796812fa..6d61400de5 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.2.0.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.2.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-7.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel kvm \
--cpu
EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=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,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on
\
+-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,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on
\
-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.x86_64-8.0.0.args
b/tests/qemuxml2argvdata/cpu-host-model.x86_64-8.0.0.args
index d63438e81c..4b632aea97 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-8.0.0.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-8.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc-q35-8.0,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,xsaves=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,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on
\
+-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,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on
\
-m size=219136k \
-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/cpu-nofallback.x86_64-8.0.0.args
b/tests/qemuxml2argvdata/cpu-nofallback.x86_64-8.0.0.args
index b0ce1dfcbd..9626a8cffd 100644
--- a/tests/qemuxml2argvdata/cpu-nofallback.x86_64-8.0.0.args
+++ b/tests/qemuxml2argvdata/cpu-nofallback.x86_64-8.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc-i440fx-8.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel kvm \
--cpu
EPYC-Milan,amd-ssbd=off,erms=off,fsrm=off,ibrs=off,invpcid=off,pcid=off,pku=off,svme-addr-chk=off,xsaves=off
\
+-cpu
EPYC-Milan,amd-ssbd=off,erms=off,fsrm=off,ibrs=off,invpcid=off,pcid=off,pku=off,svme-addr-chk=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-nofallback.xml
b/tests/qemuxml2argvdata/cpu-nofallback.xml
index ce1414559f..545dc17af6 100644
--- a/tests/qemuxml2argvdata/cpu-nofallback.xml
+++ b/tests/qemuxml2argvdata/cpu-nofallback.xml
@@ -18,7 +18,6 @@
<feature policy='disable' name='pcid'/>
<feature policy='disable' name='pku'/>
<feature policy='disable' name='svme-addr-chk'/>
- <feature policy='disable' name='xsaves'/>
</cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
--
2.41.0
4:21 p.m.
New subject: [libvirt PATCH 04/19] cpu_map: Add versioned EPYC CPUs
---
src/cpu_map/index.xml | 6 +
src/cpu_map/meson.build | 6 +
src/cpu_map/x86_EPYC-IBPB.xml | 1 +
src/cpu_map/x86_EPYC-Milan-v2.xml | 108 ++++++++++++++++++
src/cpu_map/x86_EPYC-Milan.xml | 1 +
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-Rome.xml | 1 +
src/cpu_map/x86_EPYC-v3.xml | 87 ++++++++++++++
src/cpu_map/x86_EPYC-v4.xml | 88 ++++++++++++++
src/cpu_map/x86_EPYC.xml | 1 +
.../x86_64-cpuid-EPYC-7502-32-Core-host.xml | 4 +-
.../x86_64-cpuid-EPYC-7601-32-Core-guest.xml | 7 +-
...6_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml | 6 +-
...4-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml | 7 +-
.../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 +-
.../cpu-host-model.x86_64-latest.args | 2 +-
54 files changed, 685 insertions(+), 31 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-IBPB.xml b/src/cpu_map/x86_EPYC-IBPB.xml
index 25cba0c0ab..f93dc29213 100644
--- a/src/cpu_map/x86_EPYC-IBPB.xml
+++ b/src/cpu_map/x86_EPYC-IBPB.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='EPYC-IBPB'>
+ <alias name='EPYC-v2'/>
<decode host='on' guest='on'/>
<signature family='23' model='1'/> <!-- 800f10 -->
<vendor name='AMD'/>
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-Milan.xml b/src/cpu_map/x86_EPYC-Milan.xml
index 3055e175fa..5163469256 100644
--- a/src/cpu_map/x86_EPYC-Milan.xml
+++ b/src/cpu_map/x86_EPYC-Milan.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='EPYC-Milan'>
+ <alias name='EPYC-Milan-v1'/>
<decode host='on' guest='on'/>
<signature family='25' model='1'/>
<vendor name='AMD'/>
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-Rome.xml b/src/cpu_map/x86_EPYC-Rome.xml
index 2b5744312b..7b42442a1e 100644
--- a/src/cpu_map/x86_EPYC-Rome.xml
+++ b/src/cpu_map/x86_EPYC-Rome.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='EPYC-Rome'>
+ <alias name='EPYC-Rome-v1'/>
<decode host='on' guest='on'/>
<signature family='23' model='49'/>
<vendor name='AMD'/>
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/src/cpu_map/x86_EPYC.xml b/src/cpu_map/x86_EPYC.xml
index 07319e182c..38096fce1c 100644
--- a/src/cpu_map/x86_EPYC.xml
+++ b/src/cpu_map/x86_EPYC.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='EPYC'>
+ <alias name='EPYC-v1'/>
<decode host='on' guest='on'/>
<signature family='23' model='1'/> <!-- 800f10 -->
<vendor name='AMD'/>
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 3c9bb5854b..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,6 +1,6 @@
<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'/>
@@ -18,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 770b83a9f4..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,21 +1,17 @@
<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='lbrv'/>
<feature policy='require' name='svm-lock'/>
<feature policy='require' name='tsc-scale'/>
@@ -27,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 057d202285..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,23 +1,19 @@
<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='lbrv'/>
<feature name='svm-lock'/>
<feature name='tsc-scale'/>
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 770b83a9f4..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,21 +1,17 @@
<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='lbrv'/>
<feature policy='require' name='svm-lock'/>
<feature policy='require' name='tsc-scale'/>
@@ -27,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 f17a775344..f5da971e3b 100644
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
@@ -102,6 +102,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 a2e5dc2be4..83d6cece2e 100644
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
@@ -101,6 +101,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 4ab5bedc1e..6ec2e69978 100644
--- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-q35.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.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 499fa38c1d..751303eaa5 100644
--- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
@@ -101,6 +101,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 8b20641da1..587aae9791 100644
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.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-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 57d031b7ec..687684fc4d 100644
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -101,6 +101,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 0da06a9499..9b5b0cfc18 100644
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.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.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 a2c2f2f56f..8a9dd7ef89 100644
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -101,6 +101,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 d88d709fe2..54db281b89 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.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.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 2187958750..dcbcc03737 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.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.2.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
index 1f3a0c70ee..a7f4bc2f6d 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.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.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 f83ba1a949..2a9a199a82 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.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_7.0.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
index dbf5decd19..6d927f7d43 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.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.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 c17c72061e..d85ae46574 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.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.1.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
index 7905d6ddd5..655b151c9f 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.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_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 65ac2414c8..ff960b5747 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.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_7.2.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
index 7a9ef1ffaa..c6e45a4f70 100644
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.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_7.2.0-tcg.x86_64+hvf.xml
b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
index ab7a3df9f3..b3670c108a 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
@@ -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='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 ab7a3df9f3..b3670c108a 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.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='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 f5ffc76a9c..6d18366f76 100644
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -107,6 +107,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 2e6f13d873..0637e07f1c 100644
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.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_8.0.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
index 404a6fcdad..02d30c3a5e 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.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='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 65740c2a27..6a9c7da907 100644
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.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.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 2ddb945e37..e64635ec76 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.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.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 bb3578d5d7..f40185ead0 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'/>
@@ -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.2.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
index 5752d3cdc9..b04dfdb914 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 1be5ff2c93..900982f97d 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'/>
@@ -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/qemuxml2argvdata/cpu-host-model.x86_64-latest.args
b/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args
index dba1d9b65a..7b83380d33 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.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,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 \
--
2.41.0
4:21 p.m.
New subject: [libvirt PATCH 05/19] cpu_map: Add versioned Intel Nehalem CPUs
---
src/cpu_map/x86_Nehalem-IBRS.xml | 1 +
src/cpu_map/x86_Nehalem.xml | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/cpu_map/x86_Nehalem-IBRS.xml b/src/cpu_map/x86_Nehalem-IBRS.xml
index 00d0d2fe51..1d19cab20f 100644
--- a/src/cpu_map/x86_Nehalem-IBRS.xml
+++ b/src/cpu_map/x86_Nehalem-IBRS.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='Nehalem-IBRS'>
+ <alias name='Nehalem-v2'/>
<decode host='on' guest='on'/>
<signature family='6' model='26'/> <!-- 0106a0 -->
<signature family='6' model='30'/> <!-- 0106e0 -->
diff --git a/src/cpu_map/x86_Nehalem.xml b/src/cpu_map/x86_Nehalem.xml
index 9968001fe7..21f9aa1fff 100644
--- a/src/cpu_map/x86_Nehalem.xml
+++ b/src/cpu_map/x86_Nehalem.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='Nehalem'>
+ <alias name='Nehalem-v1'/>
<decode host='on' guest='on'/>
<signature family='6' model='26'/> <!-- 0106a0 -->
<signature family='6' model='30'/> <!-- 0106e0 -->
--
2.41.0
4:21 p.m.
New subject: [libvirt PATCH 06/19] cpu_map: Add versioned Intel Westmere CPUs
Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com>
---
src/cpu_map/x86_Westmere-IBRS.xml | 1 +
src/cpu_map/x86_Westmere.xml | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/cpu_map/x86_Westmere-IBRS.xml b/src/cpu_map/x86_Westmere-IBRS.xml
index c7898f0c22..46460b5a7d 100644
--- a/src/cpu_map/x86_Westmere-IBRS.xml
+++ b/src/cpu_map/x86_Westmere-IBRS.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='Westmere-IBRS'>
+ <alias name='Westmere-v2'/>
<decode host='on' guest='on'/>
<signature family='6' model='44'/> <!-- 0206c0 -->
<vendor name='Intel'/>
diff --git a/src/cpu_map/x86_Westmere.xml b/src/cpu_map/x86_Westmere.xml
index 16e4ad6c30..3e9dc0f73c 100644
--- a/src/cpu_map/x86_Westmere.xml
+++ b/src/cpu_map/x86_Westmere.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='Westmere'>
+ <alias name='Westmere-v1'/>
<decode host='on' guest='on'/>
<signature family='6' model='44'/> <!-- 0206c0 -->
<signature family='6' model='47'/> <!-- 0206f0 -->
--
2.41.0
4:21 p.m.
New subject: [libvirt PATCH 07/19] cpu_map: Add versioned Intel SandyBridge CPUs
Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com>
---
src/cpu_map/x86_SandyBridge-IBRS.xml | 1 +
src/cpu_map/x86_SandyBridge.xml | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/cpu_map/x86_SandyBridge-IBRS.xml b/src/cpu_map/x86_SandyBridge-IBRS.xml
index fbdb4f2bf6..24cc22f596 100644
--- a/src/cpu_map/x86_SandyBridge-IBRS.xml
+++ b/src/cpu_map/x86_SandyBridge-IBRS.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='SandyBridge-IBRS'>
+ <alias name='SandyBridge-v2'/>
<decode host='on' guest='on'/>
<signature family='6' model='42'/> <!-- 0206a0 -->
<signature family='6' model='45'/> <!-- 0206d0 -->
diff --git a/src/cpu_map/x86_SandyBridge.xml b/src/cpu_map/x86_SandyBridge.xml
index 7c85ed42df..8faa73a86e 100644
--- a/src/cpu_map/x86_SandyBridge.xml
+++ b/src/cpu_map/x86_SandyBridge.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='SandyBridge'>
+ <alias name='SandyBridge-v1'/>
<decode host='on' guest='on'/>
<signature family='6' model='42'/> <!-- 0206a0 -->
<signature family='6' model='45'/> <!-- 0206d0 -->
--
2.41.0
4:21 p.m.
New subject: [libvirt PATCH 08/19] cpu_map: Add versioned Intel IvyBridge CPUs
Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com>
---
src/cpu_map/x86_IvyBridge-IBRS.xml | 1 +
src/cpu_map/x86_IvyBridge.xml | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/cpu_map/x86_IvyBridge-IBRS.xml b/src/cpu_map/x86_IvyBridge-IBRS.xml
index 430bc3232d..b2b257c11c 100644
--- a/src/cpu_map/x86_IvyBridge-IBRS.xml
+++ b/src/cpu_map/x86_IvyBridge-IBRS.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='IvyBridge-IBRS'>
+ <alias name='IvyBridge-v2'/>
<decode host='on' guest='on'/>
<signature family='6' model='58'/> <!-- 0306a0 -->
<signature family='6' model='62'/> <!-- 0306e0 -->
diff --git a/src/cpu_map/x86_IvyBridge.xml b/src/cpu_map/x86_IvyBridge.xml
index eaf5d02e82..579af5f817 100644
--- a/src/cpu_map/x86_IvyBridge.xml
+++ b/src/cpu_map/x86_IvyBridge.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='IvyBridge'>
+ <alias name='IvyBridge-v1'/>
<decode host='on' guest='on'/>
<signature family='6' model='58'/> <!-- 0306a0 -->
<signature family='6' model='62'/> <!-- 0306e0 -->
--
2.41.0
4:21 p.m.
New subject: [libvirt PATCH 09/19] cpu_map: Add versioned Intel Haswell CPUs
Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com>
---
src/cpu_map/x86_Haswell-IBRS.xml | 1 +
src/cpu_map/x86_Haswell-noTSX-IBRS.xml | 1 +
src/cpu_map/x86_Haswell-noTSX.xml | 1 +
src/cpu_map/x86_Haswell.xml | 1 +
4 files changed, 4 insertions(+)
diff --git a/src/cpu_map/x86_Haswell-IBRS.xml b/src/cpu_map/x86_Haswell-IBRS.xml
index 0ffe2bae0d..10ab7e2032 100644
--- a/src/cpu_map/x86_Haswell-IBRS.xml
+++ b/src/cpu_map/x86_Haswell-IBRS.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='Haswell-IBRS'>
+ <alias name='Haswell-v3'/>
<decode host='on' guest='on'/>
<signature family='6' model='60'/> <!-- 0306c0 -->
<signature family='6' model='63'/> <!-- 0306f0 -->
diff --git a/src/cpu_map/x86_Haswell-noTSX-IBRS.xml
b/src/cpu_map/x86_Haswell-noTSX-IBRS.xml
index 75d709c009..23bf427df8 100644
--- a/src/cpu_map/x86_Haswell-noTSX-IBRS.xml
+++ b/src/cpu_map/x86_Haswell-noTSX-IBRS.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='Haswell-noTSX-IBRS'>
+ <alias name='Haswell-v4'/>
<decode host='on' guest='on'/>
<signature family='6' model='60'/> <!-- 0306c0 -->
<signature family='6' model='63'/> <!-- 0306f0 -->
diff --git a/src/cpu_map/x86_Haswell-noTSX.xml b/src/cpu_map/x86_Haswell-noTSX.xml
index b0a0faa856..eec6d046a0 100644
--- a/src/cpu_map/x86_Haswell-noTSX.xml
+++ b/src/cpu_map/x86_Haswell-noTSX.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='Haswell-noTSX'>
+ <alias name='Haswell-v2'/>
<decode host='on' guest='on'/>
<signature family='6' model='60'/> <!-- 0306c0 -->
<signature family='6' model='63'/> <!-- 0306f0 -->
diff --git a/src/cpu_map/x86_Haswell.xml b/src/cpu_map/x86_Haswell.xml
index ee16b30f19..c3ec40ce19 100644
--- a/src/cpu_map/x86_Haswell.xml
+++ b/src/cpu_map/x86_Haswell.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='Haswell'>
+ <alias name='Haswell-v1'/>
<decode host='on' guest='on'/>
<signature family='6' model='60'/> <!-- 0306c0 -->
<signature family='6' model='63'/> <!-- 0306f0 -->
--
2.41.0
4:21 p.m.
New subject: [libvirt PATCH 10/19] cpu_map: Add versioned Intel Broadwell CPUs
Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com>
---
src/cpu_map/x86_Broadwell-IBRS.xml | 1 +
src/cpu_map/x86_Broadwell-noTSX-IBRS.xml | 1 +
src/cpu_map/x86_Broadwell-noTSX.xml | 1 +
src/cpu_map/x86_Broadwell.xml | 1 +
4 files changed, 4 insertions(+)
diff --git a/src/cpu_map/x86_Broadwell-IBRS.xml b/src/cpu_map/x86_Broadwell-IBRS.xml
index 9033d5fcd5..e54233dfa9 100644
--- a/src/cpu_map/x86_Broadwell-IBRS.xml
+++ b/src/cpu_map/x86_Broadwell-IBRS.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='Broadwell-IBRS'>
+ <alias name='Broadwell-v3'/>
<decode host='on' guest='on'/>
<signature family='6' model='61'/> <!-- 0306d0 -->
<signature family='6' model='71'/> <!-- 040670 -->
diff --git a/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml
b/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml
index c044b60e36..637fb7a2cb 100644
--- a/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml
+++ b/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='Broadwell-noTSX-IBRS'>
+ <alias name='Broadwell-v4'/>
<decode host='on' guest='on'/>
<signature family='6' model='61'/> <!-- 0306d0 -->
<signature family='6' model='71'/> <!-- 040670 -->
diff --git a/src/cpu_map/x86_Broadwell-noTSX.xml b/src/cpu_map/x86_Broadwell-noTSX.xml
index 637f29ba1c..4d70fcacb2 100644
--- a/src/cpu_map/x86_Broadwell-noTSX.xml
+++ b/src/cpu_map/x86_Broadwell-noTSX.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='Broadwell-noTSX'>
+ <alias name='Broadwell-v2'/>
<decode host='on' guest='on'/>
<signature family='6' model='61'/> <!-- 0306d0 -->
<signature family='6' model='71'/> <!-- 040670 -->
diff --git a/src/cpu_map/x86_Broadwell.xml b/src/cpu_map/x86_Broadwell.xml
index 82939a4509..c638418d27 100644
--- a/src/cpu_map/x86_Broadwell.xml
+++ b/src/cpu_map/x86_Broadwell.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='Broadwell'>
+ <alias name='Broadwell-v1'/>
<decode host='on' guest='on'/>
<signature family='6' model='61'/> <!-- 0306d0 -->
<signature family='6' model='71'/> <!-- 040670 -->
--
2.41.0
4:21 p.m.
New subject: [libvirt PATCH 11/19] 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-IBRS.xml | 1 +
src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml | 1 +
src/cpu_map/x86_Skylake-Client-v4.xml | 77 +++++++++++++++++
src/cpu_map/x86_Skylake-Client.xml | 1 +
src/cpu_map/x86_Skylake-Server-IBRS.xml | 1 +
src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml | 1 +
src/cpu_map/x86_Skylake-Server-v4.xml | 83 ++++++++++++++++++
src/cpu_map/x86_Skylake-Server-v5.xml | 85 +++++++++++++++++++
src/cpu_map/x86_Skylake-Server.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 | 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 +
45 files changed, 341 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-IBRS.xml
b/src/cpu_map/x86_Skylake-Client-IBRS.xml
index 5709e7c2f9..9f0c0f75e8 100644
--- a/src/cpu_map/x86_Skylake-Client-IBRS.xml
+++ b/src/cpu_map/x86_Skylake-Client-IBRS.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='Skylake-Client-IBRS'>
+ <alias name='Skylake-Client-v2'/>
<decode host='on' guest='on'/>
<signature family='6' model='94'/> <!-- 0506e0 -->
<signature family='6' model='78'/> <!-- 0406e0 -->
diff --git a/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
b/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
index ffba34502a..cfb3446480 100644
--- a/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
+++ b/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='Skylake-Client-noTSX-IBRS'>
+ <alias name='Skylake-Client-v3'/>
<decode host='on' guest='off'/>
<signature family='6' model='94'/> <!-- 0506e0 -->
<signature family='6' model='78'/> <!-- 0406e0 -->
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-Client.xml b/src/cpu_map/x86_Skylake-Client.xml
index 14cd57e176..1cef4fb1c7 100644
--- a/src/cpu_map/x86_Skylake-Client.xml
+++ b/src/cpu_map/x86_Skylake-Client.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='Skylake-Client'>
+ <alias name='Skylake-Client-v1'/>
<decode host='on' guest='on'/>
<signature family='6' model='94'/> <!-- 0506e0 -->
<signature family='6' model='78'/> <!-- 0406e0 -->
diff --git a/src/cpu_map/x86_Skylake-Server-IBRS.xml
b/src/cpu_map/x86_Skylake-Server-IBRS.xml
index 9fb3488809..a675e5fee6 100644
--- a/src/cpu_map/x86_Skylake-Server-IBRS.xml
+++ b/src/cpu_map/x86_Skylake-Server-IBRS.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='Skylake-Server-IBRS'>
+ <alias name='Skylake-Server-v2'/>
<decode host='on' guest='on'/>
<signature family='6' model='85' stepping='0-4'/>
<!-- 050654 -->
<vendor name='Intel'/>
diff --git a/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
b/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
index c162c0acc3..6d34904207 100644
--- a/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
+++ b/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='Skylake-Server-noTSX-IBRS'>
+ <alias name='Skylake-Server-v3'/>
<decode host='on' guest='off'/>
<signature family='6' model='85' stepping='0-4'/>
<!-- 050654 -->
<vendor name='Intel'/>
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/src/cpu_map/x86_Skylake-Server.xml b/src/cpu_map/x86_Skylake-Server.xml
index e022d94c84..154bc7d848 100644
--- a/src/cpu_map/x86_Skylake-Server.xml
+++ b/src/cpu_map/x86_Skylake-Server.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='Skylake-Server'>
+ <alias name='Skylake-Server-v1'/>
<decode host='on' guest='on'/>
<signature family='6' model='85' stepping='0-4'/>
<!-- 050654 -->
<vendor name='Intel'/>
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 6ec2e69978..33bd2b605d 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='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 751303eaa5..b0b0530721 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='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 587aae9791..f938ee821c 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='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 687684fc4d..57ee4d850a 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='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 9b5b0cfc18..d93b9f071c 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='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 8a9dd7ef89..50fbe868ba 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='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 54db281b89..2f93030d93 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.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.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 dcbcc03737..2633fe80c5 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -76,9 +76,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 a7f4bc2f6d..15a0c1beb8 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.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-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 2a9a199a82..62d6b1f103 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -76,9 +76,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 6d927f7d43..8378536814 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.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_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 d85ae46574..ee2bffdbf1 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.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.1.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
index 655b151c9f..5a772eeba4 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.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.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 ff960b5747..44bfe95e2f 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.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.2.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
index c6e45a4f70..fce5d3e044 100644
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.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_7.2.0-tcg.x86_64+hvf.xml
b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
index b3670c108a..078fed1114 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,9 +81,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 b3670c108a..078fed1114 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -81,9 +81,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 6d18366f76..9ac588d268 100644
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -83,9 +83,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 0637e07f1c..abbed1b73c 100644
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.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-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
index 02d30c3a5e..3995254276 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.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.x86_64.xml
b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index 6a9c7da907..eddbda134f 100644
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -83,9 +83,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 e64635ec76..49c76918cc 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.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.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 f40185ead0..2e992f00af 100644
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.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.2.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
index b04dfdb914..750f6d5c83 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 900982f97d..b3d8314097 100644
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.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>
--
2.41.0
4:21 p.m.
New subject: [libvirt PATCH 12/19] 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-noTSX.xml | 1 +
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_Cascadelake-Server.xml | 1 +
.../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 +
55 files changed, 401 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-noTSX.xml
b/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
index bfd4629836..3ddd4e9947 100644
--- a/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
+++ b/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='Cascadelake-Server-noTSX'>
+ <alias name='Cascadelake-Server-v3'/>
<decode host='on' guest='off'/>
<signature family='6' model='85' stepping='5-7'/>
<!-- 050654 -->
<vendor name='Intel'/>
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/src/cpu_map/x86_Cascadelake-Server.xml
b/src/cpu_map/x86_Cascadelake-Server.xml
index 335e9cb584..3805ce9d59 100644
--- a/src/cpu_map/x86_Cascadelake-Server.xml
+++ b/src/cpu_map/x86_Cascadelake-Server.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='Cascadelake-Server'>
+ <alias name='Cascadelake-Server-v1'/>
<decode host='on' guest='on'/>
<signature family='6' model='85' stepping='5-7'/>
<!-- 050654 -->
<vendor name='Intel'/>
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 10c256ee1e..2e1fe57f7e 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'/>
</cpu>
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 ecac749b97..39222a641c 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'/>
</cpu>
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 3cbd234f9b..77538ed9ea 100644
--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
@@ -106,6 +106,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 274c1ea8d8..1620043b73 100644
--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
@@ -105,6 +105,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 f5da971e3b..2d92cb39b4 100644
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
@@ -109,6 +109,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 83d6cece2e..1cd9771eec 100644
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
@@ -108,6 +108,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 33bd2b605d..d322b5678a 100644
--- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-q35.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.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 b0b0530721..d177db8a2a 100644
--- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
@@ -109,6 +109,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 f938ee821c..d807f09100 100644
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.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-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 57ee4d850a..9010cb524c 100644
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -109,6 +109,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 d93b9f071c..53e320f18d 100644
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.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.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 50fbe868ba..9f77efd3c7 100644
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.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_6.1.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
index 2f93030d93..4dd62848bc 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.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.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 2633fe80c5..43d0b7afc8 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -114,6 +114,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 15a0c1beb8..0d87339ec1 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.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-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 62d6b1f103..618f0ece23 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -114,6 +114,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 8378536814..4889ae157b 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.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.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 ee2bffdbf1..c782eb31c4 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.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.1.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
index 5a772eeba4..0f40cbb3ec 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.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.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 44bfe95e2f..1d53a5806d 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -114,6 +114,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 fce5d3e044..12d0cbd1b2 100644
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.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_7.2.0-tcg.x86_64+hvf.xml
b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
index 078fed1114..49bdf88309 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
@@ -117,6 +117,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 078fed1114..49bdf88309 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -117,6 +117,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 9ac588d268..d1647a7878 100644
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -119,6 +119,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 abbed1b73c..cc40e9c229 100644
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.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_8.0.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
index 3995254276..2911327c4c 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -122,6 +122,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 eddbda134f..06a8be84c4 100644
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.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.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 49c76918cc..ccc8bcce9b 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.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_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 2e992f00af..46c33b2870 100644
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.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.2.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
index 750f6d5c83..004c9ea3de 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 b3d8314097..18a6c4f878 100644
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.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>
--
2.41.0
4:21 p.m.
New subject: [libvirt PATCH 13/19] 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-noTSX.xml | 1 +
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_Icelake-Server.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 | 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 +
45 files changed, 554 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-noTSX.xml
b/src/cpu_map/x86_Icelake-Server-noTSX.xml
index 7c9c32c977..f77bf6eb3e 100644
--- a/src/cpu_map/x86_Icelake-Server-noTSX.xml
+++ b/src/cpu_map/x86_Icelake-Server-noTSX.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='Icelake-Server-noTSX'>
+ <alias name='Icelake-Server-v2'/>
<decode host='on' guest='off'/>
<signature family='6' model='106'/> <!-- 0606A5 -->
<vendor name='Intel'/>
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/src/cpu_map/x86_Icelake-Server.xml b/src/cpu_map/x86_Icelake-Server.xml
index b4685bead0..6bebbf174c 100644
--- a/src/cpu_map/x86_Icelake-Server.xml
+++ b/src/cpu_map/x86_Icelake-Server.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='Icelake-Server'>
+ <alias name='Icelake-Server-v1'/>
<decode host='on' guest='on'/>
<signature family='6' model='106'/> <!-- 0606A5 -->
<vendor name='Intel'/>
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 2d92cb39b4..1039e22ebc 100644
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
@@ -94,6 +94,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 1cd9771eec..d8a161bf18 100644
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
@@ -93,6 +93,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 d322b5678a..383dfb9649 100644
--- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-q35.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.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 d177db8a2a..eca45e94e0 100644
--- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
@@ -94,6 +94,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 d807f09100..49518b8e31 100644
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.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_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 9010cb524c..ec695ec4ee 100644
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -94,6 +94,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 53e320f18d..267b168036 100644
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.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-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 9f77efd3c7..e8ae46a00a 100644
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -94,6 +94,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 4dd62848bc..83d6d7189b 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.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.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 43d0b7afc8..2ff1f497a3 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -97,6 +97,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 0d87339ec1..bb65cfef2b 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.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-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 618f0ece23..2e2322143d 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -97,6 +97,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 4889ae157b..0b157340a9 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.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.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 c782eb31c4..d7fa5449db 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -98,6 +98,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 0f40cbb3ec..ccac1d6ac1 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.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'
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 1d53a5806d..c54c7f0f2f 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.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'
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 12d0cbd1b2..d00cbdfb3e 100644
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.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_7.2.0-tcg.x86_64+hvf.xml
b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
index 49bdf88309..74665be98c 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
@@ -102,6 +102,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 49bdf88309..74665be98c 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -102,6 +102,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 d1647a7878..c28cb443f9 100644
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -104,6 +104,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 cc40e9c229..0c33f1c819 100644
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.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_8.0.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
index 2911327c4c..6fa8d07707 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.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.x86_64.xml
b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index 06a8be84c4..9431f7951b 100644
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.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.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 ccc8bcce9b..e1a6f8c4d4 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.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.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 46c33b2870..34f904f6bb 100644
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.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.2.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
index 004c9ea3de..2e7c1ad3e7 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 18a6c4f878..99efdcd66b 100644
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.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>
--
2.41.0
4:21 p.m.
New subject: [libvirt PATCH 14/19] 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 +++++++++++++++++++
src/cpu_map/x86_Cooperlake.xml | 1 +
.../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 +
30 files changed, 127 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/src/cpu_map/x86_Cooperlake.xml b/src/cpu_map/x86_Cooperlake.xml
index ceca687334..2e879f8121 100644
--- a/src/cpu_map/x86_Cooperlake.xml
+++ b/src/cpu_map/x86_Cooperlake.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='Cooperlake'>
+ <alias name='Cooperlake-v1'/>
<decode host='on' guest='on'/>
<signature family='6' model='85' stepping='10-11'/>
<!-- 05065b -->
<vendor name='Intel'/>
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 83d6d7189b..3cf62e854f 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,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 2ff1f497a3..e94cb23810 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -115,6 +115,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 bb65cfef2b..f6aa267d48 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,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 2e2322143d..a15be63240 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -115,6 +115,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 0b157340a9..444aa0e111 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.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.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 d7fa5449db..a65119505e 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.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.1.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
index ccac1d6ac1..96ca48ebb2 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.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_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 c54c7f0f2f..d814420b02 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.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_7.2.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
index d00cbdfb3e..425c22cd04 100644
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.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_7.2.0-tcg.x86_64+hvf.xml
b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
index 74665be98c..efba761ce5 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
@@ -119,6 +119,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 74665be98c..efba761ce5 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -119,6 +119,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 c28cb443f9..257f3b4958 100644
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -121,6 +121,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 0c33f1c819..b674048c5f 100644
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.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_8.0.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
index 6fa8d07707..3e97325a16 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -124,6 +124,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 9431f7951b..a5f25e009a 100644
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.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.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 e1a6f8c4d4..e794b726cd 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.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.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 34f904f6bb..9ea20cccf6 100644
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.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.2.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
index 2e7c1ad3e7..cce0fbb433 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 99efdcd66b..f06ff32956 100644
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.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>
--
2.41.0
4:21 p.m.
New subject: [libvirt PATCH 15/19] 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 ++++++++++++++++++
src/cpu_map/x86_Snowridge.xml | 1 +
.../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 +
48 files changed, 332 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/src/cpu_map/x86_Snowridge.xml b/src/cpu_map/x86_Snowridge.xml
index 383a24d367..534295aa57 100644
--- a/src/cpu_map/x86_Snowridge.xml
+++ b/src/cpu_map/x86_Snowridge.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='Snowridge'>
+ <alias name='Snowridge-v1'/>
<decode host='on' guest='on'/>
<signature family='6' model='134'/> <!-- 080665 -->
<vendor name='Intel'/>
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 bbe0919706..3a8de012a8 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'/>
@@ -18,7 +18,6 @@
<feature policy='require' name='skip-l1dfl-vmentry'/>
<feature policy='require' name='mds-no'/>
<feature policy='require' name='pschange-mc-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/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
index 77538ed9ea..85bb381258 100644
--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
@@ -75,6 +75,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 1620043b73..ce444975d8 100644
--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
@@ -74,6 +74,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 1039e22ebc..88c8b8fa15 100644
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
@@ -75,6 +75,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 d8a161bf18..6c56c5cbb8 100644
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
@@ -74,6 +74,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 383dfb9649..31bca158ec 100644
--- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-q35.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.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 eca45e94e0..3852b881a9 100644
--- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
@@ -74,6 +74,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 49518b8e31..df941c46b1 100644
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.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-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 ec695ec4ee..0d49b4b174 100644
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -74,6 +74,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 267b168036..d00b4f63c4 100644
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.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-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 e8ae46a00a..8503e76d20 100644
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -74,6 +74,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 3cf62e854f..dd3a6f8c92 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.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.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 e94cb23810..7a3756945d 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -75,6 +75,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 f6aa267d48..17c81703cb 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.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_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 a15be63240..4bc7622b88 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -75,6 +75,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 444aa0e111..8d0182d7f2 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.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_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 a65119505e..66c08aa40d 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.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.1.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
index 96ca48ebb2..0253f5dfd4 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.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.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 d814420b02..847706743f 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.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.2.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
index 425c22cd04..1d1f60bd42 100644
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.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_7.2.0-tcg.x86_64+hvf.xml
b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
index efba761ce5..eb37bada77 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
@@ -80,6 +80,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 efba761ce5..eb37bada77 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -80,6 +80,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 257f3b4958..7e7b4f4889 100644
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -82,6 +82,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 b674048c5f..275b067ea8 100644
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.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-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
index 3e97325a16..9763e5a9de 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -84,6 +84,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 a5f25e009a..abc85c2b90 100644
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -82,6 +82,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 e794b726cd..e3943d6d91 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.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.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 9ea20cccf6..cbd4f4bfa7 100644
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.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.2.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
index cce0fbb433..59d1bea18a 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 f06ff32956..db130e4fc8 100644
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.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>
--
2.41.0
4:21 p.m.
New subject: [libvirt PATCH 16/19] 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 ++++++++++++++++++
src/cpu_map/x86_SapphireRapids.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 +
10 files changed, 134 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/src/cpu_map/x86_SapphireRapids.xml b/src/cpu_map/x86_SapphireRapids.xml
index 2297feeeca..93307b37a2 100644
--- a/src/cpu_map/x86_SapphireRapids.xml
+++ b/src/cpu_map/x86_SapphireRapids.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='SapphireRapids'>
+ <alias name='SapphireRapids-v1'/>
<decode host='on' guest='on'/>
<signature family='6' model='143'/>
<vendor name='Intel'/>
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 e3943d6d91..39e80ad78e 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.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.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 cbd4f4bfa7..9c3ea6534c 100644
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.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.2.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
index 59d1bea18a..8df1465008 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 db130e4fc8..491ea5b433 100644
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.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>
--
2.41.0
4:21 p.m.
New subject: [libvirt PATCH 17/19] 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 +++++++++++++++++++
src/cpu_map/x86_Dhyana.xml | 1 +
..._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 +
32 files changed, 113 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/src/cpu_map/x86_Dhyana.xml b/src/cpu_map/x86_Dhyana.xml
index cfde07f99f..54aac1be3a 100644
--- a/src/cpu_map/x86_Dhyana.xml
+++ b/src/cpu_map/x86_Dhyana.xml
@@ -1,5 +1,6 @@
<cpus>
<model name='Dhyana'>
+ <alias name='Dhyana-v1'/>
<decode host='on' guest='on'/>
<signature family='24' model='0'/> <!-- 900f00 -->
<vendor name='Hygon'/>
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 dd3a6f8c92..991c1c69c6 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='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 7a3756945d..1f0b1362d1 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='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 17c81703cb..dbbc39ba40 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.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.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 4bc7622b88..33636254a2 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.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_7.0.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
index 8d0182d7f2..a576213ecd 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.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.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 66c08aa40d..dc7b6c588b 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.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.1.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
index 0253f5dfd4..74879fce14 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.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_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 847706743f..a8eb03a47c 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.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.2.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
index 1d1f60bd42..8b4ab7516f 100644
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.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_7.2.0-tcg.x86_64+hvf.xml
b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
index eb37bada77..adc9db83f6 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
@@ -121,6 +121,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 eb37bada77..adc9db83f6 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -121,6 +121,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 7e7b4f4889..b611754665 100644
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -123,6 +123,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 275b067ea8..5f48999b2d 100644
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.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_8.0.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
index 9763e5a9de..90b9c47864 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -126,6 +126,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 abc85c2b90..58fc03948c 100644
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.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.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 39e80ad78e..f8ff2ae2c4 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.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.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 9c3ea6534c..d90651b46c 100644
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.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.2.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
index 8df1465008..dda5d202a8 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 491ea5b433..aeb05da1dd 100644
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.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>
--
2.41.0
4:21 p.m.
New subject: [libvirt PATCH 18/19] cpu: advertise CPU aliases
When generating the list of CPU models, include both the official name
and the alias in the list.
---
src/cpu/cpu_x86.c | 20 ++++++++---
.../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 30 ++++++++++++++++
.../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 30 ++++++++++++++++
tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 30 ++++++++++++++++
.../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 32 +++++++++++++++++
.../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 32 +++++++++++++++++
tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 32 +++++++++++++++++
.../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 32 +++++++++++++++++
.../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 32 +++++++++++++++++
tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 32 +++++++++++++++++
.../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 32 +++++++++++++++++
.../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 32 +++++++++++++++++
tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 32 +++++++++++++++++
.../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 33 ++++++++++++++++++
.../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 33 ++++++++++++++++++
tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 33 ++++++++++++++++++
.../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 33 ++++++++++++++++++
.../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 33 ++++++++++++++++++
tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 33 ++++++++++++++++++
.../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 33 ++++++++++++++++++
.../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 33 ++++++++++++++++++
tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 33 ++++++++++++++++++
.../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 33 ++++++++++++++++++
.../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 33 ++++++++++++++++++
tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 33 ++++++++++++++++++
.../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 33 ++++++++++++++++++
.../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 33 ++++++++++++++++++
tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 33 ++++++++++++++++++
.../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 33 ++++++++++++++++++
.../qemu_7.2.0-tcg.x86_64+hvf.xml | 33 ++++++++++++++++++
.../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 33 ++++++++++++++++++
tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 33 ++++++++++++++++++
.../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 34 +++++++++++++++++++
.../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 34 +++++++++++++++++++
tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 34 +++++++++++++++++++
.../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 34 +++++++++++++++++++
.../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 34 +++++++++++++++++++
tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 34 +++++++++++++++++++
.../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 34 +++++++++++++++++++
.../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 34 +++++++++++++++++++
tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 34 +++++++++++++++++++
41 files changed, 1327 insertions(+), 4 deletions(-)
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 4d4f6a8be8..c22db91bf4 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -3147,18 +3147,30 @@ virCPUx86GetModels(char ***models)
{
virCPUx86Map *map;
size_t i;
+ size_t n = 0;
if (!(map = virCPUx86GetMap()))
return -1;
+ n = map->nmodels;
+ for (i = 0; i < map->nmodels; i++) {
+ if (map->models[i]->alias)
+ n++;
+ }
+
if (models) {
- *models = g_new0(char *, map->nmodels + 1);
+ size_t j = 0;
+ *models = g_new0(char *, n + 1);
- for (i = 0; i < map->nmodels; i++)
- (*models)[i] = g_strdup(map->models[i]->name);
+ for (i = 0; i < map->nmodels; i++) {
+ (*models)[j++] = g_strdup(map->models[i]->name);
+
+ if (map->models[i]->alias)
+ (*models)[j++] = g_strdup(map->models[i]->alias);
+ }
}
- return map->nmodels;
+ return n;
}
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 85bb381258..010bf581af 100644
--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
@@ -73,16 +73,27 @@
<model usable='yes' vendor='Intel'>coreduo</model>
<model usable='yes' vendor='Intel'>core2duo</model>
<model usable='no' vendor='AMD'>athlon</model>
+ <model usable='yes' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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='yes'
vendor='Intel'>Skylake-Client-v3</model>
+ <model usable='yes'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='yes'
vendor='Intel'>Skylake-Client-v1</model>
<model usable='yes'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='yes'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='yes'
vendor='Intel'>Skylake-Client</model>
+ <model usable='yes'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='yes'
vendor='Intel'>SandyBridge-v1</model>
<model usable='yes'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -91,25 +102,44 @@
<model usable='no' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='yes'
vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='yes'
vendor='Intel'>IvyBridge-v2</model>
+ <model usable='yes'
vendor='Intel'>IvyBridge-v1</model>
<model usable='yes'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</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>
<model usable='no'
vendor='Intel'>Icelake-Client</model>
+ <model usable='yes' vendor='Intel'>Haswell-v4</model>
+ <model usable='yes' vendor='Intel'>Haswell-v3</model>
+ <model usable='yes' vendor='Intel'>Haswell-v2</model>
+ <model usable='yes' vendor='Intel'>Haswell-v1</model>
<model usable='yes'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='no' vendor='AMD'>EPYC-v1</model>
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC</model>
+ <model usable='no' vendor='Hygon'>Dhyana-v1</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='yes'
vendor='Intel'>Broadwell-v4</model>
+ <model usable='yes'
vendor='Intel'>Broadwell-v3</model>
+ <model usable='yes'
vendor='Intel'>Broadwell-v2</model>
+ <model usable='yes'
vendor='Intel'>Broadwell-v1</model>
<model usable='yes'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='yes'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='yes'
vendor='Intel'>Broadwell-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 7b499f6950..6f347f9e0c 100644
--- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
@@ -86,16 +86,27 @@
<model usable='yes' vendor='Intel'>coreduo</model>
<model usable='yes' vendor='Intel'>core2duo</model>
<model usable='yes' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='no'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='no' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -104,25 +115,44 @@
<model usable='no' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='no' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</model>
<model usable='no'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='no' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</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>
<model usable='no'
vendor='Intel'>Icelake-Client</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='no' vendor='AMD'>EPYC-v1</model>
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC</model>
+ <model usable='no' vendor='Hygon'>Dhyana-v1</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 ce444975d8..e3b70598cd 100644
--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
@@ -72,16 +72,27 @@
<model usable='yes' vendor='Intel'>coreduo</model>
<model usable='yes' vendor='Intel'>core2duo</model>
<model usable='no' vendor='AMD'>athlon</model>
+ <model usable='yes' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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='yes'
vendor='Intel'>Skylake-Client-v3</model>
+ <model usable='yes'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='yes'
vendor='Intel'>Skylake-Client-v1</model>
<model usable='yes'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='yes'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='yes'
vendor='Intel'>Skylake-Client</model>
+ <model usable='yes'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='yes'
vendor='Intel'>SandyBridge-v1</model>
<model usable='yes'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -90,25 +101,44 @@
<model usable='no' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='yes'
vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='yes'
vendor='Intel'>IvyBridge-v2</model>
+ <model usable='yes'
vendor='Intel'>IvyBridge-v1</model>
<model usable='yes'
vendor='Intel'>IvyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>IvyBridge</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</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>
<model usable='no'
vendor='Intel'>Icelake-Client</model>
+ <model usable='yes' vendor='Intel'>Haswell-v4</model>
+ <model usable='yes' vendor='Intel'>Haswell-v3</model>
+ <model usable='yes' vendor='Intel'>Haswell-v2</model>
+ <model usable='yes' vendor='Intel'>Haswell-v1</model>
<model usable='yes'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='no' vendor='AMD'>EPYC-v1</model>
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC</model>
+ <model usable='no' vendor='Hygon'>Dhyana-v1</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='yes'
vendor='Intel'>Broadwell-v4</model>
+ <model usable='yes'
vendor='Intel'>Broadwell-v3</model>
+ <model usable='yes'
vendor='Intel'>Broadwell-v2</model>
+ <model usable='yes'
vendor='Intel'>Broadwell-v1</model>
<model usable='yes'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='yes'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='yes'
vendor='Intel'>Broadwell-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 88c8b8fa15..578a9c80c6 100644
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
@@ -73,16 +73,27 @@
<model usable='yes' vendor='Intel'>coreduo</model>
<model usable='yes' vendor='Intel'>core2duo</model>
<model usable='no' vendor='AMD'>athlon</model>
+ <model usable='yes' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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='yes'
vendor='Intel'>Skylake-Client-v3</model>
+ <model usable='yes'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='yes'
vendor='Intel'>Skylake-Client-v1</model>
<model usable='yes'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='yes'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='yes'
vendor='Intel'>Skylake-Client</model>
+ <model usable='yes'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='yes'
vendor='Intel'>SandyBridge-v1</model>
<model usable='yes'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -91,29 +102,50 @@
<model usable='no' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='yes'
vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='yes'
vendor='Intel'>IvyBridge-v2</model>
+ <model usable='yes'
vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</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>
<model usable='no'
vendor='Intel'>Icelake-Client</model>
+ <model usable='yes' vendor='Intel'>Haswell-v4</model>
+ <model usable='yes' vendor='Intel'>Haswell-v3</model>
+ <model usable='yes' vendor='Intel'>Haswell-v2</model>
+ <model usable='yes' vendor='Intel'>Haswell-v1</model>
<model usable='yes'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='no' vendor='AMD'>EPYC-v1</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC</model>
+ <model usable='no' vendor='Hygon'>Dhyana-v1</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='yes'
vendor='Intel'>Broadwell-v4</model>
+ <model usable='yes'
vendor='Intel'>Broadwell-v3</model>
+ <model usable='yes'
vendor='Intel'>Broadwell-v2</model>
+ <model usable='yes'
vendor='Intel'>Broadwell-v1</model>
<model usable='yes'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='yes'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='yes'
vendor='Intel'>Broadwell-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 2caae4a70d..98f6c3f764 100644
--- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
@@ -86,16 +86,27 @@
<model usable='yes' vendor='Intel'>coreduo</model>
<model usable='yes' vendor='Intel'>core2duo</model>
<model usable='yes' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='no'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='no' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -104,29 +115,50 @@
<model usable='no' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</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>
<model usable='no'
vendor='Intel'>Icelake-Client</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='no' vendor='AMD'>EPYC-v1</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC</model>
+ <model usable='no' vendor='Hygon'>Dhyana-v1</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 6c56c5cbb8..9c7e6e1df3 100644
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
@@ -72,16 +72,27 @@
<model usable='yes' vendor='Intel'>coreduo</model>
<model usable='yes' vendor='Intel'>core2duo</model>
<model usable='no' vendor='AMD'>athlon</model>
+ <model usable='yes' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</model>
<model usable='no' vendor='Intel'>Snowridge</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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='yes'
vendor='Intel'>Skylake-Client-v3</model>
+ <model usable='yes'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='yes'
vendor='Intel'>Skylake-Client-v1</model>
<model usable='yes'
vendor='Intel'>Skylake-Client-noTSX-IBRS</model>
<model usable='yes'
vendor='Intel'>Skylake-Client-IBRS</model>
<model usable='yes'
vendor='Intel'>Skylake-Client</model>
+ <model usable='yes'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='yes'
vendor='Intel'>SandyBridge-v1</model>
<model usable='yes'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -90,29 +101,50 @@
<model usable='no' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='yes'
vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='yes'
vendor='Intel'>IvyBridge-v2</model>
+ <model usable='yes'
vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</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>
<model usable='no'
vendor='Intel'>Icelake-Client</model>
+ <model usable='yes' vendor='Intel'>Haswell-v4</model>
+ <model usable='yes' vendor='Intel'>Haswell-v3</model>
+ <model usable='yes' vendor='Intel'>Haswell-v2</model>
+ <model usable='yes' vendor='Intel'>Haswell-v1</model>
<model usable='yes'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='no' vendor='AMD'>EPYC-v1</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC</model>
+ <model usable='no' vendor='Hygon'>Dhyana-v1</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</model>
<model usable='no' vendor='Intel'>Cooperlake</model>
<model usable='yes' vendor='Intel'>Conroe</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='yes'
vendor='Intel'>Broadwell-v4</model>
+ <model usable='yes'
vendor='Intel'>Broadwell-v3</model>
+ <model usable='yes'
vendor='Intel'>Broadwell-v2</model>
+ <model usable='yes'
vendor='Intel'>Broadwell-v1</model>
<model usable='yes'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='yes'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='yes'
vendor='Intel'>Broadwell-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 31bca158ec..7a7480ab1f 100644
--- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
@@ -73,17 +73,28 @@
<model usable='no' vendor='Intel'>coreduo</model>
<model usable='no' vendor='Intel'>core2duo</model>
<model usable='no' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='yes'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -92,31 +103,52 @@
<model usable='yes' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</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>
<model usable='no'
vendor='Intel'>Icelake-Client</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-v1</model>
+ <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
+ <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 96e3e9fc0c..7f13877fd8 100644
--- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
@@ -86,17 +86,28 @@
<model usable='yes' vendor='Intel'>coreduo</model>
<model usable='yes' vendor='Intel'>core2duo</model>
<model usable='yes' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='no'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='no' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -105,31 +116,52 @@
<model usable='no' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</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>
<model usable='no'
vendor='Intel'>Icelake-Client</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='no' vendor='AMD'>EPYC-v1</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC</model>
+ <model usable='no' vendor='Hygon'>Dhyana-v1</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 3852b881a9..3d26ecf979 100644
--- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
@@ -72,17 +72,28 @@
<model usable='no' vendor='Intel'>coreduo</model>
<model usable='no' vendor='Intel'>core2duo</model>
<model usable='no' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='yes'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -91,31 +102,52 @@
<model usable='yes' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</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>
<model usable='no'
vendor='Intel'>Icelake-Client</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-v1</model>
+ <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
+ <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 df941c46b1..8464eac863 100644
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -73,17 +73,28 @@
<model usable='no' vendor='Intel'>coreduo</model>
<model usable='no' vendor='Intel'>core2duo</model>
<model usable='no' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='yes'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -92,31 +103,52 @@
<model usable='yes' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</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>
<model usable='no' deprecated='yes'
vendor='Intel'>Icelake-Client</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-v1</model>
+ <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
+ <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 b37b2ea770..b823453183 100644
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -86,17 +86,28 @@
<model usable='yes' vendor='Intel'>coreduo</model>
<model usable='yes' vendor='Intel'>core2duo</model>
<model usable='yes' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='no'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='no' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -105,31 +116,52 @@
<model usable='no' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</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>
<model usable='no' deprecated='yes'
vendor='Intel'>Icelake-Client</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='no' vendor='AMD'>EPYC-v1</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
<model usable='no' vendor='AMD'>EPYC-IBPB</model>
<model usable='no' vendor='AMD'>EPYC</model>
+ <model usable='no' vendor='Hygon'>Dhyana-v1</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 0d49b4b174..ab9a815e95 100644
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -72,17 +72,28 @@
<model usable='no' vendor='Intel'>coreduo</model>
<model usable='no' vendor='Intel'>core2duo</model>
<model usable='no' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='yes'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -91,31 +102,52 @@
<model usable='yes' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</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>
<model usable='no' deprecated='yes'
vendor='Intel'>Icelake-Client</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-v1</model>
+ <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
<model usable='yes' vendor='AMD'>EPYC-IBPB</model>
<model usable='yes' vendor='AMD'>EPYC</model>
+ <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 d00b4f63c4..79b8ea91ea 100644
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -73,17 +73,28 @@
<model usable='no' vendor='Intel'>coreduo</model>
<model usable='no' vendor='Intel'>core2duo</model>
<model usable='no' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='yes'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -92,33 +103,55 @@
<model usable='yes' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</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>
<model usable='no' deprecated='yes'
vendor='Intel'>Icelake-Client</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
<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-v1</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 485b5f97d2..11f88e37a6 100644
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -87,17 +87,28 @@
<model usable='yes' vendor='Intel'>coreduo</model>
<model usable='yes' vendor='Intel'>core2duo</model>
<model usable='yes' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='no'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='no' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -106,33 +117,55 @@
<model usable='no' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</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>
<model usable='no' deprecated='yes'
vendor='Intel'>Icelake-Client</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='no' vendor='AMD'>EPYC-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
<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-v1</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 8503e76d20..b88155c27b 100644
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -72,17 +72,28 @@
<model usable='no' vendor='Intel'>coreduo</model>
<model usable='no' vendor='Intel'>core2duo</model>
<model usable='no' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</model>
<model usable='no' vendor='Intel'>Snowridge</model>
<model usable='no'
vendor='Intel'>Skylake-Server-v4</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='yes'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -91,33 +102,55 @@
<model usable='yes' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</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>
<model usable='no' deprecated='yes'
vendor='Intel'>Icelake-Client</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
<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-v1</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 991c1c69c6..73ba618993 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -74,20 +74,31 @@
<model usable='no' vendor='Intel'>coreduo</model>
<model usable='no' vendor='Intel'>core2duo</model>
<model usable='no' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='yes'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -96,37 +107,59 @@
<model usable='yes' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</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>
<model usable='no' deprecated='yes'
vendor='Intel'>Icelake-Client</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
<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-v1</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 b9e671e1f7..0292b4d869 100644
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -87,20 +87,31 @@
<model usable='yes' vendor='Intel'>coreduo</model>
<model usable='yes' vendor='Intel'>core2duo</model>
<model usable='yes' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='no'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='no' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -109,37 +120,59 @@
<model usable='no' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</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>
<model usable='no' deprecated='yes'
vendor='Intel'>Icelake-Client</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='no' vendor='AMD'>EPYC-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
<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-v1</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 1f0b1362d1..837e2fc87d 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -73,20 +73,31 @@
<model usable='no' vendor='Intel'>coreduo</model>
<model usable='no' vendor='Intel'>core2duo</model>
<model usable='no' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='yes'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -95,37 +106,59 @@
<model usable='yes' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</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>
<model usable='no' deprecated='yes'
vendor='Intel'>Icelake-Client</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
<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-v1</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 dbbc39ba40..f981096d0a 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -74,21 +74,32 @@
<model usable='no' vendor='Intel'>coreduo</model>
<model usable='no' vendor='Intel'>core2duo</model>
<model usable='no' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='yes'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -97,37 +108,59 @@
<model usable='yes' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</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>
<model usable='no' deprecated='yes'
vendor='Intel'>Icelake-Client</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
<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-v1</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 7d7034e17f..e01e6036f1 100644
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -89,21 +89,32 @@
<model usable='yes' vendor='Intel'>coreduo</model>
<model usable='yes' vendor='Intel'>core2duo</model>
<model usable='yes' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='no'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='no' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -112,37 +123,59 @@
<model usable='no' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</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>
<model usable='no' deprecated='yes'
vendor='Intel'>Icelake-Client</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='no' vendor='AMD'>EPYC-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
<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-v1</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 33636254a2..d1f20fab58 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -73,21 +73,32 @@
<model usable='no' vendor='Intel'>coreduo</model>
<model usable='no' vendor='Intel'>core2duo</model>
<model usable='no' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='yes'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -96,37 +107,59 @@
<model usable='yes' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</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>
<model usable='no' deprecated='yes'
vendor='Intel'>Icelake-Client</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
<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-v1</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 a576213ecd..c2ffef665f 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -75,21 +75,32 @@
<model usable='no' vendor='Intel'>coreduo</model>
<model usable='no' vendor='Intel'>core2duo</model>
<model usable='no' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='yes'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -98,38 +109,60 @@
<model usable='yes' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</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>
<model usable='no' deprecated='yes'
vendor='Intel'>Icelake-Client</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
<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-v1</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 d4ded73fa3..7d6fe9712f 100644
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -90,21 +90,32 @@
<model usable='yes' vendor='Intel'>coreduo</model>
<model usable='yes' vendor='Intel'>core2duo</model>
<model usable='yes' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='no'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='no' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -113,38 +124,60 @@
<model usable='no' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</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>
<model usable='no' deprecated='yes'
vendor='Intel'>Icelake-Client</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='no' vendor='AMD'>EPYC-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
<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-v1</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 dc7b6c588b..e8cd945dc7 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -74,21 +74,32 @@
<model usable='no' vendor='Intel'>coreduo</model>
<model usable='no' vendor='Intel'>core2duo</model>
<model usable='no' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='yes'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -97,38 +108,60 @@
<model usable='yes' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</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>
<model usable='no' deprecated='yes'
vendor='Intel'>Icelake-Client</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
<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-v1</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 74879fce14..f546d93174 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -76,21 +76,32 @@
<model usable='no' vendor='Intel'>coreduo</model>
<model usable='no' vendor='Intel'>core2duo</model>
<model usable='no' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='yes'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -99,36 +110,58 @@
<model usable='yes' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
<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-v1</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 c0333c2947..f78d25488a 100644
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -90,21 +90,32 @@
<model usable='yes' vendor='Intel'>coreduo</model>
<model usable='yes' vendor='Intel'>core2duo</model>
<model usable='yes' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='no'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='no' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -113,36 +124,58 @@
<model usable='no' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='no' vendor='AMD'>EPYC-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
<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-v1</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 a8eb03a47c..6765cb7600 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -75,21 +75,32 @@
<model usable='no' vendor='Intel'>coreduo</model>
<model usable='no' vendor='Intel'>core2duo</model>
<model usable='no' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='yes'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -98,36 +109,58 @@
<model usable='yes' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
<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-v1</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 8b4ab7516f..37c881315a 100644
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -81,21 +81,32 @@
<model usable='no' vendor='Intel'>coreduo</model>
<model usable='no' vendor='Intel'>core2duo</model>
<model usable='no' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='yes'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -104,36 +115,58 @@
<model usable='yes' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
<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-v1</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 adc9db83f6..97ae481487 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
@@ -78,21 +78,32 @@
<model usable='yes' vendor='Intel'>coreduo</model>
<model usable='yes' vendor='Intel'>core2duo</model>
<model usable='yes' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='no'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='no' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -101,36 +112,58 @@
<model usable='no' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='no' vendor='AMD'>EPYC-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
<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-v1</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 adc9db83f6..97ae481487 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -78,21 +78,32 @@
<model usable='yes' vendor='Intel'>coreduo</model>
<model usable='yes' vendor='Intel'>core2duo</model>
<model usable='yes' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='no'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='no' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -101,36 +112,58 @@
<model usable='no' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='no' vendor='AMD'>EPYC-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
<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-v1</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 b611754665..f4d3e42a88 100644
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -80,21 +80,32 @@
<model usable='no' vendor='Intel'>coreduo</model>
<model usable='no' vendor='Intel'>core2duo</model>
<model usable='no' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='yes'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -103,36 +114,58 @@
<model usable='yes' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
<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-v1</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 5f48999b2d..3ba888e8d7 100644
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -81,22 +81,34 @@
<model usable='no' vendor='Intel'>coreduo</model>
<model usable='no' vendor='Intel'>core2duo</model>
<model usable='no' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
+ <model usable='no'
vendor='Intel'>SapphireRapids-v1</model>
<model usable='no'
vendor='Intel'>SapphireRapids</model>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='yes'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -105,36 +117,58 @@
<model usable='yes' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
<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-v1</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 90b9c47864..57d2bdd053 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -82,22 +82,34 @@
<model usable='yes' vendor='Intel'>coreduo</model>
<model usable='yes' vendor='Intel'>core2duo</model>
<model usable='yes' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
+ <model usable='no'
vendor='Intel'>SapphireRapids-v1</model>
<model usable='no'
vendor='Intel'>SapphireRapids</model>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='no'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='no' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -106,36 +118,58 @@
<model usable='no' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='no' vendor='AMD'>EPYC-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+ <model usable='no' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome</model>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
<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-v1</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 58fc03948c..1bf15a19d3 100644
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -80,22 +80,34 @@
<model usable='no' vendor='Intel'>coreduo</model>
<model usable='no' vendor='Intel'>core2duo</model>
<model usable='no' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
+ <model usable='no'
vendor='Intel'>SapphireRapids-v1</model>
<model usable='no'
vendor='Intel'>SapphireRapids</model>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='yes'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -104,36 +116,58 @@
<model usable='yes' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-v1</model>
<model usable='no' vendor='AMD'>EPYC-Rome-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-Rome-v1</model>
<model usable='yes' vendor='AMD'>EPYC-Rome</model>
+ <model usable='no' vendor='AMD'>EPYC-Milan-v1</model>
<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-v1</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 f4f3e8fa18..672a9d3fbf 100644
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -83,23 +83,35 @@
<model usable='no' vendor='Intel'>coreduo</model>
<model usable='no' vendor='Intel'>core2duo</model>
<model usable='no' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
<model usable='no'
vendor='Intel'>SapphireRapids-v2</model>
+ <model usable='no'
vendor='Intel'>SapphireRapids-v1</model>
<model usable='no'
vendor='Intel'>SapphireRapids</model>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='yes'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -108,41 +120,63 @@
<model usable='yes' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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='yes' vendor='AMD'>EPYC-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-v1</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-v1</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-v1</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>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='no' vendor='Hygon'>Dhyana-v2</model>
+ <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 f8ff2ae2c4..b6f1f63b42 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -83,23 +83,35 @@
<model usable='yes' vendor='Intel'>coreduo</model>
<model usable='yes' vendor='Intel'>core2duo</model>
<model usable='yes' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
<model usable='no'
vendor='Intel'>SapphireRapids-v2</model>
+ <model usable='no'
vendor='Intel'>SapphireRapids-v1</model>
<model usable='no'
vendor='Intel'>SapphireRapids</model>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='no'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='no' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -108,41 +120,63 @@
<model usable='no' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='no' vendor='AMD'>EPYC-v1</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-v1</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-v1</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>
<model usable='no' vendor='AMD'>EPYC</model>
<model usable='no' vendor='Hygon'>Dhyana-v2</model>
+ <model usable='no' vendor='Hygon'>Dhyana-v1</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 e935519f9f..e2ca11b515 100644
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -82,23 +82,35 @@
<model usable='no' vendor='Intel'>coreduo</model>
<model usable='no' vendor='Intel'>core2duo</model>
<model usable='no' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
<model usable='no'
vendor='Intel'>SapphireRapids-v2</model>
+ <model usable='no'
vendor='Intel'>SapphireRapids-v1</model>
<model usable='no'
vendor='Intel'>SapphireRapids</model>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='yes'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -107,41 +119,63 @@
<model usable='yes' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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='yes' vendor='AMD'>EPYC-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-v1</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-v1</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-v1</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>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='no' vendor='Hygon'>Dhyana-v2</model>
+ <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 d90651b46c..cf2f7686d6 100644
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -83,23 +83,35 @@
<model usable='no' vendor='Intel'>coreduo</model>
<model usable='no' vendor='Intel'>core2duo</model>
<model usable='no' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
<model usable='no'
vendor='Intel'>SapphireRapids-v2</model>
+ <model usable='no'
vendor='Intel'>SapphireRapids-v1</model>
<model usable='no'
vendor='Intel'>SapphireRapids</model>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='yes'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -108,41 +120,63 @@
<model usable='yes' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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='yes' vendor='AMD'>EPYC-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-v1</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-v1</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-v1</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>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='no' vendor='Hygon'>Dhyana-v2</model>
+ <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 dda5d202a8..c58a5d1abb 100644
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -83,23 +83,35 @@
<model usable='yes' vendor='Intel'>coreduo</model>
<model usable='yes' vendor='Intel'>core2duo</model>
<model usable='yes' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
<model usable='no'
vendor='Intel'>SapphireRapids-v2</model>
+ <model usable='no'
vendor='Intel'>SapphireRapids-v1</model>
<model usable='no'
vendor='Intel'>SapphireRapids</model>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='no'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='no' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -108,41 +120,63 @@
<model usable='no' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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-v2</model>
+ <model usable='no' vendor='AMD'>EPYC-v1</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-v1</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-v1</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>
<model usable='no' vendor='AMD'>EPYC</model>
<model usable='no' vendor='Hygon'>Dhyana-v2</model>
+ <model usable='no' vendor='Hygon'>Dhyana-v1</model>
<model usable='no' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-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 aeb05da1dd..c1fe1d850d 100644
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -82,23 +82,35 @@
<model usable='no' vendor='Intel'>coreduo</model>
<model usable='no' vendor='Intel'>core2duo</model>
<model usable='no' vendor='AMD'>athlon</model>
+ <model usable='no' vendor='Intel'>Westmere-v2</model>
+ <model usable='yes' vendor='Intel'>Westmere-v1</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-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Server-v1</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-v3</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v2</model>
+ <model usable='no'
vendor='Intel'>Skylake-Client-v1</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>
<model usable='no'
vendor='Intel'>SapphireRapids-v2</model>
+ <model usable='no'
vendor='Intel'>SapphireRapids-v1</model>
<model usable='no'
vendor='Intel'>SapphireRapids</model>
+ <model usable='no'
vendor='Intel'>SandyBridge-v2</model>
+ <model usable='yes'
vendor='Intel'>SandyBridge-v1</model>
<model usable='no'
vendor='Intel'>SandyBridge-IBRS</model>
<model usable='yes' vendor='Intel'>SandyBridge</model>
<model usable='yes' vendor='Intel'>Penryn</model>
@@ -107,41 +119,63 @@
<model usable='yes' vendor='AMD'>Opteron_G3</model>
<model usable='yes' vendor='AMD'>Opteron_G2</model>
<model usable='yes' vendor='AMD'>Opteron_G1</model>
+ <model usable='no' vendor='Intel'>Nehalem-v2</model>
+ <model usable='yes' vendor='Intel'>Nehalem-v1</model>
<model usable='no' vendor='Intel'>Nehalem-IBRS</model>
<model usable='yes' vendor='Intel'>Nehalem</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v2</model>
+ <model usable='no' vendor='Intel'>IvyBridge-v1</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-v2</model>
+ <model usable='no'
vendor='Intel'>Icelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Icelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Icelake-Server</model>
+ <model usable='no' vendor='Intel'>Haswell-v4</model>
+ <model usable='no' vendor='Intel'>Haswell-v3</model>
+ <model usable='no' vendor='Intel'>Haswell-v2</model>
+ <model usable='no' vendor='Intel'>Haswell-v1</model>
<model usable='no'
vendor='Intel'>Haswell-noTSX-IBRS</model>
<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='yes' vendor='AMD'>EPYC-v2</model>
+ <model usable='yes' vendor='AMD'>EPYC-v1</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-v1</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-v1</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>
<model usable='yes' vendor='AMD'>EPYC</model>
<model usable='no' vendor='Hygon'>Dhyana-v2</model>
+ <model usable='yes' vendor='Hygon'>Dhyana-v1</model>
<model usable='yes' vendor='Hygon'>Dhyana</model>
<model usable='no'
vendor='Intel'>Cooperlake-v2</model>
+ <model usable='no'
vendor='Intel'>Cooperlake-v1</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-v3</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-v2</model>
+ <model usable='no'
vendor='Intel'>Cascadelake-Server-v1</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server-noTSX</model>
<model usable='no'
vendor='Intel'>Cascadelake-Server</model>
+ <model usable='no' vendor='Intel'>Broadwell-v4</model>
+ <model usable='no' vendor='Intel'>Broadwell-v3</model>
+ <model usable='no' vendor='Intel'>Broadwell-v2</model>
+ <model usable='no' vendor='Intel'>Broadwell-v1</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX-IBRS</model>
<model usable='no'
vendor='Intel'>Broadwell-noTSX</model>
<model usable='no'
vendor='Intel'>Broadwell-IBRS</model>
--
2.41.0
4:21 p.m.
New subject: [libvirt PATCH 19/19] NOMERGE: RFC: regenerate all cpu definitions
This is just for discussion. I used the
src/cpu_map/sync_qemu_models_i386.py script and regenerated the CPU
model definitions from the current qemu master source code. I then
regenerated all test output to see what the result would be. I am not
suggesting that this is a viable approach, but... Are there some updates
that should happen here?
---
src/cpu_map/x86_Broadwell-IBRS.xml | 18 ++++++++++++++----
src/cpu_map/x86_Broadwell-noTSX-IBRS.xml | 18 ++++++++++++++----
src/cpu_map/x86_Broadwell-noTSX.xml | 18 ++++++++++++++----
src/cpu_map/x86_Broadwell.xml | 17 +++++++++++++----
src/cpu_map/x86_Cascadelake-Server-noTSX.xml | 18 +++++++++++++++---
src/cpu_map/x86_Cascadelake-Server.xml | 10 ++++++++--
src/cpu_map/x86_Cooperlake.xml | 8 +++++++-
src/cpu_map/x86_Dhyana.xml | 12 ++++++++++--
src/cpu_map/x86_EPYC-Genoa.xml | 7 +++++++
src/cpu_map/x86_EPYC-IBPB.xml | 11 +++++++++--
src/cpu_map/x86_EPYC-Milan.xml | 7 +++++++
src/cpu_map/x86_EPYC-Rome.xml | 7 +++++++
src/cpu_map/x86_EPYC.xml | 10 ++++++++--
src/cpu_map/x86_Haswell-IBRS.xml | 19 +++++++++++++++----
src/cpu_map/x86_Haswell-noTSX-IBRS.xml | 19 +++++++++++++++----
src/cpu_map/x86_Haswell-noTSX.xml | 19 +++++++++++++++----
src/cpu_map/x86_Haswell.xml | 17 +++++++++++++----
src/cpu_map/x86_Icelake-Server-noTSX.xml | 13 +++++++++----
src/cpu_map/x86_Icelake-Server.xml | 10 +++++++---
src/cpu_map/x86_IvyBridge-IBRS.xml | 12 ++++++++++--
src/cpu_map/x86_IvyBridge.xml | 11 +++++++++--
src/cpu_map/x86_Nehalem-IBRS.xml | 13 +++++++++----
src/cpu_map/x86_Nehalem.xml | 12 ++++++++----
src/cpu_map/x86_SandyBridge-IBRS.xml | 13 +++++++++++--
src/cpu_map/x86_SandyBridge.xml | 12 ++++++++++--
src/cpu_map/x86_SapphireRapids.xml | 6 ++++++
src/cpu_map/x86_Skylake-Client-IBRS.xml | 15 ++++++++-------
src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml | 17 +++++++++--------
src/cpu_map/x86_Skylake-Client.xml | 14 +++++++-------
src/cpu_map/x86_Skylake-Server-IBRS.xml | 11 +++++++++--
src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml | 13 ++++++++++---
src/cpu_map/x86_Skylake-Server.xml | 11 +++++++++--
src/cpu_map/x86_Snowridge.xml | 9 ++++++++-
src/cpu_map/x86_Westmere-IBRS.xml | 12 +++++++++++-
src/cpu_map/x86_Westmere.xml | 13 ++++++++++---
...4-baseline-Westmere+Nehalem-migratable.xml | 4 ++--
...86_64-baseline-Westmere+Nehalem-result.xml | 4 ++--
.../x86_64-baseline-features-expanded.xml | 1 +
.../x86_64-baseline-features-result.xml | 2 --
.../x86_64-baseline-simple-expanded.xml | 3 +++
.../x86_64-cpuid-Atom-P5362-host.xml | 3 ---
.../x86_64-cpuid-Core-i5-2500-guest.xml | 3 ---
.../x86_64-cpuid-Core-i5-2500-host.xml | 3 ---
.../x86_64-cpuid-Core-i5-2500-json.xml | 3 ---
.../x86_64-cpuid-Core-i5-2540M-guest.xml | 3 ---
.../x86_64-cpuid-Core-i5-2540M-host.xml | 3 ---
.../x86_64-cpuid-Core-i5-2540M-json.xml | 3 ---
.../x86_64-cpuid-Core-i5-4670T-guest.xml | 6 +-----
.../x86_64-cpuid-Core-i5-4670T-host.xml | 19 ++++++++++++++++---
.../x86_64-cpuid-Core-i5-4670T-json.xml | 6 +-----
.../x86_64-cpuid-Core-i5-650-guest.xml | 3 ---
.../x86_64-cpuid-Core-i5-650-host.xml | 3 ---
.../x86_64-cpuid-Core-i5-650-json.xml | 3 ---
.../x86_64-cpuid-Core-i5-6600-guest.xml | 1 +
.../x86_64-cpuid-Core-i5-6600-host.xml | 1 +
.../x86_64-cpuid-Core-i5-6600-json.xml | 1 +
.../x86_64-cpuid-Core-i7-2600-guest.xml | 3 ---
.../x86_64-cpuid-Core-i7-2600-host.xml | 3 ---
.../x86_64-cpuid-Core-i7-2600-json.xml | 3 ---
...6_64-cpuid-Core-i7-2600-xsaveopt-guest.xml | 2 --
...86_64-cpuid-Core-i7-2600-xsaveopt-host.xml | 9 ++++++---
...86_64-cpuid-Core-i7-2600-xsaveopt-json.xml | 2 --
.../x86_64-cpuid-Core-i7-3520M-guest.xml | 2 --
.../x86_64-cpuid-Core-i7-3520M-host.xml | 2 --
.../x86_64-cpuid-Core-i7-3740QM-guest.xml | 2 +-
.../x86_64-cpuid-Core-i7-3740QM-host.xml | 13 +++++++++++--
.../x86_64-cpuid-Core-i7-3740QM-json.xml | 2 +-
.../x86_64-cpuid-Core-i7-3770-guest.xml | 2 --
.../x86_64-cpuid-Core-i7-3770-host.xml | 2 --
.../x86_64-cpuid-Core-i7-3770-json.xml | 2 +-
.../x86_64-cpuid-Core-i7-4510U-guest.xml | 6 ------
.../x86_64-cpuid-Core-i7-4510U-host.xml | 3 ---
.../x86_64-cpuid-Core-i7-4510U-json.xml | 6 ------
.../x86_64-cpuid-Core-i7-4600U-guest.xml | 6 ------
.../x86_64-cpuid-Core-i7-4600U-host.xml | 6 ------
.../x86_64-cpuid-Core-i7-4600U-json.xml | 6 ------
.../x86_64-cpuid-Core-i7-5600U-arat-guest.xml | 6 ------
.../x86_64-cpuid-Core-i7-5600U-arat-host.xml | 6 ------
.../x86_64-cpuid-Core-i7-5600U-arat-json.xml | 6 +-----
.../x86_64-cpuid-Core-i7-5600U-guest.xml | 6 ------
.../x86_64-cpuid-Core-i7-5600U-host.xml | 6 ------
.../x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml | 6 ------
.../x86_64-cpuid-Core-i7-5600U-ibrs-host.xml | 6 ------
.../x86_64-cpuid-Core-i7-5600U-ibrs-json.xml | 6 ------
.../x86_64-cpuid-Core-i7-5600U-json.xml | 6 ------
.../x86_64-cpuid-Core-i7-7600U-guest.xml | 1 +
.../x86_64-cpuid-Core-i7-7600U-host.xml | 1 +
.../x86_64-cpuid-Core-i7-7600U-json.xml | 1 +
.../x86_64-cpuid-Core-i7-7700-guest.xml | 1 +
.../x86_64-cpuid-Core-i7-7700-host.xml | 1 +
.../x86_64-cpuid-Core-i7-7700-json.xml | 1 +
.../x86_64-cpuid-Core-i7-8550U-guest.xml | 5 ++---
.../x86_64-cpuid-Core-i7-8550U-host.xml | 4 ++--
.../x86_64-cpuid-Core-i7-8550U-json.xml | 5 ++---
.../x86_64-cpuid-Core-i7-8700-guest.xml | 1 +
.../x86_64-cpuid-Core-i7-8700-host.xml | 1 +
.../x86_64-cpuid-Core-i7-8700-json.xml | 1 +
...6_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml | 1 -
.../x86_64-cpuid-EPYC-7601-32-Core-json.xml | 1 -
...6_64-cpuid-Hygon-C86-7185-32-core-json.xml | 3 +--
.../x86_64-cpuid-Ice-Lake-Server-guest.xml | 1 +
.../x86_64-cpuid-Ice-Lake-Server-host.xml | 1 +
.../x86_64-cpuid-Ice-Lake-Server-json.xml | 2 +-
.../x86_64-cpuid-Pentium-P6100-guest.xml | 10 ++++------
...64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml | 1 -
.../x86_64-cpuid-Xeon-E3-1225-v5-guest.xml | 1 +
.../x86_64-cpuid-Xeon-E3-1225-v5-host.xml | 1 +
.../x86_64-cpuid-Xeon-E3-1225-v5-json.xml | 1 +
.../x86_64-cpuid-Xeon-E3-1245-v5-guest.xml | 1 +
.../x86_64-cpuid-Xeon-E3-1245-v5-host.xml | 1 +
.../x86_64-cpuid-Xeon-E3-1245-v5-json.xml | 1 +
.../x86_64-cpuid-Xeon-E5-2609-v3-guest.xml | 6 ------
.../x86_64-cpuid-Xeon-E5-2609-v3-host.xml | 6 ------
.../x86_64-cpuid-Xeon-E5-2609-v3-json.xml | 6 ------
.../x86_64-cpuid-Xeon-E5-2623-v4-guest.xml | 6 ------
.../x86_64-cpuid-Xeon-E5-2623-v4-host.xml | 6 ------
.../x86_64-cpuid-Xeon-E5-2623-v4-json.xml | 6 ------
.../x86_64-cpuid-Xeon-E5-2630-v3-guest.xml | 6 ------
.../x86_64-cpuid-Xeon-E5-2630-v3-host.xml | 6 ------
.../x86_64-cpuid-Xeon-E5-2630-v3-json.xml | 6 +-----
.../x86_64-cpuid-Xeon-E5-2630-v4-guest.xml | 6 ------
.../x86_64-cpuid-Xeon-E5-2630-v4-host.xml | 6 ------
.../x86_64-cpuid-Xeon-E5-2630-v4-json.xml | 6 ------
.../x86_64-cpuid-Xeon-E5-2650-guest.xml | 3 ---
.../x86_64-cpuid-Xeon-E5-2650-host.xml | 3 ---
.../x86_64-cpuid-Xeon-E5-2650-json.xml | 3 ---
.../x86_64-cpuid-Xeon-E5-2650-v3-guest.xml | 6 ------
.../x86_64-cpuid-Xeon-E5-2650-v3-host.xml | 6 ------
.../x86_64-cpuid-Xeon-E5-2650-v3-json.xml | 6 ++----
.../x86_64-cpuid-Xeon-E5-2650-v4-guest.xml | 6 ------
.../x86_64-cpuid-Xeon-E5-2650-v4-host.xml | 6 ------
.../x86_64-cpuid-Xeon-E5-2650-v4-json.xml | 6 ------
.../x86_64-cpuid-Xeon-E7-4820-guest.xml | 3 ---
.../x86_64-cpuid-Xeon-E7-4820-host.xml | 3 ---
.../x86_64-cpuid-Xeon-E7-4820-json.xml | 4 ++--
.../x86_64-cpuid-Xeon-E7-4830-guest.xml | 3 ---
.../x86_64-cpuid-Xeon-E7-4830-host.xml | 3 ---
.../x86_64-cpuid-Xeon-E7-4830-json.xml | 3 ---
.../x86_64-cpuid-Xeon-E7-8890-v3-guest.xml | 6 ------
.../x86_64-cpuid-Xeon-E7-8890-v3-host.xml | 6 ------
.../x86_64-cpuid-Xeon-E7-8890-v3-json.xml | 6 ------
.../x86_64-cpuid-Xeon-E7540-guest.xml | 1 -
.../x86_64-cpuid-Xeon-E7540-host.xml | 1 -
.../x86_64-cpuid-Xeon-E7540-json.xml | 1 -
.../x86_64-cpuid-Xeon-Gold-5115-guest.xml | 2 +-
.../x86_64-cpuid-Xeon-Gold-5115-host.xml | 2 +-
.../x86_64-cpuid-Xeon-Gold-5115-json.xml | 2 ++
.../x86_64-cpuid-Xeon-Gold-6130-guest.xml | 2 +-
.../x86_64-cpuid-Xeon-Gold-6130-host.xml | 2 +-
.../x86_64-cpuid-Xeon-Gold-6130-json.xml | 2 +-
.../x86_64-cpuid-Xeon-Gold-6148-guest.xml | 3 +--
.../x86_64-cpuid-Xeon-Gold-6148-host.xml | 3 +--
.../x86_64-cpuid-Xeon-Gold-6148-json.xml | 3 ++-
.../x86_64-cpuid-Xeon-Platinum-8268-json.xml | 2 +-
.../x86_64-cpuid-Xeon-W3520-guest.xml | 1 -
.../x86_64-cpuid-Xeon-W3520-host.xml | 1 -
.../x86_64-cpuid-Xeon-W3520-json.xml | 1 -
...id-baseline-Broadwell-IBRS+Cascadelake.xml | 6 ------
...puid-baseline-Cascadelake+Skylake-IBRS.xml | 2 +-
..._64-cpuid-baseline-Cascadelake+Skylake.xml | 3 ++-
.../x86_64-cpuid-baseline-EPYC+Rome.xml | 1 -
.../x86_64-cpuid-baseline-Haswell+Skylake.xml | 6 ------
...-baseline-Haswell-noTSX-IBRS+Broadwell.xml | 6 ------
...seline-Haswell-noTSX-IBRS+Skylake-IBRS.xml | 6 ------
...id-baseline-Haswell-noTSX-IBRS+Skylake.xml | 6 ------
.../x86_64-cpuid-baseline-Ryzen+Rome.xml | 1 -
...4-cpuid-baseline-Skylake-Client+Server.xml | 1 +
.../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 1 +
.../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 1 +
tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 1 +
...-Icelake-Server-pconfig.x86_64-latest.args | 2 +-
.../cpu-host-model.x86_64-4.2.0.args | 2 +-
.../cpu-host-model.x86_64-5.0.0.args | 2 +-
174 files changed, 458 insertions(+), 488 deletions(-)
diff --git a/src/cpu_map/x86_Broadwell-IBRS.xml b/src/cpu_map/x86_Broadwell-IBRS.xml
index e54233dfa9..d9c4757001 100644
--- a/src/cpu_map/x86_Broadwell-IBRS.xml
+++ b/src/cpu_map/x86_Broadwell-IBRS.xml
@@ -1,16 +1,22 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '2'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Core Processor (Broadwell)'
+ 'property.model-id': 'Intel Core Processor (Broadwell, IBRS)'
+-->
<cpus>
<model name='Broadwell-IBRS'>
<alias name='Broadwell-v3'/>
<decode host='on' guest='on'/>
- <signature family='6' model='61'/> <!-- 0306d0 -->
- <signature family='6' model='71'/> <!-- 040670 -->
- <signature family='6' model='79'/> <!-- 0406f0 -->
- <signature family='6' model='86'/> <!-- 050660 -->
+ <signature family='6' model='61'/>
<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'/>
@@ -21,6 +27,7 @@
<feature name='cx8'/>
<feature name='de'/>
<feature name='erms'/>
+ <feature name='f16c'/>
<feature name='fma'/>
<feature name='fpu'/>
<feature name='fsgsbase'/>
@@ -45,6 +52,7 @@
<feature name='popcnt'/>
<feature name='pse'/>
<feature name='pse36'/>
+ <feature name='rdrand'/>
<feature name='rdseed'/>
<feature name='rdtscp'/>
<feature name='rtm'/>
@@ -60,7 +68,9 @@
<feature name='syscall'/>
<feature name='tsc'/>
<feature name='tsc-deadline'/>
+ <feature name='vme'/>
<feature name='x2apic'/>
<feature name='xsave'/>
+ <feature name='xsaveopt'/>
</model>
</cpus>
diff --git a/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml
b/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml
index 637fb7a2cb..d15b321b88 100644
--- a/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml
+++ b/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml
@@ -1,16 +1,22 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '2'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Core Processor (Broadwell)'
+ 'property.model-id': 'Intel Core Processor (Broadwell, no TSX, IBRS)'
+-->
<cpus>
<model name='Broadwell-noTSX-IBRS'>
<alias name='Broadwell-v4'/>
<decode host='on' guest='on'/>
- <signature family='6' model='61'/> <!-- 0306d0 -->
- <signature family='6' model='71'/> <!-- 040670 -->
- <signature family='6' model='79'/> <!-- 0406f0 -->
- <signature family='6' model='86'/> <!-- 050660 -->
+ <signature family='6' model='61'/>
<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'/>
@@ -21,6 +27,7 @@
<feature name='cx8'/>
<feature name='de'/>
<feature name='erms'/>
+ <feature name='f16c'/>
<feature name='fma'/>
<feature name='fpu'/>
<feature name='fsgsbase'/>
@@ -44,6 +51,7 @@
<feature name='popcnt'/>
<feature name='pse'/>
<feature name='pse36'/>
+ <feature name='rdrand'/>
<feature name='rdseed'/>
<feature name='rdtscp'/>
<feature name='sep'/>
@@ -58,7 +66,9 @@
<feature name='syscall'/>
<feature name='tsc'/>
<feature name='tsc-deadline'/>
+ <feature name='vme'/>
<feature name='x2apic'/>
<feature name='xsave'/>
+ <feature name='xsaveopt'/>
</model>
</cpus>
diff --git a/src/cpu_map/x86_Broadwell-noTSX.xml b/src/cpu_map/x86_Broadwell-noTSX.xml
index 4d70fcacb2..b2a947ec8e 100644
--- a/src/cpu_map/x86_Broadwell-noTSX.xml
+++ b/src/cpu_map/x86_Broadwell-noTSX.xml
@@ -1,16 +1,22 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '2'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Core Processor (Broadwell)'
+ 'property.model-id': 'Intel Core Processor (Broadwell, no TSX)'
+-->
<cpus>
<model name='Broadwell-noTSX'>
<alias name='Broadwell-v2'/>
<decode host='on' guest='on'/>
- <signature family='6' model='61'/> <!-- 0306d0 -->
- <signature family='6' model='71'/> <!-- 040670 -->
- <signature family='6' model='79'/> <!-- 0406f0 -->
- <signature family='6' model='86'/> <!-- 050660 -->
+ <signature family='6' model='61'/>
<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'/>
@@ -21,6 +27,7 @@
<feature name='cx8'/>
<feature name='de'/>
<feature name='erms'/>
+ <feature name='f16c'/>
<feature name='fma'/>
<feature name='fpu'/>
<feature name='fsgsbase'/>
@@ -44,6 +51,7 @@
<feature name='popcnt'/>
<feature name='pse'/>
<feature name='pse36'/>
+ <feature name='rdrand'/>
<feature name='rdseed'/>
<feature name='rdtscp'/>
<feature name='sep'/>
@@ -57,7 +65,9 @@
<feature name='syscall'/>
<feature name='tsc'/>
<feature name='tsc-deadline'/>
+ <feature name='vme'/>
<feature name='x2apic'/>
<feature name='xsave'/>
+ <feature name='xsaveopt'/>
</model>
</cpus>
diff --git a/src/cpu_map/x86_Broadwell.xml b/src/cpu_map/x86_Broadwell.xml
index c638418d27..36e263fdf2 100644
--- a/src/cpu_map/x86_Broadwell.xml
+++ b/src/cpu_map/x86_Broadwell.xml
@@ -1,16 +1,21 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '2'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Core Processor (Broadwell)'
+-->
<cpus>
<model name='Broadwell'>
<alias name='Broadwell-v1'/>
<decode host='on' guest='on'/>
- <signature family='6' model='61'/> <!-- 0306d0 -->
- <signature family='6' model='71'/> <!-- 040670 -->
- <signature family='6' model='79'/> <!-- 0406f0 -->
- <signature family='6' model='86'/> <!-- 050660 -->
+ <signature family='6' model='61'/>
<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'/>
@@ -21,6 +26,7 @@
<feature name='cx8'/>
<feature name='de'/>
<feature name='erms'/>
+ <feature name='f16c'/>
<feature name='fma'/>
<feature name='fpu'/>
<feature name='fsgsbase'/>
@@ -45,6 +51,7 @@
<feature name='popcnt'/>
<feature name='pse'/>
<feature name='pse36'/>
+ <feature name='rdrand'/>
<feature name='rdseed'/>
<feature name='rdtscp'/>
<feature name='rtm'/>
@@ -59,7 +66,9 @@
<feature name='syscall'/>
<feature name='tsc'/>
<feature name='tsc-deadline'/>
+ <feature name='vme'/>
<feature name='x2apic'/>
<feature name='xsave'/>
+ <feature name='xsaveopt'/>
</model>
</cpus>
diff --git a/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
b/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
index 3ddd4e9947..2296f20336 100644
--- a/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
+++ b/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
@@ -1,8 +1,15 @@
+<!-- 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-noTSX'>
<alias name='Cascadelake-Server-v3'/>
- <decode host='on' guest='off'/>
- <signature family='6' model='85' stepping='5-7'/>
<!-- 050654 -->
+ <decode host='on' guest='on'/>
+ <signature family='6' model='85'/>
<vendor name='Intel'/>
<feature name='3dnowprefetch'/>
<feature name='abm'/>
@@ -10,6 +17,7 @@
<feature name='aes'/>
<feature name='apic'/>
<feature name='arat'/>
+ <feature name='arch-capabilities'/>
<feature name='avx'/>
<feature name='avx2'/>
<feature name='avx512bw'/>
@@ -33,14 +41,15 @@
<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='mpx'/>
<feature name='msr'/>
<feature name='mtrr'/>
<feature name='nx'/>
@@ -50,14 +59,17 @@
<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'/>
diff --git a/src/cpu_map/x86_Cascadelake-Server.xml
b/src/cpu_map/x86_Cascadelake-Server.xml
index 3805ce9d59..1e0c53d54e 100644
--- a/src/cpu_map/x86_Cascadelake-Server.xml
+++ b/src/cpu_map/x86_Cascadelake-Server.xml
@@ -1,8 +1,14 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '6'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Xeon Processor (Cascadelake)'
+-->
<cpus>
<model name='Cascadelake-Server'>
<alias name='Cascadelake-Server-v1'/>
<decode host='on' guest='on'/>
- <signature family='6' model='85' stepping='5-7'/>
<!-- 050654 -->
+ <signature family='6' model='85'/>
<vendor name='Intel'/>
<feature name='3dnowprefetch'/>
<feature name='abm'/>
@@ -41,7 +47,6 @@
<feature name='mce'/>
<feature name='mmx'/>
<feature name='movbe'/>
- <feature name='mpx'/>
<feature name='msr'/>
<feature name='mtrr'/>
<feature name='nx'/>
@@ -51,6 +56,7 @@
<feature name='pclmuldq'/>
<feature name='pdpe1gb'/>
<feature name='pge'/>
+ <feature name='pku'/>
<feature name='pni'/>
<feature name='popcnt'/>
<feature name='pse'/>
diff --git a/src/cpu_map/x86_Cooperlake.xml b/src/cpu_map/x86_Cooperlake.xml
index 2e879f8121..d3148c6079 100644
--- a/src/cpu_map/x86_Cooperlake.xml
+++ b/src/cpu_map/x86_Cooperlake.xml
@@ -1,8 +1,14 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '10'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Xeon Processor (Cooperlake)'
+-->
<cpus>
<model name='Cooperlake'>
<alias name='Cooperlake-v1'/>
<decode host='on' guest='on'/>
- <signature family='6' model='85' stepping='10-11'/>
<!-- 05065b -->
+ <signature family='6' model='85'/>
<vendor name='Intel'/>
<feature name='3dnowprefetch'/>
<feature name='abm'/>
diff --git a/src/cpu_map/x86_Dhyana.xml b/src/cpu_map/x86_Dhyana.xml
index 54aac1be3a..82e6061dd0 100644
--- a/src/cpu_map/x86_Dhyana.xml
+++ b/src/cpu_map/x86_Dhyana.xml
@@ -1,8 +1,15 @@
+<!-- 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'
+-->
<cpus>
<model name='Dhyana'>
<alias name='Dhyana-v1'/>
<decode host='on' guest='on'/>
- <signature family='24' model='0'/> <!-- 900f00 -->
+ <signature family='24' model='0'/>
<vendor name='Hygon'/>
<feature name='3dnowprefetch'/>
<feature name='abm'/>
@@ -34,10 +41,11 @@
<feature name='misalignsse'/>
<feature name='mmx'/>
<feature name='mmxext'/>
- <feature name='monitor' removed='yes'/>
<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'/>
diff --git a/src/cpu_map/x86_EPYC-Genoa.xml b/src/cpu_map/x86_EPYC-Genoa.xml
index 3e765b89b1..c79b99250f 100644
--- a/src/cpu_map/x86_EPYC-Genoa.xml
+++ b/src/cpu_map/x86_EPYC-Genoa.xml
@@ -1,3 +1,10 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '0'
+ 'model.xlevel': '0x80000022'
+ 'model.model_id': 'AMD EPYC-Genoa Processor'
+ 'model.cache_info': '&epyc_genoa_cache_info'
+-->
<cpus>
<model name='EPYC-Genoa'>
<decode host='on' guest='on'/>
diff --git a/src/cpu_map/x86_EPYC-IBPB.xml b/src/cpu_map/x86_EPYC-IBPB.xml
index f93dc29213..4b64834979 100644
--- a/src/cpu_map/x86_EPYC-IBPB.xml
+++ b/src/cpu_map/x86_EPYC-IBPB.xml
@@ -1,8 +1,16 @@
+<!-- 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 (with IBPB)'
+-->
<cpus>
<model name='EPYC-IBPB'>
<alias name='EPYC-v2'/>
<decode host='on' guest='on'/>
- <signature family='23' model='1'/> <!-- 800f10 -->
+ <signature family='23' model='1'/>
<vendor name='AMD'/>
<feature name='3dnowprefetch'/>
<feature name='abm'/>
@@ -35,7 +43,6 @@
<feature name='misalignsse'/>
<feature name='mmx'/>
<feature name='mmxext'/>
- <feature name='monitor' removed='yes'/>
<feature name='movbe'/>
<feature name='msr'/>
<feature name='mtrr'/>
diff --git a/src/cpu_map/x86_EPYC-Milan.xml b/src/cpu_map/x86_EPYC-Milan.xml
index 5163469256..036203ccfe 100644
--- a/src/cpu_map/x86_EPYC-Milan.xml
+++ b/src/cpu_map/x86_EPYC-Milan.xml
@@ -1,3 +1,10 @@
+<!-- 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'
+-->
<cpus>
<model name='EPYC-Milan'>
<alias name='EPYC-Milan-v1'/>
diff --git a/src/cpu_map/x86_EPYC-Rome.xml b/src/cpu_map/x86_EPYC-Rome.xml
index 7b42442a1e..f90ff65401 100644
--- a/src/cpu_map/x86_EPYC-Rome.xml
+++ b/src/cpu_map/x86_EPYC-Rome.xml
@@ -1,3 +1,10 @@
+<!-- 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'>
<alias name='EPYC-Rome-v1'/>
diff --git a/src/cpu_map/x86_EPYC.xml b/src/cpu_map/x86_EPYC.xml
index 38096fce1c..8317ad8fc7 100644
--- a/src/cpu_map/x86_EPYC.xml
+++ b/src/cpu_map/x86_EPYC.xml
@@ -1,8 +1,15 @@
+<!-- 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'
+-->
<cpus>
<model name='EPYC'>
<alias name='EPYC-v1'/>
<decode host='on' guest='on'/>
- <signature family='23' model='1'/> <!-- 800f10 -->
+ <signature family='23' model='1'/>
<vendor name='AMD'/>
<feature name='3dnowprefetch'/>
<feature name='abm'/>
@@ -34,7 +41,6 @@
<feature name='misalignsse'/>
<feature name='mmx'/>
<feature name='mmxext'/>
- <feature name='monitor' removed='yes'/>
<feature name='movbe'/>
<feature name='msr'/>
<feature name='mtrr'/>
diff --git a/src/cpu_map/x86_Haswell-IBRS.xml b/src/cpu_map/x86_Haswell-IBRS.xml
index 10ab7e2032..ee476bc3a2 100644
--- a/src/cpu_map/x86_Haswell-IBRS.xml
+++ b/src/cpu_map/x86_Haswell-IBRS.xml
@@ -1,14 +1,21 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '4'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Core Processor (Haswell)'
+ 'property.stepping': '4'
+ 'property.model-id': 'Intel Core Processor (Haswell, IBRS)'
+-->
<cpus>
<model name='Haswell-IBRS'>
<alias name='Haswell-v3'/>
<decode host='on' guest='on'/>
- <signature family='6' model='60'/> <!-- 0306c0 -->
- <signature family='6' model='63'/> <!-- 0306f0 -->
- <signature family='6' model='69'/> <!-- 040650 -->
- <signature family='6' model='70'/> <!-- 040660 -->
+ <signature family='6' model='60'/>
<vendor name='Intel'/>
+ <feature name='abm'/>
<feature name='aes'/>
<feature name='apic'/>
+ <feature name='arat'/>
<feature name='avx'/>
<feature name='avx2'/>
<feature name='bmi1'/>
@@ -19,6 +26,7 @@
<feature name='cx8'/>
<feature name='de'/>
<feature name='erms'/>
+ <feature name='f16c'/>
<feature name='fma'/>
<feature name='fpu'/>
<feature name='fsgsbase'/>
@@ -43,6 +51,7 @@
<feature name='popcnt'/>
<feature name='pse'/>
<feature name='pse36'/>
+ <feature name='rdrand'/>
<feature name='rdtscp'/>
<feature name='rtm'/>
<feature name='sep'/>
@@ -56,7 +65,9 @@
<feature name='syscall'/>
<feature name='tsc'/>
<feature name='tsc-deadline'/>
+ <feature name='vme'/>
<feature name='x2apic'/>
<feature name='xsave'/>
+ <feature name='xsaveopt'/>
</model>
</cpus>
diff --git a/src/cpu_map/x86_Haswell-noTSX-IBRS.xml
b/src/cpu_map/x86_Haswell-noTSX-IBRS.xml
index 23bf427df8..42ae1da41a 100644
--- a/src/cpu_map/x86_Haswell-noTSX-IBRS.xml
+++ b/src/cpu_map/x86_Haswell-noTSX-IBRS.xml
@@ -1,14 +1,21 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '4'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Core Processor (Haswell)'
+ 'property.stepping': '1'
+ 'property.model-id': 'Intel Core Processor (Haswell, no TSX, IBRS)'
+-->
<cpus>
<model name='Haswell-noTSX-IBRS'>
<alias name='Haswell-v4'/>
<decode host='on' guest='on'/>
- <signature family='6' model='60'/> <!-- 0306c0 -->
- <signature family='6' model='63'/> <!-- 0306f0 -->
- <signature family='6' model='69'/> <!-- 040650 -->
- <signature family='6' model='70'/> <!-- 040660 -->
+ <signature family='6' model='60'/>
<vendor name='Intel'/>
+ <feature name='abm'/>
<feature name='aes'/>
<feature name='apic'/>
+ <feature name='arat'/>
<feature name='avx'/>
<feature name='avx2'/>
<feature name='bmi1'/>
@@ -19,6 +26,7 @@
<feature name='cx8'/>
<feature name='de'/>
<feature name='erms'/>
+ <feature name='f16c'/>
<feature name='fma'/>
<feature name='fpu'/>
<feature name='fsgsbase'/>
@@ -42,6 +50,7 @@
<feature name='popcnt'/>
<feature name='pse'/>
<feature name='pse36'/>
+ <feature name='rdrand'/>
<feature name='rdtscp'/>
<feature name='sep'/>
<feature name='smep'/>
@@ -54,7 +63,9 @@
<feature name='syscall'/>
<feature name='tsc'/>
<feature name='tsc-deadline'/>
+ <feature name='vme'/>
<feature name='x2apic'/>
<feature name='xsave'/>
+ <feature name='xsaveopt'/>
</model>
</cpus>
diff --git a/src/cpu_map/x86_Haswell-noTSX.xml b/src/cpu_map/x86_Haswell-noTSX.xml
index eec6d046a0..fca9e6fda3 100644
--- a/src/cpu_map/x86_Haswell-noTSX.xml
+++ b/src/cpu_map/x86_Haswell-noTSX.xml
@@ -1,14 +1,21 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '4'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Core Processor (Haswell)'
+ 'property.stepping': '1'
+ 'property.model-id': 'Intel Core Processor (Haswell, no TSX)'
+-->
<cpus>
<model name='Haswell-noTSX'>
<alias name='Haswell-v2'/>
<decode host='on' guest='on'/>
- <signature family='6' model='60'/> <!-- 0306c0 -->
- <signature family='6' model='63'/> <!-- 0306f0 -->
- <signature family='6' model='69'/> <!-- 040650 -->
- <signature family='6' model='70'/> <!-- 040660 -->
+ <signature family='6' model='60'/>
<vendor name='Intel'/>
+ <feature name='abm'/>
<feature name='aes'/>
<feature name='apic'/>
+ <feature name='arat'/>
<feature name='avx'/>
<feature name='avx2'/>
<feature name='bmi1'/>
@@ -19,6 +26,7 @@
<feature name='cx8'/>
<feature name='de'/>
<feature name='erms'/>
+ <feature name='f16c'/>
<feature name='fma'/>
<feature name='fpu'/>
<feature name='fsgsbase'/>
@@ -42,6 +50,7 @@
<feature name='popcnt'/>
<feature name='pse'/>
<feature name='pse36'/>
+ <feature name='rdrand'/>
<feature name='rdtscp'/>
<feature name='sep'/>
<feature name='smep'/>
@@ -53,7 +62,9 @@
<feature name='syscall'/>
<feature name='tsc'/>
<feature name='tsc-deadline'/>
+ <feature name='vme'/>
<feature name='x2apic'/>
<feature name='xsave'/>
+ <feature name='xsaveopt'/>
</model>
</cpus>
diff --git a/src/cpu_map/x86_Haswell.xml b/src/cpu_map/x86_Haswell.xml
index c3ec40ce19..916580c440 100644
--- a/src/cpu_map/x86_Haswell.xml
+++ b/src/cpu_map/x86_Haswell.xml
@@ -1,14 +1,19 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '4'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Core Processor (Haswell)'
+-->
<cpus>
<model name='Haswell'>
<alias name='Haswell-v1'/>
<decode host='on' guest='on'/>
- <signature family='6' model='60'/> <!-- 0306c0 -->
- <signature family='6' model='63'/> <!-- 0306f0 -->
- <signature family='6' model='69'/> <!-- 040650 -->
- <signature family='6' model='70'/> <!-- 040660 -->
+ <signature family='6' model='60'/>
<vendor name='Intel'/>
+ <feature name='abm'/>
<feature name='aes'/>
<feature name='apic'/>
+ <feature name='arat'/>
<feature name='avx'/>
<feature name='avx2'/>
<feature name='bmi1'/>
@@ -19,6 +24,7 @@
<feature name='cx8'/>
<feature name='de'/>
<feature name='erms'/>
+ <feature name='f16c'/>
<feature name='fma'/>
<feature name='fpu'/>
<feature name='fsgsbase'/>
@@ -43,6 +49,7 @@
<feature name='popcnt'/>
<feature name='pse'/>
<feature name='pse36'/>
+ <feature name='rdrand'/>
<feature name='rdtscp'/>
<feature name='rtm'/>
<feature name='sep'/>
@@ -55,7 +62,9 @@
<feature name='syscall'/>
<feature name='tsc'/>
<feature name='tsc-deadline'/>
+ <feature name='vme'/>
<feature name='x2apic'/>
<feature name='xsave'/>
+ <feature name='xsaveopt'/>
</model>
</cpus>
diff --git a/src/cpu_map/x86_Icelake-Server-noTSX.xml
b/src/cpu_map/x86_Icelake-Server-noTSX.xml
index f77bf6eb3e..2c0a4b7ef9 100644
--- a/src/cpu_map/x86_Icelake-Server-noTSX.xml
+++ b/src/cpu_map/x86_Icelake-Server-noTSX.xml
@@ -1,8 +1,15 @@
+<!-- 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-noTSX'>
<alias name='Icelake-Server-v2'/>
- <decode host='on' guest='off'/>
- <signature family='6' model='106'/> <!-- 0606A5 -->
+ <decode host='on' guest='on'/>
+ <signature family='6' model='134'/>
<vendor name='Intel'/>
<feature name='3dnowprefetch'/>
<feature name='abm'/>
@@ -38,7 +45,6 @@
<feature name='fsgsbase'/>
<feature name='fxsr'/>
<feature name='gfni'/>
- <feature name='intel-pt' removed='yes'/>
<feature name='invpcid'/>
<feature name='la57'/>
<feature name='lahf_lm'/>
@@ -47,7 +53,6 @@
<feature name='mce'/>
<feature name='mmx'/>
<feature name='movbe'/>
- <feature name='mpx'/>
<feature name='msr'/>
<feature name='mtrr'/>
<feature name='nx'/>
diff --git a/src/cpu_map/x86_Icelake-Server.xml b/src/cpu_map/x86_Icelake-Server.xml
index 6bebbf174c..1a73c8170a 100644
--- a/src/cpu_map/x86_Icelake-Server.xml
+++ b/src/cpu_map/x86_Icelake-Server.xml
@@ -1,8 +1,14 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '0'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Xeon Processor (Icelake)'
+-->
<cpus>
<model name='Icelake-Server'>
<alias name='Icelake-Server-v1'/>
<decode host='on' guest='on'/>
- <signature family='6' model='106'/> <!-- 0606A5 -->
+ <signature family='6' model='134'/>
<vendor name='Intel'/>
<feature name='3dnowprefetch'/>
<feature name='abm'/>
@@ -39,7 +45,6 @@
<feature name='fxsr'/>
<feature name='gfni'/>
<feature name='hle'/>
- <feature name='intel-pt' removed='yes'/>
<feature name='invpcid'/>
<feature name='la57'/>
<feature name='lahf_lm'/>
@@ -48,7 +53,6 @@
<feature name='mce'/>
<feature name='mmx'/>
<feature name='movbe'/>
- <feature name='mpx'/>
<feature name='msr'/>
<feature name='mtrr'/>
<feature name='nx'/>
diff --git a/src/cpu_map/x86_IvyBridge-IBRS.xml b/src/cpu_map/x86_IvyBridge-IBRS.xml
index b2b257c11c..820722d5da 100644
--- a/src/cpu_map/x86_IvyBridge-IBRS.xml
+++ b/src/cpu_map/x86_IvyBridge-IBRS.xml
@@ -1,12 +1,19 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '9'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Xeon E3-12xx v2 (Ivy Bridge)'
+ 'property.model-id': 'Intel Xeon E3-12xx v2 (Ivy Bridge, IBRS)'
+-->
<cpus>
<model name='IvyBridge-IBRS'>
<alias name='IvyBridge-v2'/>
<decode host='on' guest='on'/>
- <signature family='6' model='58'/> <!-- 0306a0 -->
- <signature family='6' model='62'/> <!-- 0306e0 -->
+ <signature family='6' model='58'/>
<vendor name='Intel'/>
<feature name='aes'/>
<feature name='apic'/>
+ <feature name='arat'/>
<feature name='avx'/>
<feature name='clflush'/>
<feature name='cmov'/>
@@ -50,5 +57,6 @@
<feature name='vme'/>
<feature name='x2apic'/>
<feature name='xsave'/>
+ <feature name='xsaveopt'/>
</model>
</cpus>
diff --git a/src/cpu_map/x86_IvyBridge.xml b/src/cpu_map/x86_IvyBridge.xml
index 579af5f817..4a22cb3eb6 100644
--- a/src/cpu_map/x86_IvyBridge.xml
+++ b/src/cpu_map/x86_IvyBridge.xml
@@ -1,12 +1,18 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '9'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Xeon E3-12xx v2 (Ivy Bridge)'
+-->
<cpus>
<model name='IvyBridge'>
<alias name='IvyBridge-v1'/>
<decode host='on' guest='on'/>
- <signature family='6' model='58'/> <!-- 0306a0 -->
- <signature family='6' model='62'/> <!-- 0306e0 -->
+ <signature family='6' model='58'/>
<vendor name='Intel'/>
<feature name='aes'/>
<feature name='apic'/>
+ <feature name='arat'/>
<feature name='avx'/>
<feature name='clflush'/>
<feature name='cmov'/>
@@ -49,5 +55,6 @@
<feature name='vme'/>
<feature name='x2apic'/>
<feature name='xsave'/>
+ <feature name='xsaveopt'/>
</model>
</cpus>
diff --git a/src/cpu_map/x86_Nehalem-IBRS.xml b/src/cpu_map/x86_Nehalem-IBRS.xml
index 1d19cab20f..09f5d08306 100644
--- a/src/cpu_map/x86_Nehalem-IBRS.xml
+++ b/src/cpu_map/x86_Nehalem-IBRS.xml
@@ -1,11 +1,15 @@
+<!-- extra info from qemu:
+ 'model.level': '11'
+ 'model.stepping': '3'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Core i7 9xx (Nehalem Class Core i7)'
+ 'property.model-id': 'Intel Core i7 9xx (Nehalem Core i7, IBRS
update)'
+-->
<cpus>
<model name='Nehalem-IBRS'>
<alias name='Nehalem-v2'/>
<decode host='on' guest='on'/>
- <signature family='6' model='26'/> <!-- 0106a0 -->
- <signature family='6' model='30'/> <!-- 0106e0 -->
- <signature family='6' model='31'/> <!-- 0106f0 -->
- <signature family='6' model='46'/> <!-- 0206e0 -->
+ <signature family='6' model='26'/>
<vendor name='Intel'/>
<feature name='apic'/>
<feature name='clflush'/>
@@ -39,5 +43,6 @@
<feature name='ssse3'/>
<feature name='syscall'/>
<feature name='tsc'/>
+ <feature name='vme'/>
</model>
</cpus>
diff --git a/src/cpu_map/x86_Nehalem.xml b/src/cpu_map/x86_Nehalem.xml
index 21f9aa1fff..28004accca 100644
--- a/src/cpu_map/x86_Nehalem.xml
+++ b/src/cpu_map/x86_Nehalem.xml
@@ -1,11 +1,14 @@
+<!-- extra info from qemu:
+ 'model.level': '11'
+ 'model.stepping': '3'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Core i7 9xx (Nehalem Class Core i7)'
+-->
<cpus>
<model name='Nehalem'>
<alias name='Nehalem-v1'/>
<decode host='on' guest='on'/>
- <signature family='6' model='26'/> <!-- 0106a0 -->
- <signature family='6' model='30'/> <!-- 0106e0 -->
- <signature family='6' model='31'/> <!-- 0106f0 -->
- <signature family='6' model='46'/> <!-- 0206e0 -->
+ <signature family='6' model='26'/>
<vendor name='Intel'/>
<feature name='apic'/>
<feature name='clflush'/>
@@ -38,5 +41,6 @@
<feature name='ssse3'/>
<feature name='syscall'/>
<feature name='tsc'/>
+ <feature name='vme'/>
</model>
</cpus>
diff --git a/src/cpu_map/x86_SandyBridge-IBRS.xml b/src/cpu_map/x86_SandyBridge-IBRS.xml
index 24cc22f596..2b21fc9527 100644
--- a/src/cpu_map/x86_SandyBridge-IBRS.xml
+++ b/src/cpu_map/x86_SandyBridge-IBRS.xml
@@ -1,12 +1,19 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '1'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Xeon E312xx (Sandy Bridge)'
+ 'property.model-id': 'Intel Xeon E312xx (Sandy Bridge, IBRS update)'
+-->
<cpus>
<model name='SandyBridge-IBRS'>
<alias name='SandyBridge-v2'/>
<decode host='on' guest='on'/>
- <signature family='6' model='42'/> <!-- 0206a0 -->
- <signature family='6' model='45'/> <!-- 0206d0 -->
+ <signature family='6' model='42'/>
<vendor name='Intel'/>
<feature name='aes'/>
<feature name='apic'/>
+ <feature name='arat'/>
<feature name='avx'/>
<feature name='clflush'/>
<feature name='cmov'/>
@@ -42,7 +49,9 @@
<feature name='syscall'/>
<feature name='tsc'/>
<feature name='tsc-deadline'/>
+ <feature name='vme'/>
<feature name='x2apic'/>
<feature name='xsave'/>
+ <feature name='xsaveopt'/>
</model>
</cpus>
diff --git a/src/cpu_map/x86_SandyBridge.xml b/src/cpu_map/x86_SandyBridge.xml
index 8faa73a86e..a72b3ca38f 100644
--- a/src/cpu_map/x86_SandyBridge.xml
+++ b/src/cpu_map/x86_SandyBridge.xml
@@ -1,12 +1,18 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '1'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Xeon E312xx (Sandy Bridge)'
+-->
<cpus>
<model name='SandyBridge'>
<alias name='SandyBridge-v1'/>
<decode host='on' guest='on'/>
- <signature family='6' model='42'/> <!-- 0206a0 -->
- <signature family='6' model='45'/> <!-- 0206d0 -->
+ <signature family='6' model='42'/>
<vendor name='Intel'/>
<feature name='aes'/>
<feature name='apic'/>
+ <feature name='arat'/>
<feature name='avx'/>
<feature name='clflush'/>
<feature name='cmov'/>
@@ -41,7 +47,9 @@
<feature name='syscall'/>
<feature name='tsc'/>
<feature name='tsc-deadline'/>
+ <feature name='vme'/>
<feature name='x2apic'/>
<feature name='xsave'/>
+ <feature name='xsaveopt'/>
</model>
</cpus>
diff --git a/src/cpu_map/x86_SapphireRapids.xml b/src/cpu_map/x86_SapphireRapids.xml
index 93307b37a2..9ea4c78e50 100644
--- a/src/cpu_map/x86_SapphireRapids.xml
+++ b/src/cpu_map/x86_SapphireRapids.xml
@@ -1,3 +1,9 @@
+<!-- extra info from qemu:
+ 'model.level': '0x20'
+ 'model.stepping': '4'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Xeon Processor (SapphireRapids)'
+-->
<cpus>
<model name='SapphireRapids'>
<alias name='SapphireRapids-v1'/>
diff --git a/src/cpu_map/x86_Skylake-Client-IBRS.xml
b/src/cpu_map/x86_Skylake-Client-IBRS.xml
index 9f0c0f75e8..6f6701fa39 100644
--- a/src/cpu_map/x86_Skylake-Client-IBRS.xml
+++ b/src/cpu_map/x86_Skylake-Client-IBRS.xml
@@ -1,13 +1,15 @@
+<!-- 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)'
+-->
<cpus>
<model name='Skylake-Client-IBRS'>
<alias name='Skylake-Client-v2'/>
<decode host='on' guest='on'/>
- <signature family='6' model='94'/> <!-- 0506e0 -->
- <signature family='6' model='78'/> <!-- 0406e0 -->
- <!-- These are Kaby Lake and Coffee Lake successors to Skylake,
- but we don't have specific models for them. -->
- <signature family='6' model='142'/> <!-- 0806e0 -->
- <signature family='6' model='158'/> <!-- 0906e0 -->
+ <signature family='6' model='94'/>
<vendor name='Intel'/>
<feature name='3dnowprefetch'/>
<feature name='abm'/>
@@ -38,7 +40,6 @@
<feature name='mce'/>
<feature name='mmx'/>
<feature name='movbe'/>
- <feature name='mpx'/>
<feature name='msr'/>
<feature name='mtrr'/>
<feature name='nx'/>
diff --git a/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
b/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
index cfb3446480..3846330e71 100644
--- a/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
+++ b/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
@@ -1,13 +1,15 @@
+<!-- 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)'
+-->
<cpus>
<model name='Skylake-Client-noTSX-IBRS'>
<alias name='Skylake-Client-v3'/>
- <decode host='on' guest='off'/>
- <signature family='6' model='94'/> <!-- 0506e0 -->
- <signature family='6' model='78'/> <!-- 0406e0 -->
- <!-- These are Kaby Lake and Coffee Lake successors to Skylake,
- but we don't have specific models for them. -->
- <signature family='6' model='142'/> <!-- 0806e0 -->
- <signature family='6' model='158'/> <!-- 0906e0 -->
+ <decode host='on' guest='on'/>
+ <signature family='6' model='94'/>
<vendor name='Intel'/>
<feature name='3dnowprefetch'/>
<feature name='abm'/>
@@ -37,7 +39,6 @@
<feature name='mce'/>
<feature name='mmx'/>
<feature name='movbe'/>
- <feature name='mpx'/>
<feature name='msr'/>
<feature name='mtrr'/>
<feature name='nx'/>
diff --git a/src/cpu_map/x86_Skylake-Client.xml b/src/cpu_map/x86_Skylake-Client.xml
index 1cef4fb1c7..ba9277d061 100644
--- a/src/cpu_map/x86_Skylake-Client.xml
+++ b/src/cpu_map/x86_Skylake-Client.xml
@@ -1,13 +1,14 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '3'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Core Processor (Skylake)'
+-->
<cpus>
<model name='Skylake-Client'>
<alias name='Skylake-Client-v1'/>
<decode host='on' guest='on'/>
- <signature family='6' model='94'/> <!-- 0506e0 -->
- <signature family='6' model='78'/> <!-- 0406e0 -->
- <!-- These are Kaby Lake and Coffee Lake successors to Skylake,
- but we don't have specific models for them. -->
- <signature family='6' model='142'/> <!-- 0806e0 -->
- <signature family='6' model='158'/> <!-- 0906e0 -->
+ <signature family='6' model='94'/>
<vendor name='Intel'/>
<feature name='3dnowprefetch'/>
<feature name='abm'/>
@@ -38,7 +39,6 @@
<feature name='mce'/>
<feature name='mmx'/>
<feature name='movbe'/>
- <feature name='mpx'/>
<feature name='msr'/>
<feature name='mtrr'/>
<feature name='nx'/>
diff --git a/src/cpu_map/x86_Skylake-Server-IBRS.xml
b/src/cpu_map/x86_Skylake-Server-IBRS.xml
index a675e5fee6..2a4dd72fa3 100644
--- a/src/cpu_map/x86_Skylake-Server-IBRS.xml
+++ b/src/cpu_map/x86_Skylake-Server-IBRS.xml
@@ -1,8 +1,15 @@
+<!-- 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)'
+-->
<cpus>
<model name='Skylake-Server-IBRS'>
<alias name='Skylake-Server-v2'/>
<decode host='on' guest='on'/>
- <signature family='6' model='85' stepping='0-4'/>
<!-- 050654 -->
+ <signature family='6' model='85'/>
<vendor name='Intel'/>
<feature name='3dnowprefetch'/>
<feature name='abm'/>
@@ -39,7 +46,6 @@
<feature name='mce'/>
<feature name='mmx'/>
<feature name='movbe'/>
- <feature name='mpx'/>
<feature name='msr'/>
<feature name='mtrr'/>
<feature name='nx'/>
@@ -49,6 +55,7 @@
<feature name='pclmuldq'/>
<feature name='pdpe1gb'/>
<feature name='pge'/>
+ <feature name='pku'/>
<feature name='pni'/>
<feature name='popcnt'/>
<feature name='pse'/>
diff --git a/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
b/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
index 6d34904207..913493d6e2 100644
--- a/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
+++ b/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
@@ -1,8 +1,15 @@
+<!-- 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-noTSX-IBRS'>
<alias name='Skylake-Server-v3'/>
- <decode host='on' guest='off'/>
- <signature family='6' model='85' stepping='0-4'/>
<!-- 050654 -->
+ <decode host='on' guest='on'/>
+ <signature family='6' model='85'/>
<vendor name='Intel'/>
<feature name='3dnowprefetch'/>
<feature name='abm'/>
@@ -38,7 +45,6 @@
<feature name='mce'/>
<feature name='mmx'/>
<feature name='movbe'/>
- <feature name='mpx'/>
<feature name='msr'/>
<feature name='mtrr'/>
<feature name='nx'/>
@@ -48,6 +54,7 @@
<feature name='pclmuldq'/>
<feature name='pdpe1gb'/>
<feature name='pge'/>
+ <feature name='pku'/>
<feature name='pni'/>
<feature name='popcnt'/>
<feature name='pse'/>
diff --git a/src/cpu_map/x86_Skylake-Server.xml b/src/cpu_map/x86_Skylake-Server.xml
index 154bc7d848..1b72ae958e 100644
--- a/src/cpu_map/x86_Skylake-Server.xml
+++ b/src/cpu_map/x86_Skylake-Server.xml
@@ -1,8 +1,14 @@
+<!-- extra info from qemu:
+ 'model.level': '0xd'
+ 'model.stepping': '4'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Xeon Processor (Skylake)'
+-->
<cpus>
<model name='Skylake-Server'>
<alias name='Skylake-Server-v1'/>
<decode host='on' guest='on'/>
- <signature family='6' model='85' stepping='0-4'/>
<!-- 050654 -->
+ <signature family='6' model='85'/>
<vendor name='Intel'/>
<feature name='3dnowprefetch'/>
<feature name='abm'/>
@@ -20,6 +26,7 @@
<feature name='bmi1'/>
<feature name='bmi2'/>
<feature name='clflush'/>
+ <feature name='clflushopt'/>
<feature name='clwb'/>
<feature name='cmov'/>
<feature name='cx16'/>
@@ -39,7 +46,6 @@
<feature name='mce'/>
<feature name='mmx'/>
<feature name='movbe'/>
- <feature name='mpx'/>
<feature name='msr'/>
<feature name='mtrr'/>
<feature name='nx'/>
@@ -49,6 +55,7 @@
<feature name='pclmuldq'/>
<feature name='pdpe1gb'/>
<feature name='pge'/>
+ <feature name='pku'/>
<feature name='pni'/>
<feature name='popcnt'/>
<feature name='pse'/>
diff --git a/src/cpu_map/x86_Snowridge.xml b/src/cpu_map/x86_Snowridge.xml
index 534295aa57..193393a127 100644
--- a/src/cpu_map/x86_Snowridge.xml
+++ b/src/cpu_map/x86_Snowridge.xml
@@ -1,8 +1,14 @@
+<!-- extra info from qemu:
+ 'model.level': '27'
+ 'model.stepping': '1'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Intel Atom Processor (SnowRidge)'
+-->
<cpus>
<model name='Snowridge'>
<alias name='Snowridge-v1'/>
<decode host='on' guest='on'/>
- <signature family='6' model='134'/> <!-- 080665 -->
+ <signature family='6' model='134'/>
<vendor name='Intel'/>
<feature name='3dnowprefetch'/>
<feature name='aes'/>
@@ -31,6 +37,7 @@
<feature name='movbe'/>
<feature name='movdir64b'/>
<feature name='movdiri'/>
+ <feature name='mpx'/>
<feature name='msr'/>
<feature name='mtrr'/>
<feature name='nx'/>
diff --git a/src/cpu_map/x86_Westmere-IBRS.xml b/src/cpu_map/x86_Westmere-IBRS.xml
index 46460b5a7d..5fcf98b243 100644
--- a/src/cpu_map/x86_Westmere-IBRS.xml
+++ b/src/cpu_map/x86_Westmere-IBRS.xml
@@ -1,11 +1,19 @@
+<!-- extra info from qemu:
+ 'model.level': '11'
+ 'model.stepping': '1'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Westmere E56xx/L56xx/X56xx (Nehalem-C)'
+ 'property.model-id': 'Westmere E56xx/L56xx/X56xx (IBRS update)'
+-->
<cpus>
<model name='Westmere-IBRS'>
<alias name='Westmere-v2'/>
<decode host='on' guest='on'/>
- <signature family='6' model='44'/> <!-- 0206c0 -->
+ <signature family='6' model='44'/>
<vendor name='Intel'/>
<feature name='aes'/>
<feature name='apic'/>
+ <feature name='arat'/>
<feature name='clflush'/>
<feature name='cmov'/>
<feature name='cx16'/>
@@ -23,6 +31,7 @@
<feature name='nx'/>
<feature name='pae'/>
<feature name='pat'/>
+ <feature name='pclmuldq'/>
<feature name='pge'/>
<feature name='pni'/>
<feature name='popcnt'/>
@@ -37,5 +46,6 @@
<feature name='ssse3'/>
<feature name='syscall'/>
<feature name='tsc'/>
+ <feature name='vme'/>
</model>
</cpus>
diff --git a/src/cpu_map/x86_Westmere.xml b/src/cpu_map/x86_Westmere.xml
index 3e9dc0f73c..41f7eef94e 100644
--- a/src/cpu_map/x86_Westmere.xml
+++ b/src/cpu_map/x86_Westmere.xml
@@ -1,13 +1,18 @@
+<!-- extra info from qemu:
+ 'model.level': '11'
+ 'model.stepping': '1'
+ 'model.xlevel': '0x80000008'
+ 'model.model_id': 'Westmere E56xx/L56xx/X56xx (Nehalem-C)'
+-->
<cpus>
<model name='Westmere'>
<alias name='Westmere-v1'/>
<decode host='on' guest='on'/>
- <signature family='6' model='44'/> <!-- 0206c0 -->
- <signature family='6' model='47'/> <!-- 0206f0 -->
- <signature family='6' model='37'/> <!-- 020650 -->
+ <signature family='6' model='44'/>
<vendor name='Intel'/>
<feature name='aes'/>
<feature name='apic'/>
+ <feature name='arat'/>
<feature name='clflush'/>
<feature name='cmov'/>
<feature name='cx16'/>
@@ -25,6 +30,7 @@
<feature name='nx'/>
<feature name='pae'/>
<feature name='pat'/>
+ <feature name='pclmuldq'/>
<feature name='pge'/>
<feature name='pni'/>
<feature name='popcnt'/>
@@ -38,5 +44,6 @@
<feature name='ssse3'/>
<feature name='syscall'/>
<feature name='tsc'/>
+ <feature name='vme'/>
</model>
</cpus>
diff --git a/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-migratable.xml
b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-migratable.xml
index f5846b1619..5012ab9cdf 100644
--- a/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-migratable.xml
+++ b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-migratable.xml
@@ -1,12 +1,12 @@
<cpu mode='custom' match='exact'>
- <model fallback='allow'>Westmere</model>
+ <model fallback='allow'>Nehalem</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
<feature policy='require' name='pclmuldq'/>
<feature policy='require' name='pcid'/>
<feature policy='require' name='x2apic'/>
<feature policy='require' name='tsc-deadline'/>
+ <feature policy='require' name='aes'/>
<feature policy='require' name='xsave'/>
<feature policy='require' name='osxsave'/>
<feature policy='require' name='avx'/>
diff --git a/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-result.xml
b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-result.xml
index 166833276c..b3974f5090 100644
--- a/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-result.xml
+++ b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-result.xml
@@ -1,12 +1,12 @@
<cpu mode='custom' match='exact'>
- <model fallback='allow'>Westmere</model>
+ <model fallback='allow'>Nehalem</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
<feature policy='require' name='pclmuldq'/>
<feature policy='require' name='pcid'/>
<feature policy='require' name='x2apic'/>
<feature policy='require' name='tsc-deadline'/>
+ <feature policy='require' name='aes'/>
<feature policy='require' name='xsave'/>
<feature policy='require' name='osxsave'/>
<feature policy='require' name='avx'/>
diff --git a/tests/cputestdata/x86_64-baseline-features-expanded.xml
b/tests/cputestdata/x86_64-baseline-features-expanded.xml
index e54eca026d..421bbbb78e 100644
--- a/tests/cputestdata/x86_64-baseline-features-expanded.xml
+++ b/tests/cputestdata/x86_64-baseline-features-expanded.xml
@@ -3,6 +3,7 @@
<vendor>Intel</vendor>
<feature policy='require' name='aes'/>
<feature policy='require' name='apic'/>
+ <feature policy='require' name='arat'/>
<feature policy='require' name='avx'/>
<feature policy='require' name='clflush'/>
<feature policy='require' name='cmov'/>
diff --git a/tests/cputestdata/x86_64-baseline-features-result.xml
b/tests/cputestdata/x86_64-baseline-features-result.xml
index 1461a5b430..307fd9566c 100644
--- a/tests/cputestdata/x86_64-baseline-features-result.xml
+++ b/tests/cputestdata/x86_64-baseline-features-result.xml
@@ -1,9 +1,7 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Westmere</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
- <feature policy='require' name='pclmuldq'/>
<feature policy='require' name='pcid'/>
<feature policy='require' name='x2apic'/>
<feature policy='require' name='tsc-deadline'/>
diff --git a/tests/cputestdata/x86_64-baseline-simple-expanded.xml
b/tests/cputestdata/x86_64-baseline-simple-expanded.xml
index 82857e3d45..4b260d9972 100644
--- a/tests/cputestdata/x86_64-baseline-simple-expanded.xml
+++ b/tests/cputestdata/x86_64-baseline-simple-expanded.xml
@@ -2,6 +2,7 @@
<model fallback='forbid'>Westmere</model>
<feature policy='require' name='aes'/>
<feature policy='require' name='apic'/>
+ <feature policy='require' name='arat'/>
<feature policy='require' name='clflush'/>
<feature policy='require' name='cmov'/>
<feature policy='require' name='cx16'/>
@@ -19,6 +20,7 @@
<feature policy='require' name='nx'/>
<feature policy='require' name='pae'/>
<feature policy='require' name='pat'/>
+ <feature policy='require' name='pclmuldq'/>
<feature policy='require' name='pge'/>
<feature policy='require' name='pni'/>
<feature policy='require' name='popcnt'/>
@@ -32,4 +34,5 @@
<feature policy='require' name='ssse3'/>
<feature policy='require' name='syscall'/>
<feature policy='require' name='tsc'/>
+ <feature policy='require' name='vme'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
index 074342911a..98cf99c423 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
@@ -3,14 +3,12 @@
<model>Westmere-IBRS</model>
<vendor>Intel</vendor>
<signature family='6' model='134' stepping='5'/>
- <feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
<feature name='ht'/>
<feature name='tm'/>
<feature name='pbe'/>
- <feature name='pclmuldq'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -26,7 +24,6 @@
<feature name='xsave'/>
<feature name='osxsave'/>
<feature name='rdrand'/>
- <feature name='arat'/>
<feature name='fsgsbase'/>
<feature name='tsc_adjust'/>
<feature name='smep'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml
index 22b5cf31fd..5c978b6295 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml
@@ -1,7 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>SandyBridge</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ds'/>
<feature policy='require' name='acpi'/>
<feature policy='require' name='ss'/>
@@ -19,7 +18,5 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='pcid'/>
<feature policy='require' name='osxsave'/>
- <feature policy='require' name='arat'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml
b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml
index cf8b175db1..a32b335dbe 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml
@@ -3,7 +3,6 @@
<model>SandyBridge</model>
<vendor>Intel</vendor>
<signature family='6' model='42' stepping='7'/>
- <feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
@@ -21,7 +20,5 @@
<feature name='pdcm'/>
<feature name='pcid'/>
<feature name='osxsave'/>
- <feature name='arat'/>
- <feature name='xsaveopt'/>
<feature name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-json.xml
b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-json.xml
index c9ae651922..716813d858 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-json.xml
@@ -1,11 +1,8 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>SandyBridge</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
<feature policy='require' name='pcid'/>
<feature policy='require' name='hypervisor'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='xsaveopt'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml
index 22b5cf31fd..5c978b6295 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml
@@ -1,7 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>SandyBridge</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ds'/>
<feature policy='require' name='acpi'/>
<feature policy='require' name='ss'/>
@@ -19,7 +18,5 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='pcid'/>
<feature policy='require' name='osxsave'/>
- <feature policy='require' name='arat'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml
b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml
index cf8b175db1..a32b335dbe 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml
@@ -3,7 +3,6 @@
<model>SandyBridge</model>
<vendor>Intel</vendor>
<signature family='6' model='42' stepping='7'/>
- <feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
@@ -21,7 +20,5 @@
<feature name='pdcm'/>
<feature name='pcid'/>
<feature name='osxsave'/>
- <feature name='arat'/>
- <feature name='xsaveopt'/>
<feature name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml
b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml
index c9ae651922..716813d858 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml
@@ -1,11 +1,8 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>SandyBridge</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
<feature policy='require' name='pcid'/>
<feature policy='require' name='hypervisor'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='xsaveopt'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml
index 0ccbcd0629..7c0e12daf7 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml
@@ -1,7 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Haswell-noTSX</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ds'/>
<feature policy='require' name='acpi'/>
<feature policy='require' name='ss'/>
@@ -18,11 +17,8 @@
<feature policy='require' name='xtpr'/>
<feature policy='require' name='pdcm'/>
<feature policy='require' name='osxsave'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
<feature policy='require' name='invtsc'/>
+ <feature policy='disable' name='xsaveopt'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
index 827b16cb69..2b14dd3573 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
@@ -1,9 +1,8 @@
<cpu>
<arch>x86_64</arch>
- <model>Haswell-noTSX</model>
+ <model>Westmere</model>
<vendor>Intel</vendor>
<signature family='6' model='60' stepping='3'/>
- <feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
@@ -17,14 +16,28 @@
<feature name='smx'/>
<feature name='est'/>
<feature name='tm2'/>
+ <feature name='fma'/>
<feature name='xtpr'/>
<feature name='pdcm'/>
+ <feature name='pcid'/>
+ <feature name='x2apic'/>
+ <feature name='movbe'/>
+ <feature name='tsc-deadline'/>
+ <feature name='xsave'/>
<feature name='osxsave'/>
+ <feature name='avx'/>
<feature name='f16c'/>
<feature name='rdrand'/>
- <feature name='arat'/>
+ <feature name='fsgsbase'/>
<feature name='tsc_adjust'/>
+ <feature name='bmi1'/>
+ <feature name='avx2'/>
+ <feature name='smep'/>
+ <feature name='bmi2'/>
+ <feature name='erms'/>
+ <feature name='invpcid'/>
<feature name='pdpe1gb'/>
+ <feature name='rdtscp'/>
<feature name='abm'/>
<feature name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-json.xml
b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-json.xml
index 489de49fb0..a450168451 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-json.xml
@@ -1,14 +1,10 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Haswell-noTSX</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
<feature policy='require' name='vmx'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
<feature policy='require' name='hypervisor'/>
<feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
+ <feature policy='disable' name='arat'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-650-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i5-650-guest.xml
index 1c0d44dc0a..4ab1f51bcd 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-650-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-650-guest.xml
@@ -1,14 +1,12 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Westmere</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ds'/>
<feature policy='require' name='acpi'/>
<feature policy='require' name='ss'/>
<feature policy='require' name='ht'/>
<feature policy='require' name='tm'/>
<feature policy='require' name='pbe'/>
- <feature policy='require' name='pclmuldq'/>
<feature policy='require' name='dtes64'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ds_cpl'/>
@@ -18,7 +16,6 @@
<feature policy='require' name='tm2'/>
<feature policy='require' name='xtpr'/>
<feature policy='require' name='pdcm'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='rdtscp'/>
<feature policy='require' name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml
b/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml
index 4234c4df5a..90aab1e0eb 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml
@@ -3,14 +3,12 @@
<model>Westmere</model>
<vendor>Intel</vendor>
<signature family='6' model='37' stepping='2'/>
- <feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
<feature name='ht'/>
<feature name='tm'/>
<feature name='pbe'/>
- <feature name='pclmuldq'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -20,7 +18,6 @@
<feature name='tm2'/>
<feature name='xtpr'/>
<feature name='pdcm'/>
- <feature name='arat'/>
<feature name='rdtscp'/>
<feature name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-650-json.xml
b/tests/cputestdata/x86_64-cpuid-Core-i5-650-json.xml
index cb21e48a9f..729e4d98b3 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-650-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-650-json.xml
@@ -1,13 +1,10 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Westmere</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
- <feature policy='require' name='pclmuldq'/>
<feature policy='require' name='x2apic'/>
<feature policy='require' name='tsc-deadline'/>
<feature policy='require' name='hypervisor'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='rdtscp'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
index 5777a0bfba..823494afa0 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
@@ -18,6 +18,7 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='osxsave'/>
<feature policy='require' name='tsc_adjust'/>
+ <feature policy='require' name='mpx'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='intel-pt'/>
<feature policy='require' name='xsaves'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
index c52e8db235..3511230df8 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
@@ -20,6 +20,7 @@
<feature name='pdcm'/>
<feature name='osxsave'/>
<feature name='tsc_adjust'/>
+ <feature name='mpx'/>
<feature name='clflushopt'/>
<feature name='intel-pt'/>
<feature name='xsaves'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-json.xml
b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-json.xml
index 61a52212a6..46111d8616 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-json.xml
@@ -4,6 +4,7 @@
<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='clflushopt'/>
<feature policy='require' name='xsaves'/>
<feature policy='require' name='pdpe1gb'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml
index 22b5cf31fd..5c978b6295 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml
@@ -1,7 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>SandyBridge</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ds'/>
<feature policy='require' name='acpi'/>
<feature policy='require' name='ss'/>
@@ -19,7 +18,5 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='pcid'/>
<feature policy='require' name='osxsave'/>
- <feature policy='require' name='arat'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml
index cf8b175db1..a32b335dbe 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml
@@ -3,7 +3,6 @@
<model>SandyBridge</model>
<vendor>Intel</vendor>
<signature family='6' model='42' stepping='7'/>
- <feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
@@ -21,7 +20,5 @@
<feature name='pdcm'/>
<feature name='pcid'/>
<feature name='osxsave'/>
- <feature name='arat'/>
- <feature name='xsaveopt'/>
<feature name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml
index c9ae651922..716813d858 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml
@@ -1,11 +1,8 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>SandyBridge</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
<feature policy='require' name='pcid'/>
<feature policy='require' name='hypervisor'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='xsaveopt'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-guest.xml
index 9bb60009e8..893bbcb4f2 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-guest.xml
@@ -1,7 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>SandyBridge</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ds'/>
<feature policy='require' name='acpi'/>
<feature policy='require' name='ss'/>
@@ -19,7 +18,6 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='pcid'/>
<feature policy='require' name='osxsave'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='invtsc'/>
<feature policy='disable' name='xsaveopt'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml
index adcc4b86c5..96c7c14d9f 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml
@@ -1,9 +1,8 @@
<cpu>
<arch>x86_64</arch>
- <model>SandyBridge</model>
+ <model>Westmere</model>
<vendor>Intel</vendor>
<signature family='6' model='42' stepping='7'/>
- <feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
@@ -20,7 +19,11 @@
<feature name='xtpr'/>
<feature name='pdcm'/>
<feature name='pcid'/>
+ <feature name='x2apic'/>
+ <feature name='tsc-deadline'/>
+ <feature name='xsave'/>
<feature name='osxsave'/>
- <feature name='arat'/>
+ <feature name='avx'/>
+ <feature name='rdtscp'/>
<feature name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-json.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-json.xml
index 3a799052e7..26787052bb 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-json.xml
@@ -1,11 +1,9 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>SandyBridge</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
<feature policy='require' name='pcid'/>
<feature policy='require' name='hypervisor'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='disable' name='xsaveopt'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml
index fa1a43a8a4..3a8e572f4a 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml
@@ -18,7 +18,5 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='pcid'/>
<feature policy='require' name='osxsave'/>
- <feature policy='require' name='arat'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml
index 94352ee8bf..4de8a5afc3 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml
@@ -20,7 +20,5 @@
<feature name='pdcm'/>
<feature name='pcid'/>
<feature name='osxsave'/>
- <feature name='arat'/>
- <feature name='xsaveopt'/>
<feature name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml
index d52f49d30a..817e469ded 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml
@@ -18,6 +18,6 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='pcid'/>
<feature policy='require' name='osxsave'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='invtsc'/>
+ <feature policy='disable' name='xsaveopt'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml
index e2503cd35c..de9eb7f6c4 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml
@@ -1,6 +1,6 @@
<cpu>
<arch>x86_64</arch>
- <model>IvyBridge</model>
+ <model>Westmere</model>
<vendor>Intel</vendor>
<signature family='6' model='58' stepping='9'/>
<feature name='ds'/>
@@ -19,7 +19,16 @@
<feature name='xtpr'/>
<feature name='pdcm'/>
<feature name='pcid'/>
+ <feature name='x2apic'/>
+ <feature name='tsc-deadline'/>
+ <feature name='xsave'/>
<feature name='osxsave'/>
- <feature name='arat'/>
+ <feature name='avx'/>
+ <feature name='f16c'/>
+ <feature name='rdrand'/>
+ <feature name='fsgsbase'/>
+ <feature name='smep'/>
+ <feature name='erms'/>
+ <feature name='rdtscp'/>
<feature name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml
index 60086b8b14..a3a7d0d2b2 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml
@@ -6,5 +6,5 @@
<feature policy='require' name='pcid'/>
<feature policy='require' name='hypervisor'/>
<feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='xsaveopt'/>
+ <feature policy='disable' name='arat'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml
index fa1a43a8a4..3a8e572f4a 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml
@@ -18,7 +18,5 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='pcid'/>
<feature policy='require' name='osxsave'/>
- <feature policy='require' name='arat'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml
index 94352ee8bf..4de8a5afc3 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml
@@ -20,7 +20,5 @@
<feature name='pdcm'/>
<feature name='pcid'/>
<feature name='osxsave'/>
- <feature name='arat'/>
- <feature name='xsaveopt'/>
<feature name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-json.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-json.xml
index 1dc866dba1..0b98a6783f 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-json.xml
@@ -5,5 +5,5 @@
<feature policy='require' name='pcid'/>
<feature policy='require' name='hypervisor'/>
<feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='xsaveopt'/>
+ <feature policy='disable' name='arat'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-guest.xml
index bcce4ece11..79f40a3b03 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-guest.xml
@@ -1,7 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Haswell-noTSX</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ds'/>
<feature policy='require' name='acpi'/>
<feature policy='require' name='ss'/>
@@ -17,13 +16,8 @@
<feature policy='require' name='xtpr'/>
<feature policy='require' name='pdcm'/>
<feature policy='require' name='osxsave'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
<feature policy='require' name='invtsc'/>
<feature policy='disable' name='x2apic'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml
index a6307e834e..6b752f2a9b 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml
@@ -3,14 +3,12 @@
<model>Westmere</model>
<vendor>Intel</vendor>
<signature family='6' model='69' stepping='1'/>
- <feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
<feature name='ht'/>
<feature name='tm'/>
<feature name='pbe'/>
- <feature name='pclmuldq'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -28,7 +26,6 @@
<feature name='avx'/>
<feature name='f16c'/>
<feature name='rdrand'/>
- <feature name='arat'/>
<feature name='fsgsbase'/>
<feature name='tsc_adjust'/>
<feature name='bmi1'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-json.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-json.xml
index 3ca3b0f243..11016a317d 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-json.xml
@@ -1,15 +1,9 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Haswell-noTSX</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
<feature policy='require' name='vmx'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
<feature policy='require' name='hypervisor'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml
index 42e7c90112..beec659db7 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml
@@ -1,7 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Haswell-noTSX</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ds'/>
<feature policy='require' name='acpi'/>
<feature policy='require' name='ss'/>
@@ -18,12 +17,7 @@
<feature policy='require' name='xtpr'/>
<feature policy='require' name='pdcm'/>
<feature policy='require' name='osxsave'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
<feature policy='require' name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
index 8bbac47a2e..1e3bb3fd5f 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
@@ -3,7 +3,6 @@
<model>Haswell-noTSX</model>
<vendor>Intel</vendor>
<signature family='6' model='69' stepping='1'/>
- <feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
@@ -20,12 +19,7 @@
<feature name='xtpr'/>
<feature name='pdcm'/>
<feature name='osxsave'/>
- <feature name='f16c'/>
- <feature name='rdrand'/>
- <feature name='arat'/>
<feature name='tsc_adjust'/>
- <feature name='xsaveopt'/>
<feature name='pdpe1gb'/>
- <feature name='abm'/>
<feature name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-json.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-json.xml
index 3ca3b0f243..11016a317d 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-json.xml
@@ -1,15 +1,9 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Haswell-noTSX</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
<feature policy='require' name='vmx'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
<feature policy='require' name='hypervisor'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml
index e825e2a0fb..1eab9af508 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml
@@ -1,7 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Broadwell</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ds'/>
<feature policy='require' name='acpi'/>
<feature policy='require' name='ss'/>
@@ -18,13 +17,8 @@
<feature policy='require' name='xtpr'/>
<feature policy='require' name='pdcm'/>
<feature policy='require' name='osxsave'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='intel-pt'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
<feature policy='require' name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml
index b39148f37f..375411761f 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml
@@ -3,7 +3,6 @@
<model>Broadwell</model>
<vendor>Intel</vendor>
<signature family='6' model='61' stepping='4'/>
- <feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
@@ -20,13 +19,8 @@
<feature name='xtpr'/>
<feature name='pdcm'/>
<feature name='osxsave'/>
- <feature name='f16c'/>
- <feature name='rdrand'/>
- <feature name='arat'/>
<feature name='tsc_adjust'/>
<feature name='intel-pt'/>
- <feature name='xsaveopt'/>
<feature name='pdpe1gb'/>
- <feature name='abm'/>
<feature name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-json.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-json.xml
index 4f253fc08a..8d58da5923 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-json.xml
@@ -1,14 +1,10 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Broadwell</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
<feature policy='require' name='vmx'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
<feature policy='require' name='hypervisor'/>
<feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
+ <feature policy='disable' name='arat'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
index e825e2a0fb..1eab9af508 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
@@ -1,7 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Broadwell</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ds'/>
<feature policy='require' name='acpi'/>
<feature policy='require' name='ss'/>
@@ -18,13 +17,8 @@
<feature policy='require' name='xtpr'/>
<feature policy='require' name='pdcm'/>
<feature policy='require' name='osxsave'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='intel-pt'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
<feature policy='require' name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
index b39148f37f..375411761f 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
@@ -3,7 +3,6 @@
<model>Broadwell</model>
<vendor>Intel</vendor>
<signature family='6' model='61' stepping='4'/>
- <feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
@@ -20,13 +19,8 @@
<feature name='xtpr'/>
<feature name='pdcm'/>
<feature name='osxsave'/>
- <feature name='f16c'/>
- <feature name='rdrand'/>
- <feature name='arat'/>
<feature name='tsc_adjust'/>
<feature name='intel-pt'/>
- <feature name='xsaveopt'/>
<feature name='pdpe1gb'/>
- <feature name='abm'/>
<feature name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml
index 5d3093cec1..beaf392ed9 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml
@@ -1,7 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Broadwell-IBRS</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ds'/>
<feature policy='require' name='acpi'/>
<feature policy='require' name='ss'/>
@@ -18,14 +17,9 @@
<feature policy='require' name='xtpr'/>
<feature policy='require' name='pdcm'/>
<feature policy='require' name='osxsave'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='intel-pt'/>
<feature policy='require' name='stibp'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
<feature policy='require' name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
index 2ab8890464..0559b556c1 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
@@ -3,7 +3,6 @@
<model>Broadwell-IBRS</model>
<vendor>Intel</vendor>
<signature family='6' model='61' stepping='4'/>
- <feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
@@ -20,14 +19,9 @@
<feature name='xtpr'/>
<feature name='pdcm'/>
<feature name='osxsave'/>
- <feature name='f16c'/>
- <feature name='rdrand'/>
- <feature name='arat'/>
<feature name='tsc_adjust'/>
<feature name='intel-pt'/>
<feature name='stibp'/>
- <feature name='xsaveopt'/>
<feature name='pdpe1gb'/>
- <feature name='abm'/>
<feature name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-json.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-json.xml
index a736cdfb04..a8f6892741 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-json.xml
@@ -1,15 +1,9 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Broadwell</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
<feature policy='require' name='vmx'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
<feature policy='require' name='hypervisor'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml
index a736cdfb04..a8f6892741 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml
@@ -1,15 +1,9 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Broadwell</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
<feature policy='require' name='vmx'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
<feature policy='require' name='hypervisor'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml
index b6e643cd08..711ccfc3ca 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml
@@ -19,6 +19,7 @@
<feature policy='require' name='osxsave'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='sgx'/>
+ <feature policy='require' name='mpx'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='intel-pt'/>
<feature policy='require' name='stibp'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
index 2a7493f941..735c9417ba 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
@@ -21,6 +21,7 @@
<feature name='osxsave'/>
<feature name='tsc_adjust'/>
<feature name='sgx'/>
+ <feature name='mpx'/>
<feature name='clflushopt'/>
<feature name='intel-pt'/>
<feature name='stibp'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml
index 690081493b..068ea0fbb7 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml
@@ -5,6 +5,7 @@
<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='clflushopt'/>
<feature policy='require' name='umip'/>
<feature policy='require' name='ssbd'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml
index 60bace9ed6..4f5c4103b4 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml
@@ -19,6 +19,7 @@
<feature policy='require' name='osxsave'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='sgx'/>
+ <feature policy='require' name='mpx'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='intel-pt'/>
<feature policy='require' name='xsaves'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
index 6b9323842a..ae8f3e277a 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
@@ -21,6 +21,7 @@
<feature name='osxsave'/>
<feature name='tsc_adjust'/>
<feature name='sgx'/>
+ <feature name='mpx'/>
<feature name='clflushopt'/>
<feature name='intel-pt'/>
<feature name='xsaves'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-json.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-json.xml
index 12424bc67c..cbdde0ff15 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-json.xml
@@ -4,6 +4,7 @@
<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='clflushopt'/>
<feature policy='require' name='pdpe1gb'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
index 5ed8ac37a3..90d6e53d3a 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
@@ -1,5 +1,5 @@
<cpu mode='custom' match='exact'>
- <model fallback='forbid'>Skylake-Client-IBRS</model>
+ <model fallback='forbid'>Skylake-Client-noTSX-IBRS</model>
<vendor>Intel</vendor>
<feature policy='require' name='ds'/>
<feature policy='require' name='acpi'/>
@@ -18,6 +18,7 @@
<feature policy='require' name='osxsave'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='sgx'/>
+ <feature policy='require' name='mpx'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='intel-pt'/>
<feature policy='require' name='md-clear'/>
@@ -29,6 +30,4 @@
<feature policy='require' name='invtsc'/>
<feature policy='require' name='skip-l1dfl-vmentry'/>
<feature policy='require' name='pschange-mc-no'/>
- <feature policy='disable' name='hle'/>
- <feature policy='disable' name='rtm'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
index 805a31411d..5bcc9af876 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
@@ -1,6 +1,6 @@
<cpu>
<arch>x86_64</arch>
- <model>Skylake-Client-noTSX-IBRS</model>
+ <model>Skylake-Client-v4</model>
<vendor>Intel</vendor>
<signature family='6' model='142' stepping='10'/>
<feature name='ds'/>
@@ -20,13 +20,13 @@
<feature name='osxsave'/>
<feature name='tsc_adjust'/>
<feature name='sgx'/>
+ <feature name='mpx'/>
<feature name='clflushopt'/>
<feature name='intel-pt'/>
<feature name='md-clear'/>
<feature name='stibp'/>
<feature name='flush-l1d'/>
<feature name='ssbd'/>
- <feature name='xsaves'/>
<feature name='pdpe1gb'/>
<feature name='invtsc'/>
<feature name='skip-l1dfl-vmentry'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
index 4774d39c7e..a054ea0d27 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
@@ -1,10 +1,11 @@
<cpu mode='custom' match='exact'>
- <model fallback='forbid'>Skylake-Client-IBRS</model>
+ <model fallback='forbid'>Skylake-Client-noTSX-IBRS</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='clflushopt'/>
<feature policy='require' name='umip'/>
<feature policy='require' name='md-clear'/>
@@ -15,6 +16,4 @@
<feature policy='require' name='pdpe1gb'/>
<feature policy='require' name='skip-l1dfl-vmentry'/>
<feature policy='require' name='pschange-mc-no'/>
- <feature policy='disable' name='hle'/>
- <feature policy='disable' name='rtm'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
index 6cedb93633..2d96f676ee 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
@@ -19,6 +19,7 @@
<feature policy='require' name='osxsave'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='sgx'/>
+ <feature policy='require' name='mpx'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='intel-pt'/>
<feature policy='require' name='sgxlc'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
index 0cc65b4322..cc9a9efa76 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
@@ -21,6 +21,7 @@
<feature name='osxsave'/>
<feature name='tsc_adjust'/>
<feature name='sgx'/>
+ <feature name='mpx'/>
<feature name='clflushopt'/>
<feature name='intel-pt'/>
<feature name='sgxlc'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-json.xml
b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-json.xml
index fd7539f7ce..a6f64f2020 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-json.xml
@@ -4,6 +4,7 @@
<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='clflushopt'/>
<feature policy='require' name='umip'/>
<feature policy='require' name='ssbd'/>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml
b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml
index 69dd1d9a87..e7c48d93cb 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml
@@ -8,5 +8,4 @@
<feature policy='require' name='cmp_legacy'/>
<feature policy='disable' name='rdtscp'/>
<feature policy='disable' name='svm'/>
- <feature policy='disable' name='monitor'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-json.xml
b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-json.xml
index 214916cdf8..9c1864c330 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-json.xml
@@ -7,5 +7,4 @@
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='disable' name='svm'/>
- <feature policy='disable' name='monitor'/>
</cpu>
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 2ff92e2c15..0ea4877e9d 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-v2</model>
+ <model fallback='forbid'>Dhyana</model>
<vendor>Hygon</vendor>
<feature policy='require' name='x2apic'/>
<feature policy='require' name='tsc-deadline'/>
@@ -7,6 +7,5 @@
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='virt-ssbd'/>
- <feature policy='disable' name='xsaves'/>
<feature policy='disable' name='svm'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
index 38d95680d3..7c125bbd9a 100644
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
@@ -21,6 +21,7 @@
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='sgx'/>
<feature policy='require' name='cmt'/>
+ <feature policy='require' name='mpx'/>
<feature policy='require' name='avx512ifma'/>
<feature policy='require' name='intel-pt'/>
<feature policy='require' name='sha-ni'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
index ccb74f41ef..54628b7a01 100644
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
@@ -23,6 +23,7 @@
<feature name='tsc_adjust'/>
<feature name='sgx'/>
<feature name='cmt'/>
+ <feature name='mpx'/>
<feature name='avx512ifma'/>
<feature name='intel-pt'/>
<feature name='sha-ni'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-json.xml
b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-json.xml
index ada11d2608..2c7fd79873 100644
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-json.xml
@@ -4,6 +4,7 @@
<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='avx512ifma'/>
<feature policy='require' name='sha-ni'/>
<feature policy='require' name='stibp'/>
@@ -12,5 +13,4 @@
<feature policy='require' name='rdctl-no'/>
<feature policy='require' name='ibrs-all'/>
<feature policy='require' name='skip-l1dfl-vmentry'/>
- <feature policy='disable' name='intel-pt'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
index 20e2fa363a..db5e0ae6af 100644
--- a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
@@ -1,7 +1,6 @@
<cpu mode='custom' match='exact'>
- <model fallback='forbid'>Westmere</model>
+ <model fallback='forbid'>core2duo</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ds'/>
<feature policy='require' name='acpi'/>
<feature policy='require' name='ss'/>
@@ -9,17 +8,16 @@
<feature policy='require' name='tm'/>
<feature policy='require' name='pbe'/>
<feature policy='require' name='dtes64'/>
- <feature policy='require' name='monitor'/>
<feature policy='require' name='ds_cpl'/>
<feature policy='require' name='est'/>
<feature policy='require' name='tm2'/>
+ <feature policy='require' name='cx16'/>
<feature policy='require' name='xtpr'/>
<feature policy='require' name='pdcm'/>
<feature policy='require' name='pcid'/>
+ <feature policy='require' name='popcnt'/>
<feature policy='require' name='arat'/>
<feature policy='require' name='rdtscp'/>
+ <feature policy='require' name='lahf_lm'/>
<feature policy='require' name='invtsc'/>
- <feature policy='disable' name='sse4.1'/>
- <feature policy='disable' name='sse4.2'/>
- <feature policy='disable' name='aes'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml
b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml
index 0ee1b03f8b..9e1990e053 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml
@@ -7,5 +7,4 @@
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='disable' name='sha-ni'/>
- <feature policy='disable' name='monitor'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
index ea1c79c0df..0af37fb828 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
@@ -19,6 +19,7 @@
<feature policy='require' name='osxsave'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='sgx'/>
+ <feature policy='require' name='mpx'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='intel-pt'/>
<feature policy='require' name='md-clear'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
index d7a7f30b9e..696f23145d 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
@@ -21,6 +21,7 @@
<feature name='osxsave'/>
<feature name='tsc_adjust'/>
<feature name='sgx'/>
+ <feature name='mpx'/>
<feature name='clflushopt'/>
<feature name='intel-pt'/>
<feature name='md-clear'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
index a5591278df..624fb4692a 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
@@ -4,6 +4,7 @@
<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='clflushopt'/>
<feature policy='require' name='md-clear'/>
<feature policy='require' name='stibp'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml
index 60bace9ed6..4f5c4103b4 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml
@@ -19,6 +19,7 @@
<feature policy='require' name='osxsave'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='sgx'/>
+ <feature policy='require' name='mpx'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='intel-pt'/>
<feature policy='require' name='xsaves'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml
index d2f808f9a6..e535a014c3 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml
@@ -21,6 +21,7 @@
<feature name='osxsave'/>
<feature name='tsc_adjust'/>
<feature name='sgx'/>
+ <feature name='mpx'/>
<feature name='clflushopt'/>
<feature name='intel-pt'/>
<feature name='xsaves'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-json.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-json.xml
index ad98679027..3558b9e6af 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-json.xml
@@ -5,6 +5,7 @@
<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='clflushopt'/>
<feature policy='require' name='xsaves'/>
<feature policy='require' name='pdpe1gb'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml
index d8aaaad29d..82756d8ebb 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml
@@ -1,7 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Haswell-noTSX-IBRS</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ds'/>
<feature policy='require' name='acpi'/>
<feature policy='require' name='ss'/>
@@ -19,14 +18,9 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='dca'/>
<feature policy='require' name='osxsave'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmt'/>
<feature policy='require' name='stibp'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
<feature policy='require' name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml
index bc39536de9..c275e7eb4b 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml
@@ -3,7 +3,6 @@
<model>Haswell-noTSX-IBRS</model>
<vendor>Intel</vendor>
<signature family='6' model='63' stepping='2'/>
- <feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
@@ -21,14 +20,9 @@
<feature name='pdcm'/>
<feature name='dca'/>
<feature name='osxsave'/>
- <feature name='f16c'/>
- <feature name='rdrand'/>
- <feature name='arat'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
<feature name='stibp'/>
- <feature name='xsaveopt'/>
<feature name='pdpe1gb'/>
- <feature name='abm'/>
<feature name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-json.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-json.xml
index 20e24c387d..f0a7e15754 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-json.xml
@@ -1,14 +1,8 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Haswell-noTSX-IBRS</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
<feature policy='require' name='hypervisor'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
index a5c6d9b471..e34fad1620 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
@@ -1,7 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Broadwell-IBRS</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ds'/>
<feature policy='require' name='acpi'/>
<feature policy='require' name='ss'/>
@@ -19,17 +18,12 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='dca'/>
<feature policy='require' name='osxsave'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmt'/>
<feature policy='require' name='intel-pt'/>
<feature policy='require' name='stibp'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='mbm_total'/>
<feature policy='require' name='mbm_local'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
<feature policy='require' name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
index 70419d7944..a20cd7eff5 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
@@ -3,7 +3,6 @@
<model>Broadwell-IBRS</model>
<vendor>Intel</vendor>
<signature family='6' model='79' stepping='1'/>
- <feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
@@ -21,17 +20,12 @@
<feature name='pdcm'/>
<feature name='dca'/>
<feature name='osxsave'/>
- <feature name='f16c'/>
- <feature name='rdrand'/>
- <feature name='arat'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
<feature name='intel-pt'/>
<feature name='stibp'/>
- <feature name='xsaveopt'/>
<feature name='mbm_total'/>
<feature name='mbm_local'/>
<feature name='pdpe1gb'/>
- <feature name='abm'/>
<feature name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-json.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-json.xml
index de082dbd93..193994481f 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-json.xml
@@ -1,14 +1,8 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Broadwell-IBRS</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
<feature policy='require' name='hypervisor'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-guest.xml
index 980af07890..98b9d43916 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-guest.xml
@@ -1,7 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Haswell-noTSX</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ds'/>
<feature policy='require' name='acpi'/>
<feature policy='require' name='ss'/>
@@ -19,13 +18,8 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='dca'/>
<feature policy='require' name='osxsave'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmt'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
<feature policy='require' name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml
index 6d959eedc3..446228723e 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml
@@ -3,7 +3,6 @@
<model>Haswell-noTSX</model>
<vendor>Intel</vendor>
<signature family='6' model='63' stepping='2'/>
- <feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
@@ -21,13 +20,8 @@
<feature name='pdcm'/>
<feature name='dca'/>
<feature name='osxsave'/>
- <feature name='f16c'/>
- <feature name='rdrand'/>
- <feature name='arat'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
- <feature name='xsaveopt'/>
<feature name='pdpe1gb'/>
- <feature name='abm'/>
<feature name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-json.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-json.xml
index 78b8be1118..b3f1d2835e 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-json.xml
@@ -1,13 +1,9 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Haswell-noTSX</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
<feature policy='require' name='hypervisor'/>
<feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
+ <feature policy='disable' name='arat'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
index e2999db8e9..21254b6bca 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
@@ -1,7 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Broadwell</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ds'/>
<feature policy='require' name='acpi'/>
<feature policy='require' name='ss'/>
@@ -19,16 +18,11 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='dca'/>
<feature policy='require' name='osxsave'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmt'/>
<feature policy='require' name='intel-pt'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='mbm_total'/>
<feature policy='require' name='mbm_local'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
<feature policy='require' name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
index e2ace9021b..b4bc6c20a5 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
@@ -3,7 +3,6 @@
<model>Broadwell</model>
<vendor>Intel</vendor>
<signature family='6' model='79' stepping='1'/>
- <feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
@@ -21,16 +20,11 @@
<feature name='pdcm'/>
<feature name='dca'/>
<feature name='osxsave'/>
- <feature name='f16c'/>
- <feature name='rdrand'/>
- <feature name='arat'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
<feature name='intel-pt'/>
- <feature name='xsaveopt'/>
<feature name='mbm_total'/>
<feature name='mbm_local'/>
<feature name='pdpe1gb'/>
- <feature name='abm'/>
<feature name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml
index 5b8891093a..c8de8dc4d9 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml
@@ -1,14 +1,8 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Broadwell</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
<feature policy='require' name='hypervisor'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml
index db1efe0549..4d83a04db7 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml
@@ -1,7 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>SandyBridge-IBRS</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ds'/>
<feature policy='require' name='acpi'/>
<feature policy='require' name='ss'/>
@@ -20,11 +19,9 @@
<feature policy='require' name='pcid'/>
<feature policy='require' name='dca'/>
<feature policy='require' name='osxsave'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='stibp'/>
<feature policy='require' name='flush-l1d'/>
<feature policy='require' name='ssbd'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='pdpe1gb'/>
<feature policy='require' name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
index 6f2de0ca5b..c6005df48e 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
@@ -3,7 +3,6 @@
<model>SandyBridge-IBRS</model>
<vendor>Intel</vendor>
<signature family='6' model='45' stepping='7'/>
- <feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
@@ -22,11 +21,9 @@
<feature name='pcid'/>
<feature name='dca'/>
<feature name='osxsave'/>
- <feature name='arat'/>
<feature name='stibp'/>
<feature name='flush-l1d'/>
<feature name='ssbd'/>
- <feature name='xsaveopt'/>
<feature name='pdpe1gb'/>
<feature name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml
index bf587d3ffc..68c2d05ce0 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml
@@ -1,14 +1,11 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>SandyBridge-IBRS</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
<feature policy='require' name='pcid'/>
<feature policy='require' name='hypervisor'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='stibp'/>
<feature policy='require' name='ssbd'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='pdpe1gb'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-guest.xml
index 980af07890..98b9d43916 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-guest.xml
@@ -1,7 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Haswell-noTSX</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ds'/>
<feature policy='require' name='acpi'/>
<feature policy='require' name='ss'/>
@@ -19,13 +18,8 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='dca'/>
<feature policy='require' name='osxsave'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmt'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
<feature policy='require' name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml
index 6d959eedc3..446228723e 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml
@@ -3,7 +3,6 @@
<model>Haswell-noTSX</model>
<vendor>Intel</vendor>
<signature family='6' model='63' stepping='2'/>
- <feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
@@ -21,13 +20,8 @@
<feature name='pdcm'/>
<feature name='dca'/>
<feature name='osxsave'/>
- <feature name='f16c'/>
- <feature name='rdrand'/>
- <feature name='arat'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
- <feature name='xsaveopt'/>
<feature name='pdpe1gb'/>
- <feature name='abm'/>
<feature name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-json.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-json.xml
index 2227ed0031..86f1091dec 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-json.xml
@@ -1,12 +1,10 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Haswell-noTSX</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
<feature policy='require' name='vmx'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
<feature policy='require' name='hypervisor'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
+ <feature policy='disable' name='arat'/>
+ <feature policy='disable' name='xsaveopt'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
index e2999db8e9..21254b6bca 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
@@ -1,7 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Broadwell</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ds'/>
<feature policy='require' name='acpi'/>
<feature policy='require' name='ss'/>
@@ -19,16 +18,11 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='dca'/>
<feature policy='require' name='osxsave'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmt'/>
<feature policy='require' name='intel-pt'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='mbm_total'/>
<feature policy='require' name='mbm_local'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
<feature policy='require' name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml
index e2ace9021b..b4bc6c20a5 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml
@@ -3,7 +3,6 @@
<model>Broadwell</model>
<vendor>Intel</vendor>
<signature family='6' model='79' stepping='1'/>
- <feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
@@ -21,16 +20,11 @@
<feature name='pdcm'/>
<feature name='dca'/>
<feature name='osxsave'/>
- <feature name='f16c'/>
- <feature name='rdrand'/>
- <feature name='arat'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
<feature name='intel-pt'/>
- <feature name='xsaveopt'/>
<feature name='mbm_total'/>
<feature name='mbm_local'/>
<feature name='pdpe1gb'/>
- <feature name='abm'/>
<feature name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-json.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-json.xml
index 5b8891093a..c8de8dc4d9 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-json.xml
@@ -1,14 +1,8 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Broadwell</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
<feature policy='require' name='hypervisor'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml
index 659779687a..f6567f34d1 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml
@@ -1,14 +1,12 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Westmere</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ds'/>
<feature policy='require' name='acpi'/>
<feature policy='require' name='ss'/>
<feature policy='require' name='ht'/>
<feature policy='require' name='tm'/>
<feature policy='require' name='pbe'/>
- <feature policy='require' name='pclmuldq'/>
<feature policy='require' name='dtes64'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ds_cpl'/>
@@ -21,7 +19,6 @@
<feature policy='require' name='pcid'/>
<feature policy='require' name='dca'/>
<feature policy='require' name='x2apic'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='pdpe1gb'/>
<feature policy='require' name='rdtscp'/>
<feature policy='require' name='invtsc'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml
index 58468cd096..a93d99f082 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml
@@ -3,14 +3,12 @@
<model>Westmere</model>
<vendor>Intel</vendor>
<signature family='6' model='47' stepping='2'/>
- <feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
<feature name='ht'/>
<feature name='tm'/>
<feature name='pbe'/>
- <feature name='pclmuldq'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -23,7 +21,6 @@
<feature name='pcid'/>
<feature name='dca'/>
<feature name='x2apic'/>
- <feature name='arat'/>
<feature name='pdpe1gb'/>
<feature name='rdtscp'/>
<feature name='invtsc'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml
index e8b74c5c30..9979c302fd 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml
@@ -1,12 +1,12 @@
<cpu mode='custom' match='exact'>
- <model fallback='forbid'>Westmere</model>
+ <model fallback='forbid'>Nehalem</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
<feature policy='require' name='pclmuldq'/>
<feature policy='require' name='pcid'/>
<feature policy='require' name='x2apic'/>
<feature policy='require' name='tsc-deadline'/>
+ <feature policy='require' name='aes'/>
<feature policy='require' name='hypervisor'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='pdpe1gb'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-guest.xml
index 659779687a..f6567f34d1 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-guest.xml
@@ -1,14 +1,12 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Westmere</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ds'/>
<feature policy='require' name='acpi'/>
<feature policy='require' name='ss'/>
<feature policy='require' name='ht'/>
<feature policy='require' name='tm'/>
<feature policy='require' name='pbe'/>
- <feature policy='require' name='pclmuldq'/>
<feature policy='require' name='dtes64'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ds_cpl'/>
@@ -21,7 +19,6 @@
<feature policy='require' name='pcid'/>
<feature policy='require' name='dca'/>
<feature policy='require' name='x2apic'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='pdpe1gb'/>
<feature policy='require' name='rdtscp'/>
<feature policy='require' name='invtsc'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml
index 58468cd096..a93d99f082 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml
@@ -3,14 +3,12 @@
<model>Westmere</model>
<vendor>Intel</vendor>
<signature family='6' model='47' stepping='2'/>
- <feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
<feature name='ht'/>
<feature name='tm'/>
<feature name='pbe'/>
- <feature name='pclmuldq'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -23,7 +21,6 @@
<feature name='pcid'/>
<feature name='dca'/>
<feature name='x2apic'/>
- <feature name='arat'/>
<feature name='pdpe1gb'/>
<feature name='rdtscp'/>
<feature name='invtsc'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-json.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-json.xml
index da949ad25e..908945af29 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-json.xml
@@ -1,14 +1,11 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Westmere</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
- <feature policy='require' name='pclmuldq'/>
<feature policy='require' name='pcid'/>
<feature policy='require' name='x2apic'/>
<feature policy='require' name='tsc-deadline'/>
<feature policy='require' name='hypervisor'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='pdpe1gb'/>
<feature policy='require' name='rdtscp'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-guest.xml
index 16d333aa26..3d49cea064 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-guest.xml
@@ -1,7 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Haswell</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ds'/>
<feature policy='require' name='acpi'/>
<feature policy='require' name='ss'/>
@@ -19,13 +18,8 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='dca'/>
<feature policy='require' name='osxsave'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmt'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
<feature policy='require' name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml
index 6a18204c02..4297116353 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml
@@ -3,7 +3,6 @@
<model>Haswell</model>
<vendor>Intel</vendor>
<signature family='6' model='63' stepping='4'/>
- <feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
@@ -21,13 +20,8 @@
<feature name='pdcm'/>
<feature name='dca'/>
<feature name='osxsave'/>
- <feature name='f16c'/>
- <feature name='rdrand'/>
- <feature name='arat'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
- <feature name='xsaveopt'/>
<feature name='pdpe1gb'/>
- <feature name='abm'/>
<feature name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-json.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-json.xml
index e542456c8b..4fa824ebfc 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-json.xml
@@ -1,14 +1,8 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Haswell</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
<feature policy='require' name='hypervisor'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-guest.xml
index fbc05fe0d8..64fae823ec 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-guest.xml
@@ -1,7 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Nehalem-IBRS</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ds'/>
<feature policy='require' name='acpi'/>
<feature policy='require' name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml
index 15fea29e06..ed5e7e00f5 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml
@@ -3,7 +3,6 @@
<model>Nehalem-IBRS</model>
<vendor>Intel</vendor>
<signature family='6' model='46' stepping='6'/>
- <feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-json.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-json.xml
index 32cd1000c8..3726a1e312 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-json.xml
@@ -1,7 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Nehalem-IBRS</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
<feature policy='require' name='x2apic'/>
<feature policy='require' name='tsc-deadline'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
index 8f014f6e28..fe6db40258 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
@@ -20,9 +20,9 @@
<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='clflushopt'/>
<feature policy='require' name='intel-pt'/>
- <feature policy='require' name='pku'/>
<feature policy='require' name='stibp'/>
<feature policy='require' name='xsaves'/>
<feature policy='require' name='mbm_total'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
index e004747ada..d3020f0f4f 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
@@ -22,9 +22,9 @@
<feature name='osxsave'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
+ <feature name='mpx'/>
<feature name='clflushopt'/>
<feature name='intel-pt'/>
- <feature name='pku'/>
<feature name='stibp'/>
<feature name='xsaves'/>
<feature name='mbm_total'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-json.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-json.xml
index 7c7e95ce0d..d20dc7575f 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-json.xml
@@ -4,5 +4,7 @@
<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='clflushopt'/>
+ <feature policy='disable' name='pku'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
index f4f0199607..f3164525c4 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
@@ -20,9 +20,9 @@
<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='clflushopt'/>
<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'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
index 325c2fe26f..60e45e2e67 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
@@ -22,9 +22,9 @@
<feature name='osxsave'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
+ <feature name='mpx'/>
<feature name='clflushopt'/>
<feature name='intel-pt'/>
- <feature name='pku'/>
<feature name='ospke'/>
<feature name='md-clear'/>
<feature name='stibp'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
index b482043ccf..65b93c2829 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
@@ -5,9 +5,9 @@
<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='clflushopt'/>
<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'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
index f31ca1ffc5..0d198c991b 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
@@ -20,9 +20,8 @@
<feature policy='require' name='osxsave'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmt'/>
- <feature policy='require' name='clflushopt'/>
+ <feature policy='require' name='mpx'/>
<feature policy='require' name='intel-pt'/>
- <feature policy='require' name='pku'/>
<feature policy='require' name='xsaves'/>
<feature policy='require' name='mbm_total'/>
<feature policy='require' name='mbm_local'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
index da7e96e533..4ee12fcfdc 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
@@ -22,9 +22,8 @@
<feature name='osxsave'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
- <feature name='clflushopt'/>
+ <feature name='mpx'/>
<feature name='intel-pt'/>
- <feature name='pku'/>
<feature name='xsaves'/>
<feature name='mbm_total'/>
<feature name='mbm_local'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml
index 1dfad4a0cb..42f2497776 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml
@@ -4,5 +4,6 @@
<feature policy='require' name='ss'/>
<feature policy='require' name='hypervisor'/>
<feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='clflushopt'/>
+ <feature policy='require' name='mpx'/>
+ <feature policy='disable' name='pku'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml
index 78863c61d1..77d1f873a1 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml
@@ -4,8 +4,8 @@
<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='xsaves'/>
<feature policy='require' name='rdctl-no'/>
<feature policy='require' name='ibrs-all'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml
index 9c975c6792..29e119100f 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml
@@ -1,7 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Nehalem</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ds'/>
<feature policy='require' name='acpi'/>
<feature policy='require' name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml
index 35dd63f360..07d69d1c71 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml
@@ -3,7 +3,6 @@
<model>Nehalem</model>
<vendor>Intel</vendor>
<signature family='6' model='26' stepping='5'/>
- <feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml
index 038c98e1d1..fdd1b5cfae 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml
@@ -1,7 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Nehalem</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
<feature policy='require' name='x2apic'/>
<feature policy='require' name='hypervisor'/>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Broadwell-IBRS+Cascadelake.xml
b/tests/cputestdata/x86_64-cpuid-baseline-Broadwell-IBRS+Cascadelake.xml
index 99bce8db87..b88e71ce39 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Broadwell-IBRS+Cascadelake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Broadwell-IBRS+Cascadelake.xml
@@ -1,14 +1,8 @@
<cpu mode='custom' match='exact'>
<model fallback='allow'>Broadwell-IBRS</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
<feature policy='require' name='hypervisor'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake-IBRS.xml
b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake-IBRS.xml
index 5e42876b39..698613a8a0 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake-IBRS.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake-IBRS.xml
@@ -4,9 +4,9 @@
<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='clflushopt'/>
<feature policy='require' name='umip'/>
- <feature policy='require' name='pku'/>
<feature policy='require' name='ssbd'/>
<feature policy='require' name='xsaves'/>
<feature policy='require' name='skip-l1dfl-vmentry'/>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake.xml
b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake.xml
index 906259df0b..3383eb30d2 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake.xml
@@ -4,5 +4,6 @@
<feature policy='require' name='ss'/>
<feature policy='require' name='hypervisor'/>
<feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='clflushopt'/>
+ <feature policy='require' name='mpx'/>
+ <feature policy='disable' name='pku'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-EPYC+Rome.xml
b/tests/cputestdata/x86_64-cpuid-baseline-EPYC+Rome.xml
index 66f89b118a..207c904158 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-EPYC+Rome.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-EPYC+Rome.xml
@@ -7,5 +7,4 @@
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='disable' name='svm'/>
- <feature policy='disable' name='monitor'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Haswell+Skylake.xml
b/tests/cputestdata/x86_64-cpuid-baseline-Haswell+Skylake.xml
index e687a679b3..6f89d05744 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Haswell+Skylake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Haswell+Skylake.xml
@@ -1,14 +1,8 @@
<cpu mode='custom' match='exact'>
<model fallback='allow'>Haswell</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
<feature policy='require' name='hypervisor'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Broadwell.xml
b/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Broadwell.xml
index 651457b17a..da0c7b7969 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Broadwell.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Broadwell.xml
@@ -1,14 +1,8 @@
<cpu mode='custom' match='exact'>
<model fallback='allow'>Haswell-noTSX</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
<feature policy='require' name='hypervisor'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Skylake-IBRS.xml
b/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Skylake-IBRS.xml
index 8bda1c02e2..f794e9027b 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Skylake-IBRS.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Skylake-IBRS.xml
@@ -1,14 +1,8 @@
<cpu mode='custom' match='exact'>
<model fallback='allow'>Haswell-noTSX-IBRS</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
<feature policy='require' name='hypervisor'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Skylake.xml
b/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Skylake.xml
index 651457b17a..da0c7b7969 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Skylake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Skylake.xml
@@ -1,14 +1,8 @@
<cpu mode='custom' match='exact'>
<model fallback='allow'>Haswell-noTSX</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='ss'/>
- <feature policy='require' name='f16c'/>
- <feature policy='require' name='rdrand'/>
<feature policy='require' name='hypervisor'/>
- <feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='xsaveopt'/>
<feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='abm'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Ryzen+Rome.xml
b/tests/cputestdata/x86_64-cpuid-baseline-Ryzen+Rome.xml
index 308869a308..b4d56921b4 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Ryzen+Rome.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Ryzen+Rome.xml
@@ -7,5 +7,4 @@
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='disable' name='sha-ni'/>
- <feature policy='disable' name='monitor'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Skylake-Client+Server.xml
b/tests/cputestdata/x86_64-cpuid-baseline-Skylake-Client+Server.xml
index d46ff26eeb..7091fec30d 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Skylake-Client+Server.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Skylake-Client+Server.xml
@@ -4,6 +4,7 @@
<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='clflushopt'/>
<feature policy='require' name='pdpe1gb'/>
</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 010bf581af..990b412e44 100644
--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
@@ -48,6 +48,7 @@
<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='clflushopt'/>
<feature policy='require' name='umip'/>
<feature policy='require' name='md-clear'/>
diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
index e3b70598cd..df54a4d279 100644
--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
@@ -47,6 +47,7 @@
<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='clflushopt'/>
<feature policy='require' name='umip'/>
<feature policy='require' name='md-clear'/>
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 578a9c80c6..826476c807 100644
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
@@ -48,6 +48,7 @@
<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='clflushopt'/>
<feature policy='require' name='umip'/>
<feature policy='require' name='md-clear'/>
diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
index 9c7e6e1df3..0c88b239da 100644
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
@@ -47,6 +47,7 @@
<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='clflushopt'/>
<feature policy='require' name='umip'/>
<feature policy='require' name='md-clear'/>
diff --git a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args
b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args
index c841bb80c8..2c8b083773 100644
--- a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-test/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel kvm \
--cpu Icelake-Server,intel-pt=off \
+-cpu Icelake-Server \
-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.x86_64-4.2.0.args
b/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args
index 945163795d..977bc6ee21 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
-machine pc-q35-4.2,usb=off,dump-guest-core=off \
-accel kvm \
--cpu
Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on
\
+-cpu
Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,mpx=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on
\
-m size=219136k \
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args
b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args
index 95c88f1ace..c9ea13bb81 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
-machine pc-q35-5.0,usb=off,dump-guest-core=off \
-accel kvm \
--cpu
Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on
\
+-cpu
Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,mpx=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on
\
-m size=219136k \
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
--
2.41.0
7:15 a.m.
New subject: [libvirt PATCH 19/19] NOMERGE: RFC: regenerate all cpu
definitions
On Mon, Nov 06, 2023 at 16:21:24 -0600, Jonathon Jongsma wrote:
This is just for discussion. I used the
src/cpu_map/sync_qemu_models_i386.py script and regenerated the CPU
model definitions from the current qemu master source code. I then
regenerated all test output to see what the result would be. I am not
suggesting that this is a viable approach, but... Are there some updates
that should happen here?
Not really. In general we can't change the definition of existing models
to avoid breaking migrations. Both sides of migration need to share the
same CPU model definition.
Jirka
10:56 a.m.
Hi.
Originally I was thinking about versioned CPU models support as a good
opportunity for redoing the way they are defined in libvirt and the way
we check their compatibility with the current host setup. In other
words, I wanted each new CPU model definition to be probed from QEMU and
drop check="partial" for these new models and rely on CPU runnability
reported by QEMU. But this would require additional support from QEMU,
for which there were some patches sent to the list, but nothing was
really merged in the end.
So I guess we need to accept the situation and add versioned CPU models
the old way without waiting for changes in QEMU that nobody is working
on anyway.
But I wonder if we should still try to change the way we check guest CPU
ABI a bit (for the newly added models) and rely more on QEMU not
changing their CPU models. I believe they will never change an existing
versioned model and introduce a new one instead, is that correct?
On Mon, Nov 06, 2023 at 16:21:05 -0600, Jonathon Jongsma wrote:
Assuming that we want to offer all versioned CPUs like this, there
are two
approaches to naming. I chose to maintain the existing names (e.g. EPYC-IBPB)
as the primary name where available, and use the versioned name (EPYC-v2) as
the alias. However, some CPU models don't have an alias, so their versioned
name would be their primary name. So we have the following set of 'EPYC' CPU
models:
- EPYC (alias = EPYC-v1)
- EPYC-IBPB (alias = EPYC-v2)
- EPYC-v3 (no alias)
- EPYC-v4 (no alias)
An alternative approach is something more like:
- EPYC-v1 (alias = EPYC)
- EPYC-v2 (alias = EPYC-IBPB)
- EPYC-v3 (no alias)
- EPYC-v4 (no alias)
Hmm, I don't think creating aliases is a good idea, at least on the
public API level. We could perhaps use them internally if needed (and if
QEMU doesn't provide that info) when implementing a transformation of
non-versioned CPUs to versioned ones. But providing the same CPU model
under several different names doesn't seem like a good idea.
The naming of the second set is more consistent, but it could result
in slight
changes to behavior. For example, any call to cpuDecode() that returned
EPYC-IBPB in the past might now return EPYC-v2. These two CPUs are just two
different names for the same model, so I'm not sure it would result in any
issues. But in this patch series I went with the first approach since it
maintained stability and resulted in less churn in the test output.
Well the tests are mostly there to avoid such churn because it's indeed
an issue if the same CPU suddenly starts to be recognized as a different
model. Sometimes the change is correct, but most of the time it's not.
So using your example, having EPYC-v2 in domain XML instead of EPYC-IBPB
means you cannot migrate to an libvirt version that doesn't know about
EPYC-v2 despite it being exactly the same as the supported EPYC-IBPB CPU
model. Which is why introducing aliases in public APIs is not a good
idea.
That said, if we want to implement the translation from non-versioned to
versioned CPU models we need to solve migration if Model is translated
as Model-v2, which the other side does not support. I'm afraid we would
need to do some kind of reverse translation here.
Note also that there are a couple of patches that update existing CPU
models by
re-running this script against the current qemu source code. For example, the
patch "cpu_map: Update EPYC cpu definitions from qemu" results in some minor
changes to the existing EPYC CPUs by adding a couple of feature flags. In
theory, it seems like a good idea for our libvirt models to match how the model
is defined in qemu, but I admit that I don't have a great understanding of
whether this will result in undesirable side-effects. I'm hoping those of you
with deeper knowledge will tell me why this is or is not a good idea.
I've said in my other emails that this is not a good idea so I'll
explain why in detail here. Taking an example from your patch that
updates several EPYC models, let's suppose we have an EPYC CPU model
defined without "npt" and we decide to add "npt" to the model
definition. On the source with new libvirt with this change we
start a domain with the following CPU definition (simplified):
<cpu>
<model>EPYC</model>
</cpu>
Now if the source host cannot provide npt, we're good as the CPU
definition will be translated to something like
<cpu>
<model>EPYC</model>
<feature name="npt" policy="disable"/>
</cpu>
because we detected that QEMU removed the npt feature even though we
asked for it by using EPYC. But if the host can provide npt the live XML
will not be updated.
Note, in real world CPUs missing a feature we're adding might not
actually exist and everything would be fine, but once we're in
nested environment, everything is possible. Also there are features
that can be available on a host CPU based on its configuration or
even microcode revision.
Once we try to migrate such domain to a destination host with older
libvirt without npt in EPYC, it will ask QEMU to run a domain with EPYC
CPU model. In case the destination host cannot provide npt (in contrast
to the source host), the guest will see npt disabled and we won't detect
it as an issue because we didn't know we were asking for it by using
EPYC. Actually, we might still detect it as a list of features QEMU
disabled would not be empty (in case it was new enough to have npt in
EPYC).
And when we want to remove a feature from a model, new libvirt and QEMU
on the source will not provide the removed feature, but older libvirt on
the destination host will require it because the feature is part our the
CPU model definition there.
All this, while using a specific example, was meant rather generally.
And I didn't cover all possible combinations of what can happen on each
side. There might be cases when we can add or drop CPU features from
existing models, but each case needs to be considered separately and be
accompanied with detailed description why such change would not cause
migration issues. And doing so is usually not very pleasant mental
exercise as you can see above :-)
Jirka
379
days inactive
383
days old
21 comments
2 participants
participants (2)
-
Jiri Denemark -
Jonathon Jongsma