4:44 a.m.
Previously, sync_qemu_features_i386.py would only detect
differences between libvirt's and qemu's list of x86 features.
Adding those features to libvirt was a manual and error prone
task. Additionally, we had to keep a list of non-feature cpu
properties that qemu reported.
Replace this script with a version that reads the feature
names and their cpuid / msr data from qemu source code directly
and generate the libvirt feature list, thus avoiding potential
for human error.
v1:
https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/OV...
changes since v1:
* rebased to current master (some conflicts in tests/ due to 8c07850c18)
* dropped patch 4 ("cpu_map: Remove unused alias information")
* adjusted patch 5 to generate "<alias .../>" entries
Tim Wiederhake (4):
cpu_map: Sort cpu features
cpu_map: Format register values
cpu_map: Format comments
cpu_map: Rewrite feature sync script
src/cpu_map/sync_qemu_features_i386.py | 627 ++++++++++----
src/cpu_map/x86_features.xml | 807 +++++++++---------
...4-baseline-Westmere+Nehalem-migratable.xml | 4 +-
...86_64-baseline-Westmere+Nehalem-result.xml | 4 +-
.../x86_64-baseline-features-result.xml | 4 +-
.../x86_64-cpuid-A10-5800K-guest.xml | 8 +-
.../x86_64-cpuid-A10-5800K-host.xml | 8 +-
.../x86_64-cpuid-A10-5800K-json.xml | 8 +-
.../x86_64-cpuid-Atom-D510-guest.xml | 16 +-
.../x86_64-cpuid-Atom-D510-host.xml | 16 +-
.../x86_64-cpuid-Atom-N450-guest.xml | 14 +-
.../x86_64-cpuid-Atom-N450-host.xml | 14 +-
.../x86_64-cpuid-Atom-P5362-guest.xml | 12 +-
.../x86_64-cpuid-Atom-P5362-host.xml | 18 +-
.../x86_64-cpuid-Atom-P5362-json.xml | 8 +-
.../x86_64-cpuid-Cooperlake-guest.xml | 12 +-
.../x86_64-cpuid-Cooperlake-host.xml | 12 +-
.../x86_64-cpuid-Cooperlake-json.xml | 8 +-
.../x86_64-cpuid-Core-i5-2500-guest.xml | 14 +-
.../x86_64-cpuid-Core-i5-2500-host.xml | 14 +-
.../x86_64-cpuid-Core-i5-2500-json.xml | 4 +-
.../x86_64-cpuid-Core-i5-2540M-guest.xml | 14 +-
.../x86_64-cpuid-Core-i5-2540M-host.xml | 14 +-
.../x86_64-cpuid-Core-i5-2540M-json.xml | 4 +-
.../x86_64-cpuid-Core-i5-4670T-guest.xml | 16 +-
.../x86_64-cpuid-Core-i5-4670T-host.xml | 16 +-
.../x86_64-cpuid-Core-i5-4670T-json.xml | 6 +-
.../x86_64-cpuid-Core-i5-650-guest.xml | 14 +-
.../x86_64-cpuid-Core-i5-650-host.xml | 14 +-
.../x86_64-cpuid-Core-i5-650-json.xml | 4 +-
.../x86_64-cpuid-Core-i5-6600-guest.xml | 12 +-
.../x86_64-cpuid-Core-i5-6600-host.xml | 12 +-
.../x86_64-cpuid-Core-i5-6600-json.xml | 2 +-
.../x86_64-cpuid-Core-i7-2600-guest.xml | 14 +-
.../x86_64-cpuid-Core-i7-2600-host.xml | 14 +-
.../x86_64-cpuid-Core-i7-2600-json.xml | 4 +-
...6_64-cpuid-Core-i7-2600-xsaveopt-guest.xml | 14 +-
...86_64-cpuid-Core-i7-2600-xsaveopt-host.xml | 14 +-
...86_64-cpuid-Core-i7-2600-xsaveopt-json.xml | 4 +-
.../x86_64-cpuid-Core-i7-3520M-guest.xml | 12 +-
.../x86_64-cpuid-Core-i7-3520M-host.xml | 12 +-
.../x86_64-cpuid-Core-i7-3740QM-guest.xml | 12 +-
.../x86_64-cpuid-Core-i7-3740QM-host.xml | 12 +-
.../x86_64-cpuid-Core-i7-3740QM-json.xml | 2 +-
.../x86_64-cpuid-Core-i7-3770-guest.xml | 12 +-
.../x86_64-cpuid-Core-i7-3770-host.xml | 12 +-
.../x86_64-cpuid-Core-i7-3770-json.xml | 2 +-
.../x86_64-cpuid-Core-i7-4510U-guest.xml | 16 +-
.../x86_64-cpuid-Core-i7-4510U-host.xml | 16 +-
.../x86_64-cpuid-Core-i7-4510U-json.xml | 6 +-
.../x86_64-cpuid-Core-i7-4600U-guest.xml | 16 +-
.../x86_64-cpuid-Core-i7-4600U-host.xml | 16 +-
.../x86_64-cpuid-Core-i7-4600U-json.xml | 6 +-
.../x86_64-cpuid-Core-i7-5600U-arat-guest.xml | 16 +-
.../x86_64-cpuid-Core-i7-5600U-arat-host.xml | 16 +-
.../x86_64-cpuid-Core-i7-5600U-arat-json.xml | 6 +-
.../x86_64-cpuid-Core-i7-5600U-guest.xml | 16 +-
.../x86_64-cpuid-Core-i7-5600U-host.xml | 16 +-
.../x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml | 16 +-
.../x86_64-cpuid-Core-i7-5600U-ibrs-host.xml | 16 +-
.../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 | 12 +-
.../x86_64-cpuid-Core-i7-7600U-host.xml | 12 +-
.../x86_64-cpuid-Core-i7-7600U-json.xml | 2 +-
.../x86_64-cpuid-Core-i7-7700-guest.xml | 12 +-
.../x86_64-cpuid-Core-i7-7700-host.xml | 12 +-
.../x86_64-cpuid-Core-i7-7700-json.xml | 2 +-
.../x86_64-cpuid-Core-i7-8550U-guest.xml | 12 +-
.../x86_64-cpuid-Core-i7-8550U-host.xml | 12 +-
.../x86_64-cpuid-Core-i7-8550U-json.xml | 8 +-
.../x86_64-cpuid-Core-i7-8700-guest.xml | 12 +-
.../x86_64-cpuid-Core-i7-8700-host.xml | 12 +-
.../x86_64-cpuid-Core-i7-8700-json.xml | 2 +-
.../x86_64-cpuid-Core2-E6850-guest.xml | 14 +-
.../x86_64-cpuid-Core2-E6850-host.xml | 14 +-
.../x86_64-cpuid-Core2-E6850-json.xml | 4 +-
.../x86_64-cpuid-Core2-Q9500-guest.xml | 14 +-
.../x86_64-cpuid-Core2-Q9500-host.xml | 14 +-
.../x86_64-cpuid-EPYC-7502-32-Core-guest.xml | 2 +-
.../x86_64-cpuid-EPYC-7502-32-Core-host.xml | 2 +-
.../x86_64-cpuid-EPYC-7601-32-Core-guest.xml | 2 +-
.../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 | 2 +-
...6_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml | 2 +-
.../x86_64-cpuid-FX-8150-guest.xml | 8 +-
.../cputestdata/x86_64-cpuid-FX-8150-host.xml | 8 +-
..._64-cpuid-Hygon-C86-7185-32-core-guest.xml | 2 +-
...6_64-cpuid-Hygon-C86-7185-32-core-host.xml | 2 +-
.../x86_64-cpuid-Ice-Lake-Server-guest.xml | 12 +-
.../x86_64-cpuid-Ice-Lake-Server-host.xml | 12 +-
.../x86_64-cpuid-Ice-Lake-Server-json.xml | 2 +-
.../x86_64-cpuid-Opteron-1352-guest.xml | 12 +-
.../x86_64-cpuid-Opteron-1352-host.xml | 12 +-
.../x86_64-cpuid-Opteron-2350-guest.xml | 12 +-
.../x86_64-cpuid-Opteron-2350-host.xml | 12 +-
.../x86_64-cpuid-Opteron-2350-json.xml | 10 +-
.../x86_64-cpuid-Opteron-6234-guest.xml | 8 +-
.../x86_64-cpuid-Opteron-6234-host.xml | 8 +-
.../x86_64-cpuid-Opteron-6234-json.xml | 8 +-
.../x86_64-cpuid-Opteron-6282-guest.xml | 8 +-
.../x86_64-cpuid-Opteron-6282-host.xml | 8 +-
.../x86_64-cpuid-Pentium-P6100-guest.xml | 14 +-
.../x86_64-cpuid-Pentium-P6100-host.xml | 14 +-
.../x86_64-cpuid-Phenom-B95-guest.xml | 12 +-
.../x86_64-cpuid-Phenom-B95-host.xml | 16 +-
.../x86_64-cpuid-Phenom-B95-json.xml | 12 +-
...4-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml | 2 +-
...64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml | 2 +-
...6_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml | 2 +-
...86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml | 2 +-
.../x86_64-cpuid-Xeon-5110-guest.xml | 14 +-
.../x86_64-cpuid-Xeon-5110-host.xml | 14 +-
.../x86_64-cpuid-Xeon-E3-1225-v5-guest.xml | 12 +-
.../x86_64-cpuid-Xeon-E3-1225-v5-host.xml | 12 +-
.../x86_64-cpuid-Xeon-E3-1225-v5-json.xml | 2 +-
.../x86_64-cpuid-Xeon-E3-1245-v5-guest.xml | 12 +-
.../x86_64-cpuid-Xeon-E3-1245-v5-host.xml | 12 +-
.../x86_64-cpuid-Xeon-E3-1245-v5-json.xml | 2 +-
.../x86_64-cpuid-Xeon-E5-2609-v3-guest.xml | 16 +-
.../x86_64-cpuid-Xeon-E5-2609-v3-host.xml | 16 +-
.../x86_64-cpuid-Xeon-E5-2609-v3-json.xml | 6 +-
.../x86_64-cpuid-Xeon-E5-2623-v4-guest.xml | 16 +-
.../x86_64-cpuid-Xeon-E5-2623-v4-host.xml | 16 +-
.../x86_64-cpuid-Xeon-E5-2623-v4-json.xml | 6 +-
.../x86_64-cpuid-Xeon-E5-2630-v3-guest.xml | 16 +-
.../x86_64-cpuid-Xeon-E5-2630-v3-host.xml | 16 +-
.../x86_64-cpuid-Xeon-E5-2630-v3-json.xml | 6 +-
.../x86_64-cpuid-Xeon-E5-2630-v4-guest.xml | 16 +-
.../x86_64-cpuid-Xeon-E5-2630-v4-host.xml | 16 +-
.../x86_64-cpuid-Xeon-E5-2630-v4-json.xml | 6 +-
.../x86_64-cpuid-Xeon-E5-2650-guest.xml | 14 +-
.../x86_64-cpuid-Xeon-E5-2650-host.xml | 14 +-
.../x86_64-cpuid-Xeon-E5-2650-json.xml | 4 +-
.../x86_64-cpuid-Xeon-E5-2650-v3-guest.xml | 16 +-
.../x86_64-cpuid-Xeon-E5-2650-v3-host.xml | 16 +-
.../x86_64-cpuid-Xeon-E5-2650-v3-json.xml | 6 +-
.../x86_64-cpuid-Xeon-E5-2650-v4-guest.xml | 16 +-
.../x86_64-cpuid-Xeon-E5-2650-v4-host.xml | 16 +-
.../x86_64-cpuid-Xeon-E5-2650-v4-json.xml | 6 +-
.../x86_64-cpuid-Xeon-E7-4820-guest.xml | 14 +-
.../x86_64-cpuid-Xeon-E7-4820-host.xml | 14 +-
.../x86_64-cpuid-Xeon-E7-4820-json.xml | 4 +-
.../x86_64-cpuid-Xeon-E7-4830-guest.xml | 14 +-
.../x86_64-cpuid-Xeon-E7-4830-host.xml | 14 +-
.../x86_64-cpuid-Xeon-E7-4830-json.xml | 4 +-
.../x86_64-cpuid-Xeon-E7-8890-v3-guest.xml | 16 +-
.../x86_64-cpuid-Xeon-E7-8890-v3-host.xml | 16 +-
.../x86_64-cpuid-Xeon-E7-8890-v3-json.xml | 6 +-
.../x86_64-cpuid-Xeon-E7540-guest.xml | 14 +-
.../x86_64-cpuid-Xeon-E7540-host.xml | 14 +-
.../x86_64-cpuid-Xeon-E7540-json.xml | 4 +-
.../x86_64-cpuid-Xeon-Gold-5115-guest.xml | 12 +-
.../x86_64-cpuid-Xeon-Gold-5115-host.xml | 12 +-
.../x86_64-cpuid-Xeon-Gold-5115-json.xml | 2 +-
.../x86_64-cpuid-Xeon-Gold-6130-guest.xml | 12 +-
.../x86_64-cpuid-Xeon-Gold-6130-host.xml | 12 +-
.../x86_64-cpuid-Xeon-Gold-6130-json.xml | 2 +-
.../x86_64-cpuid-Xeon-Gold-6148-guest.xml | 12 +-
.../x86_64-cpuid-Xeon-Gold-6148-host.xml | 12 +-
.../x86_64-cpuid-Xeon-Gold-6148-json.xml | 2 +-
.../x86_64-cpuid-Xeon-Platinum-8268-guest.xml | 12 +-
.../x86_64-cpuid-Xeon-Platinum-8268-host.xml | 12 +-
.../x86_64-cpuid-Xeon-Platinum-8268-json.xml | 2 +-
.../x86_64-cpuid-Xeon-Platinum-9242-guest.xml | 12 +-
.../x86_64-cpuid-Xeon-Platinum-9242-host.xml | 12 +-
.../x86_64-cpuid-Xeon-Platinum-9242-json.xml | 8 +-
.../x86_64-cpuid-Xeon-W3520-guest.xml | 14 +-
.../x86_64-cpuid-Xeon-W3520-host.xml | 14 +-
.../x86_64-cpuid-Xeon-W3520-json.xml | 4 +-
.../x86_64-cpuid-Xeon-X5460-guest.xml | 14 +-
.../x86_64-cpuid-Xeon-X5460-host.xml | 14 +-
...id-baseline-Broadwell-IBRS+Cascadelake.xml | 6 +-
..._64-cpuid-baseline-Cascadelake+Icelake.xml | 2 +-
...puid-baseline-Cascadelake+Skylake-IBRS.xml | 2 +-
..._64-cpuid-baseline-Cascadelake+Skylake.xml | 2 +-
...-cpuid-baseline-Cooperlake+Cascadelake.xml | 8 +-
...6_64-cpuid-baseline-Cooperlake+Icelake.xml | 2 +-
.../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 +-
...4-cpuid-baseline-Skylake-Client+Server.xml | 2 +-
.../x86_64-host+guest,model486-result.xml | 18 +-
.../x86_64-host+guest,models-result.xml | 4 +-
..._64-host+host+host-model,models-result.xml | 12 +-
.../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 8 +-
.../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 6 +-
tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 8 +-
.../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 8 +-
.../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 6 +-
tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 8 +-
.../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 6 +-
.../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 6 +-
.../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 6 +-
.../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 6 +-
.../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 6 +-
.../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 6 +-
.../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 6 +-
.../qemu_7.2.0-tcg.x86_64+hvf.xml | 6 +-
.../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 6 +-
.../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 6 +-
.../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 6 +-
.../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 6 +-
.../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 6 +-
...-host-model-fallback-kvm.x86_64-4.2.0.args | 2 +-
...-host-model-fallback-kvm.x86_64-5.0.0.args | 2 +-
...-host-model-fallback-tcg.x86_64-4.2.0.args | 2 +-
...-host-model-fallback-tcg.x86_64-5.0.0.args | 2 +-
...-host-model-fallback-tcg.x86_64-5.1.0.args | 2 +-
...-host-model-fallback-tcg.x86_64-5.2.0.args | 2 +-
...-host-model-fallback-tcg.x86_64-6.0.0.args | 2 +-
...-host-model-fallback-tcg.x86_64-6.1.0.args | 2 +-
...-host-model-fallback-tcg.x86_64-6.2.0.args | 2 +-
...-host-model-fallback-tcg.x86_64-7.0.0.args | 2 +-
...-host-model-fallback-tcg.x86_64-7.1.0.args | 2 +-
...-host-model-fallback-tcg.x86_64-7.2.0.args | 2 +-
...-host-model-fallback-tcg.x86_64-8.0.0.args | 2 +-
...-host-model-fallback-tcg.x86_64-8.1.0.args | 2 +-
...host-model-fallback-tcg.x86_64-latest.args | 2 +-
.../cpu-host-model-kvm.x86_64-4.2.0.args | 2 +-
.../cpu-host-model-kvm.x86_64-5.0.0.args | 2 +-
...ost-model-nofallback-kvm.x86_64-4.2.0.args | 2 +-
...ost-model-nofallback-kvm.x86_64-5.0.0.args | 2 +-
...ost-model-nofallback-tcg.x86_64-4.2.0.args | 2 +-
...ost-model-nofallback-tcg.x86_64-5.0.0.args | 2 +-
...ost-model-nofallback-tcg.x86_64-5.1.0.args | 2 +-
...ost-model-nofallback-tcg.x86_64-5.2.0.args | 2 +-
...ost-model-nofallback-tcg.x86_64-6.0.0.args | 2 +-
...ost-model-nofallback-tcg.x86_64-6.1.0.args | 2 +-
...ost-model-nofallback-tcg.x86_64-6.2.0.args | 2 +-
...ost-model-nofallback-tcg.x86_64-7.0.0.args | 2 +-
...ost-model-nofallback-tcg.x86_64-7.1.0.args | 2 +-
...ost-model-nofallback-tcg.x86_64-7.2.0.args | 2 +-
...ost-model-nofallback-tcg.x86_64-8.0.0.args | 2 +-
...ost-model-nofallback-tcg.x86_64-8.1.0.args | 2 +-
...st-model-nofallback-tcg.x86_64-latest.args | 2 +-
.../cpu-host-model-tcg.x86_64-4.2.0.args | 2 +-
.../cpu-host-model-tcg.x86_64-5.0.0.args | 2 +-
.../cpu-host-model-tcg.x86_64-5.1.0.args | 2 +-
.../cpu-host-model-tcg.x86_64-5.2.0.args | 2 +-
.../cpu-host-model-tcg.x86_64-6.0.0.args | 2 +-
.../cpu-host-model-tcg.x86_64-6.1.0.args | 2 +-
.../cpu-host-model-tcg.x86_64-6.2.0.args | 2 +-
.../cpu-host-model-tcg.x86_64-7.0.0.args | 2 +-
.../cpu-host-model-tcg.x86_64-7.1.0.args | 2 +-
.../cpu-host-model-tcg.x86_64-7.2.0.args | 2 +-
.../cpu-host-model-tcg.x86_64-8.0.0.args | 2 +-
.../cpu-host-model-tcg.x86_64-8.1.0.args | 2 +-
.../cpu-host-model-tcg.x86_64-latest.args | 2 +-
251 files changed, 1881 insertions(+), 1577 deletions(-)
--
2.43.0
4:44 a.m.
New subject: [PATCH v2 1/4] cpu_map: Sort cpu features
Some feature words were not sorted correctly.
Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com>
---
src/cpu_map/x86_features.xml | 292 +++++++++---------
...4-baseline-Westmere+Nehalem-migratable.xml | 4 +-
...86_64-baseline-Westmere+Nehalem-result.xml | 4 +-
.../x86_64-baseline-features-result.xml | 4 +-
.../x86_64-cpuid-A10-5800K-guest.xml | 8 +-
.../x86_64-cpuid-A10-5800K-host.xml | 8 +-
.../x86_64-cpuid-A10-5800K-json.xml | 8 +-
.../x86_64-cpuid-Atom-D510-guest.xml | 16 +-
.../x86_64-cpuid-Atom-D510-host.xml | 16 +-
.../x86_64-cpuid-Atom-N450-guest.xml | 14 +-
.../x86_64-cpuid-Atom-N450-host.xml | 14 +-
.../x86_64-cpuid-Atom-P5362-guest.xml | 12 +-
.../x86_64-cpuid-Atom-P5362-host.xml | 18 +-
.../x86_64-cpuid-Atom-P5362-json.xml | 8 +-
.../x86_64-cpuid-Cooperlake-guest.xml | 12 +-
.../x86_64-cpuid-Cooperlake-host.xml | 12 +-
.../x86_64-cpuid-Cooperlake-json.xml | 8 +-
.../x86_64-cpuid-Core-i5-2500-guest.xml | 14 +-
.../x86_64-cpuid-Core-i5-2500-host.xml | 14 +-
.../x86_64-cpuid-Core-i5-2500-json.xml | 4 +-
.../x86_64-cpuid-Core-i5-2540M-guest.xml | 14 +-
.../x86_64-cpuid-Core-i5-2540M-host.xml | 14 +-
.../x86_64-cpuid-Core-i5-2540M-json.xml | 4 +-
.../x86_64-cpuid-Core-i5-4670T-guest.xml | 16 +-
.../x86_64-cpuid-Core-i5-4670T-host.xml | 16 +-
.../x86_64-cpuid-Core-i5-4670T-json.xml | 6 +-
.../x86_64-cpuid-Core-i5-650-guest.xml | 14 +-
.../x86_64-cpuid-Core-i5-650-host.xml | 14 +-
.../x86_64-cpuid-Core-i5-650-json.xml | 4 +-
.../x86_64-cpuid-Core-i5-6600-guest.xml | 12 +-
.../x86_64-cpuid-Core-i5-6600-host.xml | 12 +-
.../x86_64-cpuid-Core-i5-6600-json.xml | 2 +-
.../x86_64-cpuid-Core-i7-2600-guest.xml | 14 +-
.../x86_64-cpuid-Core-i7-2600-host.xml | 14 +-
.../x86_64-cpuid-Core-i7-2600-json.xml | 4 +-
...6_64-cpuid-Core-i7-2600-xsaveopt-guest.xml | 14 +-
...86_64-cpuid-Core-i7-2600-xsaveopt-host.xml | 14 +-
...86_64-cpuid-Core-i7-2600-xsaveopt-json.xml | 4 +-
.../x86_64-cpuid-Core-i7-3520M-guest.xml | 12 +-
.../x86_64-cpuid-Core-i7-3520M-host.xml | 12 +-
.../x86_64-cpuid-Core-i7-3740QM-guest.xml | 12 +-
.../x86_64-cpuid-Core-i7-3740QM-host.xml | 12 +-
.../x86_64-cpuid-Core-i7-3740QM-json.xml | 2 +-
.../x86_64-cpuid-Core-i7-3770-guest.xml | 12 +-
.../x86_64-cpuid-Core-i7-3770-host.xml | 12 +-
.../x86_64-cpuid-Core-i7-3770-json.xml | 2 +-
.../x86_64-cpuid-Core-i7-4510U-guest.xml | 16 +-
.../x86_64-cpuid-Core-i7-4510U-host.xml | 16 +-
.../x86_64-cpuid-Core-i7-4510U-json.xml | 6 +-
.../x86_64-cpuid-Core-i7-4600U-guest.xml | 16 +-
.../x86_64-cpuid-Core-i7-4600U-host.xml | 16 +-
.../x86_64-cpuid-Core-i7-4600U-json.xml | 6 +-
.../x86_64-cpuid-Core-i7-5600U-arat-guest.xml | 16 +-
.../x86_64-cpuid-Core-i7-5600U-arat-host.xml | 16 +-
.../x86_64-cpuid-Core-i7-5600U-arat-json.xml | 6 +-
.../x86_64-cpuid-Core-i7-5600U-guest.xml | 16 +-
.../x86_64-cpuid-Core-i7-5600U-host.xml | 16 +-
.../x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml | 16 +-
.../x86_64-cpuid-Core-i7-5600U-ibrs-host.xml | 16 +-
.../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 | 12 +-
.../x86_64-cpuid-Core-i7-7600U-host.xml | 12 +-
.../x86_64-cpuid-Core-i7-7600U-json.xml | 2 +-
.../x86_64-cpuid-Core-i7-7700-guest.xml | 12 +-
.../x86_64-cpuid-Core-i7-7700-host.xml | 12 +-
.../x86_64-cpuid-Core-i7-7700-json.xml | 2 +-
.../x86_64-cpuid-Core-i7-8550U-guest.xml | 12 +-
.../x86_64-cpuid-Core-i7-8550U-host.xml | 12 +-
.../x86_64-cpuid-Core-i7-8550U-json.xml | 8 +-
.../x86_64-cpuid-Core-i7-8700-guest.xml | 12 +-
.../x86_64-cpuid-Core-i7-8700-host.xml | 12 +-
.../x86_64-cpuid-Core-i7-8700-json.xml | 2 +-
.../x86_64-cpuid-Core2-E6850-guest.xml | 14 +-
.../x86_64-cpuid-Core2-E6850-host.xml | 14 +-
.../x86_64-cpuid-Core2-E6850-json.xml | 4 +-
.../x86_64-cpuid-Core2-Q9500-guest.xml | 14 +-
.../x86_64-cpuid-Core2-Q9500-host.xml | 14 +-
.../x86_64-cpuid-EPYC-7502-32-Core-guest.xml | 2 +-
.../x86_64-cpuid-EPYC-7502-32-Core-host.xml | 2 +-
.../x86_64-cpuid-EPYC-7601-32-Core-guest.xml | 2 +-
.../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 | 2 +-
...6_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml | 2 +-
.../x86_64-cpuid-FX-8150-guest.xml | 8 +-
.../cputestdata/x86_64-cpuid-FX-8150-host.xml | 8 +-
..._64-cpuid-Hygon-C86-7185-32-core-guest.xml | 2 +-
...6_64-cpuid-Hygon-C86-7185-32-core-host.xml | 2 +-
.../x86_64-cpuid-Ice-Lake-Server-guest.xml | 12 +-
.../x86_64-cpuid-Ice-Lake-Server-host.xml | 12 +-
.../x86_64-cpuid-Ice-Lake-Server-json.xml | 2 +-
.../x86_64-cpuid-Opteron-1352-guest.xml | 12 +-
.../x86_64-cpuid-Opteron-1352-host.xml | 12 +-
.../x86_64-cpuid-Opteron-2350-guest.xml | 12 +-
.../x86_64-cpuid-Opteron-2350-host.xml | 12 +-
.../x86_64-cpuid-Opteron-2350-json.xml | 10 +-
.../x86_64-cpuid-Opteron-6234-guest.xml | 8 +-
.../x86_64-cpuid-Opteron-6234-host.xml | 8 +-
.../x86_64-cpuid-Opteron-6234-json.xml | 8 +-
.../x86_64-cpuid-Opteron-6282-guest.xml | 8 +-
.../x86_64-cpuid-Opteron-6282-host.xml | 8 +-
.../x86_64-cpuid-Pentium-P6100-guest.xml | 14 +-
.../x86_64-cpuid-Pentium-P6100-host.xml | 14 +-
.../x86_64-cpuid-Phenom-B95-guest.xml | 12 +-
.../x86_64-cpuid-Phenom-B95-host.xml | 16 +-
.../x86_64-cpuid-Phenom-B95-json.xml | 12 +-
...4-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml | 2 +-
...64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml | 2 +-
...6_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml | 2 +-
...86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml | 2 +-
.../x86_64-cpuid-Xeon-5110-guest.xml | 14 +-
.../x86_64-cpuid-Xeon-5110-host.xml | 14 +-
.../x86_64-cpuid-Xeon-E3-1225-v5-guest.xml | 12 +-
.../x86_64-cpuid-Xeon-E3-1225-v5-host.xml | 12 +-
.../x86_64-cpuid-Xeon-E3-1225-v5-json.xml | 2 +-
.../x86_64-cpuid-Xeon-E3-1245-v5-guest.xml | 12 +-
.../x86_64-cpuid-Xeon-E3-1245-v5-host.xml | 12 +-
.../x86_64-cpuid-Xeon-E3-1245-v5-json.xml | 2 +-
.../x86_64-cpuid-Xeon-E5-2609-v3-guest.xml | 16 +-
.../x86_64-cpuid-Xeon-E5-2609-v3-host.xml | 16 +-
.../x86_64-cpuid-Xeon-E5-2609-v3-json.xml | 6 +-
.../x86_64-cpuid-Xeon-E5-2623-v4-guest.xml | 16 +-
.../x86_64-cpuid-Xeon-E5-2623-v4-host.xml | 16 +-
.../x86_64-cpuid-Xeon-E5-2623-v4-json.xml | 6 +-
.../x86_64-cpuid-Xeon-E5-2630-v3-guest.xml | 16 +-
.../x86_64-cpuid-Xeon-E5-2630-v3-host.xml | 16 +-
.../x86_64-cpuid-Xeon-E5-2630-v3-json.xml | 6 +-
.../x86_64-cpuid-Xeon-E5-2630-v4-guest.xml | 16 +-
.../x86_64-cpuid-Xeon-E5-2630-v4-host.xml | 16 +-
.../x86_64-cpuid-Xeon-E5-2630-v4-json.xml | 6 +-
.../x86_64-cpuid-Xeon-E5-2650-guest.xml | 14 +-
.../x86_64-cpuid-Xeon-E5-2650-host.xml | 14 +-
.../x86_64-cpuid-Xeon-E5-2650-json.xml | 4 +-
.../x86_64-cpuid-Xeon-E5-2650-v3-guest.xml | 16 +-
.../x86_64-cpuid-Xeon-E5-2650-v3-host.xml | 16 +-
.../x86_64-cpuid-Xeon-E5-2650-v3-json.xml | 6 +-
.../x86_64-cpuid-Xeon-E5-2650-v4-guest.xml | 16 +-
.../x86_64-cpuid-Xeon-E5-2650-v4-host.xml | 16 +-
.../x86_64-cpuid-Xeon-E5-2650-v4-json.xml | 6 +-
.../x86_64-cpuid-Xeon-E7-4820-guest.xml | 14 +-
.../x86_64-cpuid-Xeon-E7-4820-host.xml | 14 +-
.../x86_64-cpuid-Xeon-E7-4820-json.xml | 4 +-
.../x86_64-cpuid-Xeon-E7-4830-guest.xml | 14 +-
.../x86_64-cpuid-Xeon-E7-4830-host.xml | 14 +-
.../x86_64-cpuid-Xeon-E7-4830-json.xml | 4 +-
.../x86_64-cpuid-Xeon-E7-8890-v3-guest.xml | 16 +-
.../x86_64-cpuid-Xeon-E7-8890-v3-host.xml | 16 +-
.../x86_64-cpuid-Xeon-E7-8890-v3-json.xml | 6 +-
.../x86_64-cpuid-Xeon-E7540-guest.xml | 14 +-
.../x86_64-cpuid-Xeon-E7540-host.xml | 14 +-
.../x86_64-cpuid-Xeon-E7540-json.xml | 4 +-
.../x86_64-cpuid-Xeon-Gold-5115-guest.xml | 12 +-
.../x86_64-cpuid-Xeon-Gold-5115-host.xml | 12 +-
.../x86_64-cpuid-Xeon-Gold-5115-json.xml | 2 +-
.../x86_64-cpuid-Xeon-Gold-6130-guest.xml | 12 +-
.../x86_64-cpuid-Xeon-Gold-6130-host.xml | 12 +-
.../x86_64-cpuid-Xeon-Gold-6130-json.xml | 2 +-
.../x86_64-cpuid-Xeon-Gold-6148-guest.xml | 12 +-
.../x86_64-cpuid-Xeon-Gold-6148-host.xml | 12 +-
.../x86_64-cpuid-Xeon-Gold-6148-json.xml | 2 +-
.../x86_64-cpuid-Xeon-Platinum-8268-guest.xml | 12 +-
.../x86_64-cpuid-Xeon-Platinum-8268-host.xml | 12 +-
.../x86_64-cpuid-Xeon-Platinum-8268-json.xml | 2 +-
.../x86_64-cpuid-Xeon-Platinum-9242-guest.xml | 12 +-
.../x86_64-cpuid-Xeon-Platinum-9242-host.xml | 12 +-
.../x86_64-cpuid-Xeon-Platinum-9242-json.xml | 8 +-
.../x86_64-cpuid-Xeon-W3520-guest.xml | 14 +-
.../x86_64-cpuid-Xeon-W3520-host.xml | 14 +-
.../x86_64-cpuid-Xeon-W3520-json.xml | 4 +-
.../x86_64-cpuid-Xeon-X5460-guest.xml | 14 +-
.../x86_64-cpuid-Xeon-X5460-host.xml | 14 +-
...id-baseline-Broadwell-IBRS+Cascadelake.xml | 6 +-
..._64-cpuid-baseline-Cascadelake+Icelake.xml | 2 +-
...puid-baseline-Cascadelake+Skylake-IBRS.xml | 2 +-
..._64-cpuid-baseline-Cascadelake+Skylake.xml | 2 +-
...-cpuid-baseline-Cooperlake+Cascadelake.xml | 8 +-
...6_64-cpuid-baseline-Cooperlake+Icelake.xml | 2 +-
.../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 +-
...4-cpuid-baseline-Skylake-Client+Server.xml | 2 +-
.../x86_64-host+guest,model486-result.xml | 18 +-
.../x86_64-host+guest,models-result.xml | 4 +-
..._64-host+host+host-model,models-result.xml | 12 +-
.../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 8 +-
.../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 6 +-
tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 8 +-
.../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 8 +-
.../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 6 +-
tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 8 +-
.../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 6 +-
.../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 6 +-
.../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 6 +-
.../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 6 +-
.../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 6 +-
.../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 6 +-
.../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 6 +-
.../qemu_7.2.0-tcg.x86_64+hvf.xml | 6 +-
.../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 6 +-
.../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 6 +-
.../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 6 +-
.../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 6 +-
.../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 6 +-
...-host-model-fallback-kvm.x86_64-4.2.0.args | 2 +-
...-host-model-fallback-kvm.x86_64-5.0.0.args | 2 +-
...-host-model-fallback-tcg.x86_64-4.2.0.args | 2 +-
...-host-model-fallback-tcg.x86_64-5.0.0.args | 2 +-
...-host-model-fallback-tcg.x86_64-5.1.0.args | 2 +-
...-host-model-fallback-tcg.x86_64-5.2.0.args | 2 +-
...-host-model-fallback-tcg.x86_64-6.0.0.args | 2 +-
...-host-model-fallback-tcg.x86_64-6.1.0.args | 2 +-
...-host-model-fallback-tcg.x86_64-6.2.0.args | 2 +-
...-host-model-fallback-tcg.x86_64-7.0.0.args | 2 +-
...-host-model-fallback-tcg.x86_64-7.1.0.args | 2 +-
...-host-model-fallback-tcg.x86_64-7.2.0.args | 2 +-
...-host-model-fallback-tcg.x86_64-8.0.0.args | 2 +-
...-host-model-fallback-tcg.x86_64-8.1.0.args | 2 +-
...host-model-fallback-tcg.x86_64-latest.args | 2 +-
.../cpu-host-model-kvm.x86_64-4.2.0.args | 2 +-
.../cpu-host-model-kvm.x86_64-5.0.0.args | 2 +-
...ost-model-nofallback-kvm.x86_64-4.2.0.args | 2 +-
...ost-model-nofallback-kvm.x86_64-5.0.0.args | 2 +-
...ost-model-nofallback-tcg.x86_64-4.2.0.args | 2 +-
...ost-model-nofallback-tcg.x86_64-5.0.0.args | 2 +-
...ost-model-nofallback-tcg.x86_64-5.1.0.args | 2 +-
...ost-model-nofallback-tcg.x86_64-5.2.0.args | 2 +-
...ost-model-nofallback-tcg.x86_64-6.0.0.args | 2 +-
...ost-model-nofallback-tcg.x86_64-6.1.0.args | 2 +-
...ost-model-nofallback-tcg.x86_64-6.2.0.args | 2 +-
...ost-model-nofallback-tcg.x86_64-7.0.0.args | 2 +-
...ost-model-nofallback-tcg.x86_64-7.1.0.args | 2 +-
...ost-model-nofallback-tcg.x86_64-7.2.0.args | 2 +-
...ost-model-nofallback-tcg.x86_64-8.0.0.args | 2 +-
...ost-model-nofallback-tcg.x86_64-8.1.0.args | 2 +-
...st-model-nofallback-tcg.x86_64-latest.args | 2 +-
.../cpu-host-model-tcg.x86_64-4.2.0.args | 2 +-
.../cpu-host-model-tcg.x86_64-5.0.0.args | 2 +-
.../cpu-host-model-tcg.x86_64-5.1.0.args | 2 +-
.../cpu-host-model-tcg.x86_64-5.2.0.args | 2 +-
.../cpu-host-model-tcg.x86_64-6.0.0.args | 2 +-
.../cpu-host-model-tcg.x86_64-6.1.0.args | 2 +-
.../cpu-host-model-tcg.x86_64-6.2.0.args | 2 +-
.../cpu-host-model-tcg.x86_64-7.0.0.args | 2 +-
.../cpu-host-model-tcg.x86_64-7.1.0.args | 2 +-
.../cpu-host-model-tcg.x86_64-7.2.0.args | 2 +-
.../cpu-host-model-tcg.x86_64-8.0.0.args | 2 +-
.../cpu-host-model-tcg.x86_64-8.1.0.args | 2 +-
.../cpu-host-model-tcg.x86_64-latest.args | 2 +-
250 files changed, 1158 insertions(+), 1158 deletions(-)
diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index b79ed579b2..ded81c3667 100644
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -5,98 +5,6 @@
-->
<cpus>
- <!-- standard features, EDX -->
- <feature name='fpu'>
- <cpuid eax_in='0x01' edx='0x00000001'/>
- </feature>
- <feature name='vme'>
- <cpuid eax_in='0x01' edx='0x00000002'/>
- </feature>
- <feature name='de'>
- <cpuid eax_in='0x01' edx='0x00000004'/>
- </feature>
- <feature name='pse'>
- <cpuid eax_in='0x01' edx='0x00000008'/>
- </feature>
- <feature name='tsc'>
- <cpuid eax_in='0x01' edx='0x00000010'/>
- </feature>
- <feature name='msr'>
- <cpuid eax_in='0x01' edx='0x00000020'/>
- </feature>
- <feature name='pae'>
- <cpuid eax_in='0x01' edx='0x00000040'/>
- </feature>
- <feature name='mce'>
- <cpuid eax_in='0x01' edx='0x00000080'/>
- </feature>
- <feature name='cx8'>
- <cpuid eax_in='0x01' edx='0x00000100'/>
- </feature>
- <feature name='apic'>
- <cpuid eax_in='0x01' edx='0x00000200'/>
- </feature>
- <feature name='sep'>
- <cpuid eax_in='0x01' edx='0x00000800'/>
- </feature>
- <feature name='mtrr'>
- <cpuid eax_in='0x01' edx='0x00001000'/>
- </feature>
- <feature name='pge'>
- <cpuid eax_in='0x01' edx='0x00002000'/>
- </feature>
- <feature name='mca'>
- <cpuid eax_in='0x01' edx='0x00004000'/>
- </feature>
- <feature name='cmov'>
- <cpuid eax_in='0x01' edx='0x00008000'/>
- </feature>
- <feature name='pat'>
- <cpuid eax_in='0x01' edx='0x00010000'/>
- </feature>
- <feature name='pse36'>
- <cpuid eax_in='0x01' edx='0x00020000'/>
- </feature>
- <feature name='pn'>
- <cpuid eax_in='0x01' edx='0x00040000'/>
- </feature>
- <feature name='clflush'>
- <cpuid eax_in='0x01' edx='0x00080000'/>
- </feature>
- <feature name='ds'>
- <cpuid eax_in='0x01' edx='0x00200000'/>
- </feature>
- <feature name='acpi'>
- <cpuid eax_in='0x01' edx='0x00400000'/>
- </feature>
- <feature name='mmx'>
- <cpuid eax_in='0x01' edx='0x00800000'/>
- </feature>
- <feature name='fxsr'>
- <cpuid eax_in='0x01' edx='0x01000000'/>
- </feature>
- <feature name='sse'>
- <cpuid eax_in='0x01' edx='0x02000000'/>
- </feature>
- <feature name='sse2'>
- <cpuid eax_in='0x01' edx='0x04000000'/>
- </feature>
- <feature name='ss'>
- <cpuid eax_in='0x01' edx='0x08000000'/>
- </feature>
- <feature name='ht'>
- <cpuid eax_in='0x01' edx='0x10000000'/>
- </feature>
- <feature name='tm'>
- <cpuid eax_in='0x01' edx='0x20000000'/>
- </feature>
- <feature name='ia64'>
- <cpuid eax_in='0x01' edx='0x40000000'/>
- </feature>
- <feature name='pbe'>
- <cpuid eax_in='0x01' edx='0x80000000'/>
- </feature>
-
<!-- standard features, ECX -->
<feature name='pni'>
<alias name='sse3' source='qemu'/>
@@ -196,6 +104,98 @@
<cpuid eax_in='0x01' ecx='0x80000000'/>
</feature>
+ <!-- standard features, EDX -->
+ <feature name='fpu'>
+ <cpuid eax_in='0x01' edx='0x00000001'/>
+ </feature>
+ <feature name='vme'>
+ <cpuid eax_in='0x01' edx='0x00000002'/>
+ </feature>
+ <feature name='de'>
+ <cpuid eax_in='0x01' edx='0x00000004'/>
+ </feature>
+ <feature name='pse'>
+ <cpuid eax_in='0x01' edx='0x00000008'/>
+ </feature>
+ <feature name='tsc'>
+ <cpuid eax_in='0x01' edx='0x00000010'/>
+ </feature>
+ <feature name='msr'>
+ <cpuid eax_in='0x01' edx='0x00000020'/>
+ </feature>
+ <feature name='pae'>
+ <cpuid eax_in='0x01' edx='0x00000040'/>
+ </feature>
+ <feature name='mce'>
+ <cpuid eax_in='0x01' edx='0x00000080'/>
+ </feature>
+ <feature name='cx8'>
+ <cpuid eax_in='0x01' edx='0x00000100'/>
+ </feature>
+ <feature name='apic'>
+ <cpuid eax_in='0x01' edx='0x00000200'/>
+ </feature>
+ <feature name='sep'>
+ <cpuid eax_in='0x01' edx='0x00000800'/>
+ </feature>
+ <feature name='mtrr'>
+ <cpuid eax_in='0x01' edx='0x00001000'/>
+ </feature>
+ <feature name='pge'>
+ <cpuid eax_in='0x01' edx='0x00002000'/>
+ </feature>
+ <feature name='mca'>
+ <cpuid eax_in='0x01' edx='0x00004000'/>
+ </feature>
+ <feature name='cmov'>
+ <cpuid eax_in='0x01' edx='0x00008000'/>
+ </feature>
+ <feature name='pat'>
+ <cpuid eax_in='0x01' edx='0x00010000'/>
+ </feature>
+ <feature name='pse36'>
+ <cpuid eax_in='0x01' edx='0x00020000'/>
+ </feature>
+ <feature name='pn'>
+ <cpuid eax_in='0x01' edx='0x00040000'/>
+ </feature>
+ <feature name='clflush'>
+ <cpuid eax_in='0x01' edx='0x00080000'/>
+ </feature>
+ <feature name='ds'>
+ <cpuid eax_in='0x01' edx='0x00200000'/>
+ </feature>
+ <feature name='acpi'>
+ <cpuid eax_in='0x01' edx='0x00400000'/>
+ </feature>
+ <feature name='mmx'>
+ <cpuid eax_in='0x01' edx='0x00800000'/>
+ </feature>
+ <feature name='fxsr'>
+ <cpuid eax_in='0x01' edx='0x01000000'/>
+ </feature>
+ <feature name='sse'>
+ <cpuid eax_in='0x01' edx='0x02000000'/>
+ </feature>
+ <feature name='sse2'>
+ <cpuid eax_in='0x01' edx='0x04000000'/>
+ </feature>
+ <feature name='ss'>
+ <cpuid eax_in='0x01' edx='0x08000000'/>
+ </feature>
+ <feature name='ht'>
+ <cpuid eax_in='0x01' edx='0x10000000'/>
+ </feature>
+ <feature name='tm'>
+ <cpuid eax_in='0x01' edx='0x20000000'/>
+ </feature>
+ <feature name='ia64'>
+ <cpuid eax_in='0x01' edx='0x40000000'/>
+ </feature>
+ <feature name='pbe'>
+ <cpuid eax_in='0x01' edx='0x80000000'/>
+ </feature>
+
<!-- Termal Power and Management -->
<feature name='arat'>
<cpuid eax_in='0x06' eax='0x00000004'/>
@@ -520,39 +520,6 @@
<cpuid eax_in='0x14' ecx_in='0x00' ecx='0x80000000'/>
</feature>
- <!-- extended features, EDX -->
- <feature name='syscall'>
- <cpuid eax_in='0x80000001' edx='0x00000800'/>
- </feature>
- <feature name='nx'>
- <alias name='xd' source='qemu'/>
- <cpuid eax_in='0x80000001' edx='0x00100000'/>
- </feature>
- <feature name='mmxext'>
- <cpuid eax_in='0x80000001' edx='0x00400000'/>
- </feature>
- <feature name='fxsr_opt'>
- <alias name='ffxsr' source='qemu'/>
- <alias name='fxsr-opt' source='qemu'/>
- <cpuid eax_in='0x80000001' edx='0x02000000'/>
- </feature>
- <feature name='pdpe1gb'>
- <cpuid eax_in='0x80000001' edx='0x04000000'/>
- </feature>
- <feature name='rdtscp'>
- <cpuid eax_in='0x80000001' edx='0x08000000'/>
- </feature>
- <feature name='lm'>
- <alias name='i64' source='qemu'/>
- <cpuid eax_in='0x80000001' edx='0x20000000'/>
- </feature>
- <feature name='3dnowext'>
- <cpuid eax_in='0x80000001' edx='0x40000000'/>
- </feature>
- <feature name='3dnow'>
- <cpuid eax_in='0x80000001' edx='0x80000000'/>
- </feature>
-
<!-- extended features, ECX -->
<feature name='lahf_lm'>
<alias name='lahf-lm' source='qemu'/>
@@ -629,6 +596,39 @@
<cpuid eax_in='0x80000001' ecx='0x01000000'/>
</feature>
+ <!-- extended features, EDX -->
+ <feature name='syscall'>
+ <cpuid eax_in='0x80000001' edx='0x00000800'/>
+ </feature>
+ <feature name='nx'>
+ <alias name='xd' source='qemu'/>
+ <cpuid eax_in='0x80000001' edx='0x00100000'/>
+ </feature>
+ <feature name='mmxext'>
+ <cpuid eax_in='0x80000001' edx='0x00400000'/>
+ </feature>
+ <feature name='fxsr_opt'>
+ <alias name='ffxsr' source='qemu'/>
+ <alias name='fxsr-opt' source='qemu'/>
+ <cpuid eax_in='0x80000001' edx='0x02000000'/>
+ </feature>
+ <feature name='pdpe1gb'>
+ <cpuid eax_in='0x80000001' edx='0x04000000'/>
+ </feature>
+ <feature name='rdtscp'>
+ <cpuid eax_in='0x80000001' edx='0x08000000'/>
+ </feature>
+ <feature name='lm'>
+ <alias name='i64' source='qemu'/>
+ <cpuid eax_in='0x80000001' edx='0x20000000'/>
+ </feature>
+ <feature name='3dnowext'>
+ <cpuid eax_in='0x80000001' edx='0x40000000'/>
+ </feature>
+ <feature name='3dnow'>
+ <cpuid eax_in='0x80000001' edx='0x80000000'/>
+ </feature>
+
<!-- Advanced Power Management edx features -->
<feature name='invtsc' migratable='no'>
<cpuid eax_in='0x80000007' edx='0x00000100'/>
@@ -735,6 +735,11 @@
<cpuid eax_in='0x80000021' eax='0x00000100'/>
</feature>
+ <!-- IA32_CORE_CAPABILITIES features -->
+ <feature name='split-lock-detect'>
+ <msr index='0xcf' edx='0x00000000' eax='0x00000020'/>
+ </feature>
+
<!-- IA32_ARCH_CAPABILITIES features -->
<feature name='rdctl-no'>
<msr index='0x10a' edx='0x00000000' eax='0x00000001'/>
@@ -782,11 +787,6 @@
<msr index='0x10a' edx='0x00000000' eax='0x04000000'/>
</feature>
- <!-- IA32_CORE_CAPABILITIES features -->
- <feature name='split-lock-detect'>
- <msr index='0xcf' edx='0x00000000' eax='0x00000020'/>
- </feature>
-
<feature name='vmx-ins-outs'>
<msr index='0x480' edx='0x00400000' eax='0x00000000'/>
</feature>
@@ -880,22 +880,6 @@
<msr index='0x48b' edx='0x00000000' eax='0x04000000'/>
</feature>
- <feature name='vmx-invvpid'>
- <msr index='0x48c' edx='0x00000001' eax='0x00000000'/>
- </feature>
- <feature name='vmx-invvpid-single-addr'>
- <msr index='0x48c' edx='0x00000100' eax='0x00000000'/>
- </feature>
- <feature name='vmx-invvpid-single-context'>
- <msr index='0x48c' edx='0x00000200' eax='0x00000000'/>
- </feature>
- <feature name='vmx-invvpid-all-context'>
- <msr index='0x48c' edx='0x00000400' eax='0x00000000'/>
- </feature>
- <feature name='vmx-invvpid-single-context-noglobals'>
- <alias name='vmx-invept-single-context-noglobals'
source='qemu'/>
- <msr index='0x48c' edx='0x00000800' eax='0x00000000'/>
- </feature>
<feature name='vmx-ept-execonly'>
<msr index='0x48c' edx='0x00000000' eax='0x00000001'/>
</feature>
@@ -932,6 +916,22 @@
<feature name='vmx-invept-all-context'>
<msr index='0x48c' edx='0x00000000' eax='0x04000000'/>
</feature>
+ <feature name='vmx-invvpid'>
+ <msr index='0x48c' edx='0x00000001' eax='0x00000000'/>
+ </feature>
+ <feature name='vmx-invvpid-single-addr'>
+ <msr index='0x48c' edx='0x00000100' eax='0x00000000'/>
+ </feature>
+ <feature name='vmx-invvpid-single-context'>
+ <msr index='0x48c' edx='0x00000200' eax='0x00000000'/>
+ </feature>
+ <feature name='vmx-invvpid-all-context'>
+ <msr index='0x48c' edx='0x00000400' eax='0x00000000'/>
+ </feature>
+ <feature name='vmx-invvpid-single-context-noglobals'>
+ <alias name='vmx-invept-single-context-noglobals'
source='qemu'/>
+ <msr index='0x48c' edx='0x00000800' eax='0x00000000'/>
+ </feature>
<feature name='vmx-intr-exit'>
<msr index='0x48d' edx='0x00000000' eax='0x00000001'/>
diff --git a/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-migratable.xml
b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-migratable.xml
index f5846b1619..6730ad9cb4 100644
--- a/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-migratable.xml
+++ b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-migratable.xml
@@ -1,8 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='allow'>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'/>
@@ -11,4 +9,6 @@
<feature policy='require' name='osxsave'/>
<feature policy='require' name='avx'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='vme'/>
+ <feature policy='require' name='ss'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-result.xml
b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-result.xml
index 166833276c..40e2dfc8fe 100644
--- a/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-result.xml
+++ b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-result.xml
@@ -1,8 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='allow'>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'/>
@@ -11,5 +9,7 @@
<feature policy='require' name='osxsave'/>
<feature policy='require' name='avx'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='vme'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-baseline-features-result.xml
b/tests/cputestdata/x86_64-baseline-features-result.xml
index 1461a5b430..2e58f84acf 100644
--- a/tests/cputestdata/x86_64-baseline-features-result.xml
+++ b/tests/cputestdata/x86_64-baseline-features-result.xml
@@ -1,8 +1,6 @@
<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'/>
@@ -11,4 +9,6 @@
<feature policy='require' name='osxsave'/>
<feature policy='require' name='avx'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='vme'/>
+ <feature policy='require' name='ss'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml
b/tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml
index 8401e53d30..3a2118522e 100644
--- a/tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml
@@ -1,13 +1,11 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Opteron_G5</model>
<vendor>AMD</vendor>
- <feature policy='require' name='vme'/>
- <feature policy='require' name='ht'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='osxsave'/>
+ <feature policy='require' name='vme'/>
+ <feature policy='require' name='ht'/>
<feature policy='require' name='bmi1'/>
- <feature policy='require' name='mmxext'/>
- <feature policy='require' name='fxsr_opt'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='extapic'/>
<feature policy='require' name='cr8legacy'/>
@@ -21,6 +19,8 @@
<feature policy='require' name='topoext'/>
<feature policy='require' name='perfctr_core'/>
<feature policy='require' name='perfctr_nb'/>
+ <feature policy='require' name='mmxext'/>
+ <feature policy='require' name='fxsr_opt'/>
<feature policy='require' name='invtsc'/>
<feature policy='require' name='npt'/>
<feature policy='require' name='lbrv'/>
diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml
b/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml
index 220dfb6467..e4a455df15 100644
--- a/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml
@@ -3,13 +3,11 @@
<model>Opteron_G5</model>
<vendor>AMD</vendor>
<signature family='21' model='16' stepping='1'/>
- <feature name='vme'/>
- <feature name='ht'/>
<feature name='monitor'/>
<feature name='osxsave'/>
+ <feature name='vme'/>
+ <feature name='ht'/>
<feature name='bmi1'/>
- <feature name='mmxext'/>
- <feature name='fxsr_opt'/>
<feature name='cmp_legacy'/>
<feature name='extapic'/>
<feature name='cr8legacy'/>
@@ -23,6 +21,8 @@
<feature name='topoext'/>
<feature name='perfctr_core'/>
<feature name='perfctr_nb'/>
+ <feature name='mmxext'/>
+ <feature name='fxsr_opt'/>
<feature name='invtsc'/>
<feature name='npt'/>
<feature name='lbrv'/>
diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml
b/tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml
index 51e6d2b660..a62263c8bf 100644
--- a/tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml
@@ -1,18 +1,18 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Opteron_G5</model>
<vendor>AMD</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='x2apic'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='vme'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='bmi1'/>
- <feature policy='require' name='mmxext'/>
- <feature policy='require' name='fxsr_opt'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='cr8legacy'/>
<feature policy='require' name='osvw'/>
+ <feature policy='require' name='mmxext'/>
+ <feature policy='require' name='fxsr_opt'/>
<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='rdtscp'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml
b/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml
index d2f7a79074..977607e7fc 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml
@@ -1,13 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>n270</model>
<vendor>Intel</vendor>
- <feature policy='require' name='pse36'/>
- <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='dtes64'/>
<feature policy='require' name='ds_cpl'/>
<feature policy='require' name='tm2'/>
@@ -15,6 +8,13 @@
<feature policy='require' name='xtpr'/>
<feature policy='require' name='pdcm'/>
<feature policy='require' name='movbe'/>
- <feature policy='require' name='lm'/>
+ <feature policy='require' name='pse36'/>
+ <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='lahf_lm'/>
+ <feature policy='require' name='lm'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml
b/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml
index 3c8a005122..1e9c6782e9 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml
@@ -3,13 +3,6 @@
<model>n270</model>
<vendor>Intel</vendor>
<signature family='6' model='28' stepping='10'/>
- <feature name='pse36'/>
- <feature name='ds'/>
- <feature name='acpi'/>
- <feature name='ss'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='ds_cpl'/>
<feature name='tm2'/>
@@ -17,6 +10,13 @@
<feature name='xtpr'/>
<feature name='pdcm'/>
<feature name='movbe'/>
- <feature name='lm'/>
+ <feature name='pse36'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='lahf_lm'/>
+ <feature name='lm'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml
b/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml
index 779faf6cef..7fbaa2d189 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml
@@ -1,12 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>n270</model>
<vendor>Intel</vendor>
- <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='dtes64'/>
<feature policy='require' name='ds_cpl'/>
<feature policy='require' name='est'/>
@@ -15,7 +9,13 @@
<feature policy='require' name='xtpr'/>
<feature policy='require' name='pdcm'/>
<feature policy='require' name='movbe'/>
+ <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='lahf_lm'/>
<feature policy='require' name='syscall'/>
<feature policy='require' name='lm'/>
- <feature policy='require' name='lahf_lm'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml
b/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml
index 1f4eb7b727..4856cf53c4 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml
@@ -3,12 +3,6 @@
<model>n270</model>
<vendor>Intel</vendor>
<signature family='6' model='28' stepping='10'/>
- <feature name='ds'/>
- <feature name='acpi'/>
- <feature name='ss'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='ds_cpl'/>
<feature name='est'/>
@@ -17,7 +11,13 @@
<feature name='xtpr'/>
<feature name='pdcm'/>
<feature name='movbe'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
+ <feature name='lahf_lm'/>
<feature name='syscall'/>
<feature name='lm'/>
- <feature name='lahf_lm'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml
b/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml
index c595f04e32..9077b95178 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml
@@ -1,12 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Snowridge</model>
<vendor>Intel</vendor>
- <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='dtes64'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ds_cpl'/>
@@ -17,6 +11,12 @@
<feature policy='require' name='xtpr'/>
<feature policy='require' name='pdcm'/>
<feature policy='require' name='osxsave'/>
+ <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='tsc_adjust'/>
<feature policy='require' name='cmt'/>
<feature policy='require' name='intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
index 074342911a..c830b8a649 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
@@ -3,13 +3,6 @@
<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'/>
@@ -26,6 +19,13 @@
<feature name='xsave'/>
<feature name='osxsave'/>
<feature name='rdrand'/>
+ <feature name='vme'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='arat'/>
<feature name='fsgsbase'/>
<feature name='tsc_adjust'/>
@@ -58,14 +58,14 @@
<feature name='mbm_total'/>
<feature name='mbm_local'/>
<feature name='intel-pt-lip'/>
- <feature name='rdtscp'/>
<feature name='3dnowprefetch'/>
+ <feature name='rdtscp'/>
<feature name='invtsc'/>
+ <feature name='split-lock-detect'/>
<feature name='rdctl-no'/>
<feature name='ibrs-all'/>
<feature name='skip-l1dfl-vmentry'/>
<feature name='mds-no'/>
<feature name='pschange-mc-no'/>
<feature name='taa-no'/>
- <feature name='split-lock-detect'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml
b/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml
index ff7ac5b391..b334e9062c 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml
@@ -1,10 +1,10 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Snowridge</model>
<vendor>Intel</vendor>
- <feature policy='require' name='ss'/>
<feature policy='require' name='vmx'/>
<feature policy='require' name='pdcm'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='rdpid'/>
<feature policy='require' name='md-clear'/>
@@ -39,9 +39,6 @@
<feature policy='require' name='vmx-rdseed-exit'/>
<feature policy='require' name='vmx-pml'/>
<feature policy='require' name='vmx-xsaves'/>
- <feature policy='require' name='vmx-invvpid'/>
- <feature policy='require' name='vmx-invvpid-single-addr'/>
- <feature policy='require' name='vmx-invvpid-all-context'/>
<feature policy='require' name='vmx-ept-execonly'/>
<feature policy='require' name='vmx-page-walk-4'/>
<feature policy='require' name='vmx-ept-2mb'/>
@@ -50,6 +47,9 @@
<feature policy='require' name='vmx-eptad'/>
<feature policy='require' name='vmx-invept-single-context'/>
<feature policy='require' name='vmx-invept-all-context'/>
+ <feature policy='require' name='vmx-invvpid'/>
+ <feature policy='require' name='vmx-invvpid-single-addr'/>
+ <feature policy='require' name='vmx-invvpid-all-context'/>
<feature policy='require' name='vmx-intr-exit'/>
<feature policy='require' name='vmx-nmi-exit'/>
<feature policy='require' name='vmx-vnmi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml
b/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml
index ff516a47c7..b878e13c62 100644
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml
@@ -1,12 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Cooperlake</model>
<vendor>Intel</vendor>
- <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='dtes64'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ds_cpl'/>
@@ -18,6 +12,12 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='dca'/>
<feature policy='require' name='osxsave'/>
+ <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='tsc_adjust'/>
<feature policy='require' name='cmt'/>
<feature policy='require' name='mpx'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
b/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
index 8dfc62a5c1..9ff74bc029 100644
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
@@ -3,12 +3,6 @@
<model>Cooperlake</model>
<vendor>Intel</vendor>
<signature family='6' model='85' stepping='11'/>
- <feature name='ds'/>
- <feature name='acpi'/>
- <feature name='ss'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -20,6 +14,12 @@
<feature name='pdcm'/>
<feature name='dca'/>
<feature name='osxsave'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
<feature name='mpx'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml
b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml
index 9dbb92e74f..822deb46cf 100644
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml
@@ -1,9 +1,9 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Cooperlake</model>
<vendor>Intel</vendor>
- <feature policy='require' name='ss'/>
<feature policy='require' name='vmx'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='mpx'/>
<feature policy='require' name='umip'/>
@@ -35,9 +35,6 @@
<feature policy='require' name='vmx-rdseed-exit'/>
<feature policy='require' name='vmx-pml'/>
<feature policy='require' name='vmx-xsaves'/>
- <feature policy='require' name='vmx-invvpid'/>
- <feature policy='require' name='vmx-invvpid-single-addr'/>
- <feature policy='require' name='vmx-invvpid-all-context'/>
<feature policy='require' name='vmx-ept-execonly'/>
<feature policy='require' name='vmx-page-walk-4'/>
<feature policy='require' name='vmx-ept-2mb'/>
@@ -46,6 +43,9 @@
<feature policy='require' name='vmx-eptad'/>
<feature policy='require' name='vmx-invept-single-context'/>
<feature policy='require' name='vmx-invept-all-context'/>
+ <feature policy='require' name='vmx-invvpid'/>
+ <feature policy='require' name='vmx-invvpid-single-addr'/>
+ <feature policy='require' name='vmx-invvpid-all-context'/>
<feature policy='require' name='vmx-intr-exit'/>
<feature policy='require' name='vmx-nmi-exit'/>
<feature policy='require' name='vmx-vnmi'/>
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..ab2c85eede 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml
@@ -1,13 +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'/>
- <feature policy='require' name='ht'/>
- <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'/>
@@ -19,6 +12,13 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='pcid'/>
<feature policy='require' name='osxsave'/>
+ <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='arat'/>
<feature policy='require' name='xsaveopt'/>
<feature policy='require' name='invtsc'/>
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..4d721b4d07 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml
@@ -3,13 +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'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -21,6 +14,13 @@
<feature name='pdcm'/>
<feature name='pcid'/>
<feature name='osxsave'/>
+ <feature name='vme'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='arat'/>
<feature name='xsaveopt'/>
<feature name='invtsc'/>
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..e83229f5eb 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-json.xml
@@ -1,10 +1,10 @@
<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='vme'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='xsaveopt'/>
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..ab2c85eede 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml
@@ -1,13 +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'/>
- <feature policy='require' name='ht'/>
- <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'/>
@@ -19,6 +12,13 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='pcid'/>
<feature policy='require' name='osxsave'/>
+ <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='arat'/>
<feature policy='require' name='xsaveopt'/>
<feature policy='require' name='invtsc'/>
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..4d721b4d07 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml
@@ -3,13 +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'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -21,6 +14,13 @@
<feature name='pdcm'/>
<feature name='pcid'/>
<feature name='osxsave'/>
+ <feature name='vme'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='arat'/>
<feature name='xsaveopt'/>
<feature name='invtsc'/>
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..e83229f5eb 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml
@@ -1,10 +1,10 @@
<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='vme'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='xsaveopt'/>
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..e06bafe12a 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml
@@ -1,13 +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'/>
- <feature policy='require' name='ht'/>
- <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'/>
@@ -20,9 +13,16 @@
<feature policy='require' name='osxsave'/>
<feature policy='require' name='f16c'/>
<feature policy='require' name='rdrand'/>
+ <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='arat'/>
<feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='pdpe1gb'/>
<feature policy='require' name='abm'/>
+ <feature policy='require' name='pdpe1gb'/>
<feature policy='require' name='invtsc'/>
</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..bb15f84c47 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
@@ -3,13 +3,6 @@
<model>Haswell-noTSX</model>
<vendor>Intel</vendor>
<signature family='6' model='60' stepping='3'/>
- <feature name='vme'/>
- <feature name='ds'/>
- <feature name='acpi'/>
- <feature name='ss'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -22,9 +15,16 @@
<feature name='osxsave'/>
<feature name='f16c'/>
<feature name='rdrand'/>
+ <feature name='vme'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='arat'/>
<feature name='tsc_adjust'/>
- <feature name='pdpe1gb'/>
<feature name='abm'/>
+ <feature name='pdpe1gb'/>
<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..6c8aa67f54 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,14 @@
<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='vme'/>
+ <feature policy='require' name='ss'/>
<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='pdpe1gb'/>
</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..8290d2773d 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-650-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-650-guest.xml
@@ -1,13 +1,6 @@
<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'/>
@@ -18,6 +11,13 @@
<feature policy='require' name='tm2'/>
<feature policy='require' name='xtpr'/>
<feature policy='require' name='pdcm'/>
+ <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='arat'/>
<feature policy='require' name='rdtscp'/>
<feature policy='require' name='invtsc'/>
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..c074a5c6ec 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml
@@ -3,13 +3,6 @@
<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'/>
@@ -20,6 +13,13 @@
<feature name='tm2'/>
<feature name='xtpr'/>
<feature name='pdcm'/>
+ <feature name='vme'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='arat'/>
<feature name='rdtscp'/>
<feature name='invtsc'/>
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..76d96fc1c5 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-650-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-650-json.xml
@@ -1,12 +1,12 @@
<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='vme'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='rdtscp'/>
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..4cc7ca2d90 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
@@ -1,12 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Skylake-Client</model>
<vendor>Intel</vendor>
- <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='dtes64'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ds_cpl'/>
@@ -17,6 +11,12 @@
<feature policy='require' name='xtpr'/>
<feature policy='require' name='pdcm'/>
<feature policy='require' name='osxsave'/>
+ <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='tsc_adjust'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='intel-pt'/>
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..52ae60e86c 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
@@ -3,12 +3,6 @@
<model>Skylake-Client</model>
<vendor>Intel</vendor>
<signature family='6' model='94' stepping='3'/>
- <feature name='ds'/>
- <feature name='acpi'/>
- <feature name='ss'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -19,6 +13,12 @@
<feature name='xtpr'/>
<feature name='pdcm'/>
<feature name='osxsave'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='tsc_adjust'/>
<feature name='clflushopt'/>
<feature name='intel-pt'/>
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..8c505d0d8f 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-json.xml
@@ -1,8 +1,8 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Skylake-Client</model>
<vendor>Intel</vendor>
- <feature policy='require' name='ss'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='xsaves'/>
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..ab2c85eede 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml
@@ -1,13 +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'/>
- <feature policy='require' name='ht'/>
- <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'/>
@@ -19,6 +12,13 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='pcid'/>
<feature policy='require' name='osxsave'/>
+ <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='arat'/>
<feature policy='require' name='xsaveopt'/>
<feature policy='require' name='invtsc'/>
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..4d721b4d07 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml
@@ -3,13 +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'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -21,6 +14,13 @@
<feature name='pdcm'/>
<feature name='pcid'/>
<feature name='osxsave'/>
+ <feature name='vme'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='arat'/>
<feature name='xsaveopt'/>
<feature name='invtsc'/>
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..e83229f5eb 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml
@@ -1,10 +1,10 @@
<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='vme'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='xsaveopt'/>
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..ca783d1809 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,13 +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'/>
- <feature policy='require' name='ht'/>
- <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'/>
@@ -19,6 +12,13 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='pcid'/>
<feature policy='require' name='osxsave'/>
+ <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='arat'/>
<feature policy='require' name='invtsc'/>
<feature policy='disable' name='xsaveopt'/>
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..32612c78e7 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
@@ -3,13 +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'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -21,6 +14,13 @@
<feature name='pdcm'/>
<feature name='pcid'/>
<feature name='osxsave'/>
+ <feature name='vme'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='arat'/>
<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..584fb06e51 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,10 +1,10 @@
<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='vme'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='disable' name='xsaveopt'/>
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..b9490e69d2 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml
@@ -1,12 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>IvyBridge</model>
<vendor>Intel</vendor>
- <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='dtes64'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ds_cpl'/>
@@ -18,6 +12,12 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='pcid'/>
<feature policy='require' name='osxsave'/>
+ <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='arat'/>
<feature policy='require' name='xsaveopt'/>
<feature policy='require' name='invtsc'/>
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..0a31450732 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml
@@ -3,12 +3,6 @@
<model>IvyBridge</model>
<vendor>Intel</vendor>
<signature family='6' model='58' stepping='9'/>
- <feature name='ds'/>
- <feature name='acpi'/>
- <feature name='ss'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -20,6 +14,12 @@
<feature name='pdcm'/>
<feature name='pcid'/>
<feature name='osxsave'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='arat'/>
<feature name='xsaveopt'/>
<feature name='invtsc'/>
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..94bb757b17 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml
@@ -1,12 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>IvyBridge</model>
<vendor>Intel</vendor>
- <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='dtes64'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ds_cpl'/>
@@ -18,6 +12,12 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='pcid'/>
<feature policy='require' name='osxsave'/>
+ <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='arat'/>
<feature policy='require' name='invtsc'/>
</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..126eb09786 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml
@@ -3,12 +3,6 @@
<model>IvyBridge</model>
<vendor>Intel</vendor>
<signature family='6' model='58' stepping='9'/>
- <feature name='ds'/>
- <feature name='acpi'/>
- <feature name='ss'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -20,6 +14,12 @@
<feature name='pdcm'/>
<feature name='pcid'/>
<feature name='osxsave'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='arat'/>
<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..d6f88204de 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml
@@ -1,10 +1,10 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>IvyBridge</model>
<vendor>Intel</vendor>
- <feature policy='require' name='ss'/>
<feature policy='require' name='vmx'/>
<feature policy='require' name='pcid'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='xsaveopt'/>
</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..b9490e69d2 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml
@@ -1,12 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>IvyBridge</model>
<vendor>Intel</vendor>
- <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='dtes64'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ds_cpl'/>
@@ -18,6 +12,12 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='pcid'/>
<feature policy='require' name='osxsave'/>
+ <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='arat'/>
<feature policy='require' name='xsaveopt'/>
<feature policy='require' name='invtsc'/>
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..0a31450732 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml
@@ -3,12 +3,6 @@
<model>IvyBridge</model>
<vendor>Intel</vendor>
<signature family='6' model='58' stepping='9'/>
- <feature name='ds'/>
- <feature name='acpi'/>
- <feature name='ss'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -20,6 +14,12 @@
<feature name='pdcm'/>
<feature name='pcid'/>
<feature name='osxsave'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='arat'/>
<feature name='xsaveopt'/>
<feature name='invtsc'/>
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..3f7026d468 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-json.xml
@@ -1,9 +1,9 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>IvyBridge</model>
<vendor>Intel</vendor>
- <feature policy='require' name='ss'/>
<feature policy='require' name='pcid'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='xsaveopt'/>
</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..618b266e41 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-guest.xml
@@ -1,13 +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'/>
- <feature policy='require' name='ht'/>
- <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'/>
@@ -19,11 +12,18 @@
<feature policy='require' name='osxsave'/>
<feature policy='require' name='f16c'/>
<feature policy='require' name='rdrand'/>
+ <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='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='pdpe1gb'/>
<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..0e994e0623 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml
@@ -3,13 +3,6 @@
<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'/>
@@ -28,6 +21,13 @@
<feature name='avx'/>
<feature name='f16c'/>
<feature name='rdrand'/>
+ <feature name='vme'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='arat'/>
<feature name='fsgsbase'/>
<feature name='tsc_adjust'/>
@@ -38,8 +38,8 @@
<feature name='erms'/>
<feature name='invpcid'/>
<feature name='xsaveopt'/>
+ <feature name='abm'/>
<feature name='pdpe1gb'/>
<feature name='rdtscp'/>
- <feature name='abm'/>
<feature name='invtsc'/>
</cpu>
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..c56852e96c 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,15 @@
<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='vme'/>
+ <feature policy='require' name='ss'/>
<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='pdpe1gb'/>
</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..a5cf3a8ebb 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml
@@ -1,13 +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'/>
- <feature policy='require' name='ht'/>
- <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'/>
@@ -20,10 +13,17 @@
<feature policy='require' name='osxsave'/>
<feature policy='require' name='f16c'/>
<feature policy='require' name='rdrand'/>
+ <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='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='pdpe1gb'/>
<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..fbcb3bd63f 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
@@ -3,13 +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'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -22,10 +15,17 @@
<feature name='osxsave'/>
<feature name='f16c'/>
<feature name='rdrand'/>
+ <feature name='vme'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='arat'/>
<feature name='tsc_adjust'/>
<feature name='xsaveopt'/>
- <feature name='pdpe1gb'/>
<feature name='abm'/>
+ <feature name='pdpe1gb'/>
<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..c56852e96c 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,15 @@
<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='vme'/>
+ <feature policy='require' name='ss'/>
<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='pdpe1gb'/>
</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..da6e4f8a9b 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,13 +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'/>
- <feature policy='require' name='ht'/>
- <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'/>
@@ -20,11 +13,18 @@
<feature policy='require' name='osxsave'/>
<feature policy='require' name='f16c'/>
<feature policy='require' name='rdrand'/>
+ <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='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='pdpe1gb'/>
<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..32bfc2521e 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,13 +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'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -22,11 +15,18 @@
<feature name='osxsave'/>
<feature name='f16c'/>
<feature name='rdrand'/>
+ <feature name='vme'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='arat'/>
<feature name='tsc_adjust'/>
<feature name='intel-pt'/>
<feature name='xsaveopt'/>
- <feature name='pdpe1gb'/>
<feature name='abm'/>
+ <feature name='pdpe1gb'/>
<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..156765f312 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,14 @@
<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='vme'/>
+ <feature policy='require' name='ss'/>
<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='pdpe1gb'/>
</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..da6e4f8a9b 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
@@ -1,13 +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'/>
- <feature policy='require' name='ht'/>
- <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'/>
@@ -20,11 +13,18 @@
<feature policy='require' name='osxsave'/>
<feature policy='require' name='f16c'/>
<feature policy='require' name='rdrand'/>
+ <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='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='pdpe1gb'/>
<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..32bfc2521e 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
@@ -3,13 +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'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -22,11 +15,18 @@
<feature name='osxsave'/>
<feature name='f16c'/>
<feature name='rdrand'/>
+ <feature name='vme'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='arat'/>
<feature name='tsc_adjust'/>
<feature name='intel-pt'/>
<feature name='xsaveopt'/>
- <feature name='pdpe1gb'/>
<feature name='abm'/>
+ <feature name='pdpe1gb'/>
<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..2fe2645ee3 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,13 +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'/>
- <feature policy='require' name='ht'/>
- <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'/>
@@ -20,12 +13,19 @@
<feature policy='require' name='osxsave'/>
<feature policy='require' name='f16c'/>
<feature policy='require' name='rdrand'/>
+ <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='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='pdpe1gb'/>
<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..aeea45b444 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,13 +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'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -22,12 +15,19 @@
<feature name='osxsave'/>
<feature name='f16c'/>
<feature name='rdrand'/>
+ <feature name='vme'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<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='pdpe1gb'/>
<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..746165c496 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,15 @@
<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='vme'/>
+ <feature policy='require' name='ss'/>
<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='pdpe1gb'/>
</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..746165c496 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,15 @@
<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='vme'/>
+ <feature policy='require' name='ss'/>
<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='pdpe1gb'/>
</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..fa81abf661 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml
@@ -1,12 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
- <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='dtes64'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ds_cpl'/>
@@ -17,6 +11,12 @@
<feature policy='require' name='xtpr'/>
<feature policy='require' name='pdcm'/>
<feature policy='require' name='osxsave'/>
+ <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='tsc_adjust'/>
<feature policy='require' name='sgx'/>
<feature policy='require' name='clflushopt'/>
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..949e8de327 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
@@ -3,12 +3,6 @@
<model>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
<signature family='6' model='142' stepping='9'/>
- <feature name='ds'/>
- <feature name='acpi'/>
- <feature name='ss'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -19,6 +13,12 @@
<feature name='xtpr'/>
<feature name='pdcm'/>
<feature name='osxsave'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='tsc_adjust'/>
<feature name='sgx'/>
<feature name='clflushopt'/>
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..a0f4bc07bb 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml
@@ -1,9 +1,9 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
- <feature policy='require' name='ss'/>
<feature policy='require' name='vmx'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='umip'/>
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..073b099b76 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml
@@ -1,12 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Skylake-Client</model>
<vendor>Intel</vendor>
- <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='dtes64'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ds_cpl'/>
@@ -17,6 +11,12 @@
<feature policy='require' name='xtpr'/>
<feature policy='require' name='pdcm'/>
<feature policy='require' name='osxsave'/>
+ <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='tsc_adjust'/>
<feature policy='require' name='sgx'/>
<feature policy='require' name='clflushopt'/>
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..47294064f2 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
@@ -3,12 +3,6 @@
<model>Skylake-Client</model>
<vendor>Intel</vendor>
<signature family='6' model='158' stepping='9'/>
- <feature name='ds'/>
- <feature name='acpi'/>
- <feature name='ss'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -19,6 +13,12 @@
<feature name='xtpr'/>
<feature name='pdcm'/>
<feature name='osxsave'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='tsc_adjust'/>
<feature name='sgx'/>
<feature name='clflushopt'/>
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..f797656851 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-json.xml
@@ -1,8 +1,8 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Skylake-Client</model>
<vendor>Intel</vendor>
- <feature policy='require' name='ss'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='pdpe1gb'/>
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..bbf4ad6c60 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
@@ -1,12 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
- <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='dtes64'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ds_cpl'/>
@@ -16,6 +10,12 @@
<feature policy='require' name='xtpr'/>
<feature policy='require' name='pdcm'/>
<feature policy='require' name='osxsave'/>
+ <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='tsc_adjust'/>
<feature policy='require' name='sgx'/>
<feature policy='require' name='clflushopt'/>
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..e93b04aabd 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
@@ -3,12 +3,6 @@
<model>Skylake-Client-noTSX-IBRS</model>
<vendor>Intel</vendor>
<signature family='6' model='142' stepping='10'/>
- <feature name='ds'/>
- <feature name='acpi'/>
- <feature name='ss'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -18,6 +12,12 @@
<feature name='xtpr'/>
<feature name='pdcm'/>
<feature name='osxsave'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='tsc_adjust'/>
<feature name='sgx'/>
<feature name='clflushopt'/>
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 e933265248..685a3aa7e3 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
@@ -1,9 +1,9 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
- <feature policy='require' name='ss'/>
<feature policy='require' name='vmx'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='umip'/>
@@ -35,9 +35,6 @@
<feature policy='require' name='vmx-rdseed-exit'/>
<feature policy='require' name='vmx-pml'/>
<feature policy='require' name='vmx-xsaves'/>
- <feature policy='require' name='vmx-invvpid'/>
- <feature policy='require' name='vmx-invvpid-single-addr'/>
- <feature policy='require' name='vmx-invvpid-all-context'/>
<feature policy='require' name='vmx-ept-execonly'/>
<feature policy='require' name='vmx-page-walk-4'/>
<feature policy='require' name='vmx-ept-2mb'/>
@@ -46,6 +43,9 @@
<feature policy='require' name='vmx-eptad'/>
<feature policy='require' name='vmx-invept-single-context'/>
<feature policy='require' name='vmx-invept-all-context'/>
+ <feature policy='require' name='vmx-invvpid'/>
+ <feature policy='require' name='vmx-invvpid-single-addr'/>
+ <feature policy='require' name='vmx-invvpid-all-context'/>
<feature policy='require' name='vmx-intr-exit'/>
<feature policy='require' name='vmx-nmi-exit'/>
<feature policy='require' name='vmx-vnmi'/>
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..e1c1311bc2 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
@@ -1,12 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
- <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='dtes64'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ds_cpl'/>
@@ -17,6 +11,12 @@
<feature policy='require' name='xtpr'/>
<feature policy='require' name='pdcm'/>
<feature policy='require' name='osxsave'/>
+ <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='tsc_adjust'/>
<feature policy='require' name='sgx'/>
<feature policy='require' name='clflushopt'/>
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..6eb860d82a 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
@@ -3,12 +3,6 @@
<model>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
<signature family='6' model='158' stepping='10'/>
- <feature name='ds'/>
- <feature name='acpi'/>
- <feature name='ss'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -19,6 +13,12 @@
<feature name='xtpr'/>
<feature name='pdcm'/>
<feature name='osxsave'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='tsc_adjust'/>
<feature name='sgx'/>
<feature name='clflushopt'/>
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..02c671e5f1 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-json.xml
@@ -1,8 +1,8 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
- <feature policy='require' name='ss'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='umip'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core2-E6850-guest.xml
index 2392de6ce4..c5e2d6da7a 100644
--- a/tests/cputestdata/x86_64-cpuid-Core2-E6850-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core2-E6850-guest.xml
@@ -1,13 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Conroe</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='dtes64'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ds_cpl'/>
@@ -18,4 +11,11 @@
<feature policy='require' name='cx16'/>
<feature policy='require' name='xtpr'/>
<feature policy='require' name='pdcm'/>
+ <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'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml
b/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml
index e0ec4cd795..dae7f8846e 100644
--- a/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml
@@ -3,13 +3,6 @@
<model>Conroe</model>
<vendor>Intel</vendor>
<signature family='6' model='15' stepping='11'/>
- <feature name='vme'/>
- <feature name='ds'/>
- <feature name='acpi'/>
- <feature name='ss'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -20,4 +13,11 @@
<feature name='cx16'/>
<feature name='xtpr'/>
<feature name='pdcm'/>
+ <feature name='vme'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850-json.xml
b/tests/cputestdata/x86_64-cpuid-Core2-E6850-json.xml
index e4117c293f..735652acc2 100644
--- a/tests/cputestdata/x86_64-cpuid-Core2-E6850-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core2-E6850-json.xml
@@ -1,11 +1,11 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Conroe</model>
<vendor>Intel</vendor>
- <feature policy='require' name='vme'/>
- <feature policy='require' name='ss'/>
<feature policy='require' name='cx16'/>
<feature policy='require' name='x2apic'/>
<feature policy='require' name='tsc-deadline'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='vme'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='tsc_adjust'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-guest.xml
index aa151bc545..e69f8a6443 100644
--- a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-guest.xml
@@ -1,13 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Penryn</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='dtes64'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ds_cpl'/>
@@ -18,4 +11,11 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='xsave'/>
<feature policy='require' name='osxsave'/>
+ <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'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml
b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml
index 586b8e0f59..dac84ba5fc 100644
--- a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml
@@ -3,13 +3,6 @@
<model>Penryn</model>
<vendor>Intel</vendor>
<signature family='6' model='23' stepping='10'/>
- <feature name='vme'/>
- <feature name='ds'/>
- <feature name='acpi'/>
- <feature name='ss'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -20,4 +13,11 @@
<feature name='pdcm'/>
<feature name='xsave'/>
<feature name='osxsave'/>
+ <feature name='vme'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
</cpu>
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..a3d4534cff 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml
@@ -1,9 +1,9 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>EPYC-Rome</model>
<vendor>AMD</vendor>
- <feature policy='require' name='ht'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='osxsave'/>
+ <feature policy='require' name='ht'/>
<feature policy='require' name='cmt'/>
<feature policy='require' name='xsaves'/>
<feature policy='require' name='mbm_total'/>
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..7829e529e7 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
@@ -3,9 +3,9 @@
<model>EPYC-Rome</model>
<vendor>AMD</vendor>
<signature family='23' model='49' stepping='0'/>
- <feature name='ht'/>
<feature name='monitor'/>
<feature name='osxsave'/>
+ <feature name='ht'/>
<feature name='cmt'/>
<feature name='xsaves'/>
<feature name='mbm_total'/>
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..68fa956557 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,9 +1,9 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>EPYC</model>
<vendor>AMD</vendor>
- <feature policy='require' name='ht'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='osxsave'/>
+ <feature policy='require' name='ht'/>
<feature policy='require' name='xsaves'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='extapic'/>
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..d43aaef6ff 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
@@ -3,9 +3,9 @@
<model>EPYC</model>
<vendor>AMD</vendor>
<signature family='23' model='1' stepping='2'/>
- <feature name='ht'/>
<feature name='monitor'/>
<feature name='osxsave'/>
+ <feature name='ht'/>
<feature name='xsaves'/>
<feature name='cmp_legacy'/>
<feature name='extapic'/>
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..7960807d54 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
@@ -1,9 +1,9 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>EPYC-IBPB</model>
<vendor>AMD</vendor>
- <feature policy='require' name='ht'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='osxsave'/>
+ <feature policy='require' name='ht'/>
<feature policy='require' name='xsaves'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='extapic'/>
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..c5274892e9 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
@@ -3,9 +3,9 @@
<model>EPYC-IBPB</model>
<vendor>AMD</vendor>
<signature family='23' model='1' stepping='2'/>
- <feature name='ht'/>
<feature name='monitor'/>
<feature name='osxsave'/>
+ <feature name='ht'/>
<feature name='xsaves'/>
<feature name='cmp_legacy'/>
<feature name='extapic'/>
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..a48cec96c0 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,7 +8,7 @@
<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='rdtscp'/>
<feature policy='disable' name='monitor'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml
b/tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml
index ee34ea8547..1adbaaa499 100644
--- a/tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml
@@ -1,12 +1,10 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Opteron_G4</model>
<vendor>AMD</vendor>
- <feature policy='require' name='vme'/>
- <feature policy='require' name='ht'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='osxsave'/>
- <feature policy='require' name='mmxext'/>
- <feature policy='require' name='fxsr_opt'/>
+ <feature policy='require' name='vme'/>
+ <feature policy='require' name='ht'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='extapic'/>
<feature policy='require' name='cr8legacy'/>
@@ -19,6 +17,8 @@
<feature policy='require' name='topoext'/>
<feature policy='require' name='perfctr_core'/>
<feature policy='require' name='perfctr_nb'/>
+ <feature policy='require' name='mmxext'/>
+ <feature policy='require' name='fxsr_opt'/>
<feature policy='require' name='invtsc'/>
<feature policy='require' name='npt'/>
<feature policy='require' name='lbrv'/>
diff --git a/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml
b/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml
index 4fb2d3978b..d8c6a8ac0f 100644
--- a/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml
@@ -3,12 +3,10 @@
<model>Opteron_G4</model>
<vendor>AMD</vendor>
<signature family='21' model='1' stepping='2'/>
- <feature name='vme'/>
- <feature name='ht'/>
<feature name='monitor'/>
<feature name='osxsave'/>
- <feature name='mmxext'/>
- <feature name='fxsr_opt'/>
+ <feature name='vme'/>
+ <feature name='ht'/>
<feature name='cmp_legacy'/>
<feature name='extapic'/>
<feature name='cr8legacy'/>
@@ -21,6 +19,8 @@
<feature name='topoext'/>
<feature name='perfctr_core'/>
<feature name='perfctr_nb'/>
+ <feature name='mmxext'/>
+ <feature name='fxsr_opt'/>
<feature name='invtsc'/>
<feature name='npt'/>
<feature name='lbrv'/>
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..69124529bf 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,9 +1,9 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Dhyana</model>
<vendor>Hygon</vendor>
- <feature policy='require' name='ht'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='osxsave'/>
+ <feature policy='require' name='ht'/>
<feature policy='require' name='xsaves'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='extapic'/>
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..8eb4095556 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
@@ -3,9 +3,9 @@
<model>Dhyana</model>
<vendor>Hygon</vendor>
<signature family='24' model='0' stepping='1'/>
- <feature name='ht'/>
<feature name='monitor'/>
<feature name='osxsave'/>
+ <feature name='ht'/>
<feature name='xsaves'/>
<feature name='cmp_legacy'/>
<feature name='extapic'/>
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..77d66956f1 100644
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
@@ -1,12 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Icelake-Server</model>
<vendor>Intel</vendor>
- <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='dtes64'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ds_cpl'/>
@@ -18,6 +12,12 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='dca'/>
<feature policy='require' name='osxsave'/>
+ <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='tsc_adjust'/>
<feature policy='require' name='sgx'/>
<feature policy='require' name='cmt'/>
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..6cb3a28910 100644
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
@@ -3,12 +3,6 @@
<model>Icelake-Server</model>
<vendor>Intel</vendor>
<signature family='6' model='106' stepping='0'/>
- <feature name='ds'/>
- <feature name='acpi'/>
- <feature name='ss'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -20,6 +14,12 @@
<feature name='pdcm'/>
<feature name='dca'/>
<feature name='osxsave'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='tsc_adjust'/>
<feature name='sgx'/>
<feature name='cmt'/>
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..2eded58846 100644
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-json.xml
@@ -1,8 +1,8 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Icelake-Server</model>
<vendor>Intel</vendor>
- <feature policy='require' name='ss'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='avx512ifma'/>
<feature policy='require' name='sha-ni'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml
b/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml
index 99c6420579..881f025393 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml
@@ -1,20 +1,20 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Opteron_G3</model>
<vendor>AMD</vendor>
+ <feature policy='require' name='monitor'/>
<feature policy='require' name='vme'/>
<feature policy='require' name='ht'/>
- <feature policy='require' name='monitor'/>
- <feature policy='require' name='mmxext'/>
- <feature policy='require' name='fxsr_opt'/>
- <feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='3dnowext'/>
- <feature policy='require' name='3dnow'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='extapic'/>
<feature policy='require' name='cr8legacy'/>
<feature policy='require' name='3dnowprefetch'/>
<feature policy='require' name='osvw'/>
<feature policy='require' name='ibs'/>
+ <feature policy='require' name='mmxext'/>
+ <feature policy='require' name='fxsr_opt'/>
+ <feature policy='require' name='pdpe1gb'/>
+ <feature policy='require' name='3dnowext'/>
+ <feature policy='require' name='3dnow'/>
<feature policy='require' name='invtsc'/>
<feature policy='require' name='npt'/>
<feature policy='require' name='lbrv'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
b/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
index 7b0b3dfe6a..53b98713e5 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
@@ -3,20 +3,20 @@
<model>Opteron_G3</model>
<vendor>AMD</vendor>
<signature family='16' model='2' stepping='3'/>
+ <feature name='monitor'/>
<feature name='vme'/>
<feature name='ht'/>
- <feature name='monitor'/>
- <feature name='mmxext'/>
- <feature name='fxsr_opt'/>
- <feature name='pdpe1gb'/>
- <feature name='3dnowext'/>
- <feature name='3dnow'/>
<feature name='cmp_legacy'/>
<feature name='extapic'/>
<feature name='cr8legacy'/>
<feature name='3dnowprefetch'/>
<feature name='osvw'/>
<feature name='ibs'/>
+ <feature name='mmxext'/>
+ <feature name='fxsr_opt'/>
+ <feature name='pdpe1gb'/>
+ <feature name='3dnowext'/>
+ <feature name='3dnow'/>
<feature name='invtsc'/>
<feature name='npt'/>
<feature name='lbrv'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml
b/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml
index 99c6420579..881f025393 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml
@@ -1,20 +1,20 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Opteron_G3</model>
<vendor>AMD</vendor>
+ <feature policy='require' name='monitor'/>
<feature policy='require' name='vme'/>
<feature policy='require' name='ht'/>
- <feature policy='require' name='monitor'/>
- <feature policy='require' name='mmxext'/>
- <feature policy='require' name='fxsr_opt'/>
- <feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='3dnowext'/>
- <feature policy='require' name='3dnow'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='extapic'/>
<feature policy='require' name='cr8legacy'/>
<feature policy='require' name='3dnowprefetch'/>
<feature policy='require' name='osvw'/>
<feature policy='require' name='ibs'/>
+ <feature policy='require' name='mmxext'/>
+ <feature policy='require' name='fxsr_opt'/>
+ <feature policy='require' name='pdpe1gb'/>
+ <feature policy='require' name='3dnowext'/>
+ <feature policy='require' name='3dnow'/>
<feature policy='require' name='invtsc'/>
<feature policy='require' name='npt'/>
<feature policy='require' name='lbrv'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
b/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
index 7b0b3dfe6a..53b98713e5 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
@@ -3,20 +3,20 @@
<model>Opteron_G3</model>
<vendor>AMD</vendor>
<signature family='16' model='2' stepping='3'/>
+ <feature name='monitor'/>
<feature name='vme'/>
<feature name='ht'/>
- <feature name='monitor'/>
- <feature name='mmxext'/>
- <feature name='fxsr_opt'/>
- <feature name='pdpe1gb'/>
- <feature name='3dnowext'/>
- <feature name='3dnow'/>
<feature name='cmp_legacy'/>
<feature name='extapic'/>
<feature name='cr8legacy'/>
<feature name='3dnowprefetch'/>
<feature name='osvw'/>
<feature name='ibs'/>
+ <feature name='mmxext'/>
+ <feature name='fxsr_opt'/>
+ <feature name='pdpe1gb'/>
+ <feature name='3dnowext'/>
+ <feature name='3dnow'/>
<feature name='invtsc'/>
<feature name='npt'/>
<feature name='lbrv'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml
b/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml
index d874bfc049..5fc5010160 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml
@@ -1,19 +1,19 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Opteron_G3</model>
<vendor>AMD</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='x2apic'/>
<feature policy='require' name='tsc-deadline'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='vme'/>
+ <feature policy='require' name='cmp_legacy'/>
+ <feature policy='require' name='cr8legacy'/>
+ <feature policy='require' name='3dnowprefetch'/>
+ <feature policy='require' name='osvw'/>
<feature policy='require' name='mmxext'/>
<feature policy='require' name='fxsr_opt'/>
<feature policy='require' name='pdpe1gb'/>
<feature policy='require' name='3dnowext'/>
<feature policy='require' name='3dnow'/>
- <feature policy='require' name='cmp_legacy'/>
- <feature policy='require' name='cr8legacy'/>
- <feature policy='require' name='3dnowprefetch'/>
- <feature policy='require' name='osvw'/>
<feature policy='require' name='npt'/>
<feature policy='disable' name='rdtscp'/>
<feature policy='disable' name='monitor'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml
b/tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml
index ee34ea8547..1adbaaa499 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml
@@ -1,12 +1,10 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Opteron_G4</model>
<vendor>AMD</vendor>
- <feature policy='require' name='vme'/>
- <feature policy='require' name='ht'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='osxsave'/>
- <feature policy='require' name='mmxext'/>
- <feature policy='require' name='fxsr_opt'/>
+ <feature policy='require' name='vme'/>
+ <feature policy='require' name='ht'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='extapic'/>
<feature policy='require' name='cr8legacy'/>
@@ -19,6 +17,8 @@
<feature policy='require' name='topoext'/>
<feature policy='require' name='perfctr_core'/>
<feature policy='require' name='perfctr_nb'/>
+ <feature policy='require' name='mmxext'/>
+ <feature policy='require' name='fxsr_opt'/>
<feature policy='require' name='invtsc'/>
<feature policy='require' name='npt'/>
<feature policy='require' name='lbrv'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml
b/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml
index 4fb2d3978b..d8c6a8ac0f 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml
@@ -3,12 +3,10 @@
<model>Opteron_G4</model>
<vendor>AMD</vendor>
<signature family='21' model='1' stepping='2'/>
- <feature name='vme'/>
- <feature name='ht'/>
<feature name='monitor'/>
<feature name='osxsave'/>
- <feature name='mmxext'/>
- <feature name='fxsr_opt'/>
+ <feature name='vme'/>
+ <feature name='ht'/>
<feature name='cmp_legacy'/>
<feature name='extapic'/>
<feature name='cr8legacy'/>
@@ -21,6 +19,8 @@
<feature name='topoext'/>
<feature name='perfctr_core'/>
<feature name='perfctr_nb'/>
+ <feature name='mmxext'/>
+ <feature name='fxsr_opt'/>
<feature name='invtsc'/>
<feature name='npt'/>
<feature name='lbrv'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml
b/tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml
index abfc8db290..9ebdddcc8d 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml
@@ -1,19 +1,19 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Opteron_G4</model>
<vendor>AMD</vendor>
- <feature policy='require' name='vme'/>
<feature policy='require' name='x2apic'/>
<feature policy='require' name='tsc-deadline'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='vme'/>
<feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
- <feature policy='require' name='mmxext'/>
- <feature policy='require' name='fxsr_opt'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='cr8legacy'/>
<feature policy='require' name='osvw'/>
+ <feature policy='require' name='mmxext'/>
+ <feature policy='require' name='fxsr_opt'/>
<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='rdtscp'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml
b/tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml
index ee34ea8547..1adbaaa499 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml
@@ -1,12 +1,10 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Opteron_G4</model>
<vendor>AMD</vendor>
- <feature policy='require' name='vme'/>
- <feature policy='require' name='ht'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='osxsave'/>
- <feature policy='require' name='mmxext'/>
- <feature policy='require' name='fxsr_opt'/>
+ <feature policy='require' name='vme'/>
+ <feature policy='require' name='ht'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='extapic'/>
<feature policy='require' name='cr8legacy'/>
@@ -19,6 +17,8 @@
<feature policy='require' name='topoext'/>
<feature policy='require' name='perfctr_core'/>
<feature policy='require' name='perfctr_nb'/>
+ <feature policy='require' name='mmxext'/>
+ <feature policy='require' name='fxsr_opt'/>
<feature policy='require' name='invtsc'/>
<feature policy='require' name='npt'/>
<feature policy='require' name='lbrv'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml
b/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml
index 4fb2d3978b..d8c6a8ac0f 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml
@@ -3,12 +3,10 @@
<model>Opteron_G4</model>
<vendor>AMD</vendor>
<signature family='21' model='1' stepping='2'/>
- <feature name='vme'/>
- <feature name='ht'/>
<feature name='monitor'/>
<feature name='osxsave'/>
- <feature name='mmxext'/>
- <feature name='fxsr_opt'/>
+ <feature name='vme'/>
+ <feature name='ht'/>
<feature name='cmp_legacy'/>
<feature name='extapic'/>
<feature name='cr8legacy'/>
@@ -21,6 +19,8 @@
<feature name='topoext'/>
<feature name='perfctr_core'/>
<feature name='perfctr_nb'/>
+ <feature name='mmxext'/>
+ <feature name='fxsr_opt'/>
<feature name='invtsc'/>
<feature name='npt'/>
<feature name='lbrv'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
index 20e2fa363a..820a1a06c1 100644
--- a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
@@ -1,13 +1,6 @@
<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='dtes64'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ds_cpl'/>
@@ -16,6 +9,13 @@
<feature policy='require' name='xtpr'/>
<feature policy='require' name='pdcm'/>
<feature policy='require' name='pcid'/>
+ <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='arat'/>
<feature policy='require' name='rdtscp'/>
<feature policy='require' name='invtsc'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml
b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml
index a70f8ccd46..a1a42d4b83 100644
--- a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml
@@ -3,12 +3,6 @@
<model>core2duo</model>
<vendor>Intel</vendor>
<signature family='6' model='37' stepping='5'/>
- <feature name='ds'/>
- <feature name='acpi'/>
- <feature name='ss'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='ds_cpl'/>
<feature name='est'/>
@@ -18,8 +12,14 @@
<feature name='pdcm'/>
<feature name='pcid'/>
<feature name='popcnt'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='arat'/>
- <feature name='rdtscp'/>
<feature name='lahf_lm'/>
+ <feature name='rdtscp'/>
<feature name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml
b/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml
index f6106fdb1f..480d62865a 100644
--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml
@@ -1,14 +1,9 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Opteron_G3</model>
<vendor>AMD</vendor>
+ <feature policy='require' name='monitor'/>
<feature policy='require' name='vme'/>
<feature policy='require' name='ht'/>
- <feature policy='require' name='monitor'/>
- <feature policy='require' name='mmxext'/>
- <feature policy='require' name='fxsr_opt'/>
- <feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='3dnowext'/>
- <feature policy='require' name='3dnow'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='extapic'/>
<feature policy='require' name='cr8legacy'/>
@@ -17,6 +12,11 @@
<feature policy='require' name='ibs'/>
<feature policy='require' name='skinit'/>
<feature policy='require' name='wdt'/>
+ <feature policy='require' name='mmxext'/>
+ <feature policy='require' name='fxsr_opt'/>
+ <feature policy='require' name='pdpe1gb'/>
+ <feature policy='require' name='3dnowext'/>
+ <feature policy='require' name='3dnow'/>
<feature policy='require' name='invtsc'/>
<feature policy='require' name='npt'/>
<feature policy='require' name='lbrv'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml
b/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml
index dba7b2b161..6a4196b735 100644
--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml
@@ -3,18 +3,13 @@
<model>athlon</model>
<vendor>AMD</vendor>
<signature family='16' model='4' stepping='2'/>
- <feature name='mca'/>
- <feature name='clflush'/>
- <feature name='ht'/>
<feature name='pni'/>
<feature name='monitor'/>
<feature name='cx16'/>
<feature name='popcnt'/>
- <feature name='syscall'/>
- <feature name='fxsr_opt'/>
- <feature name='pdpe1gb'/>
- <feature name='rdtscp'/>
- <feature name='lm'/>
+ <feature name='mca'/>
+ <feature name='clflush'/>
+ <feature name='ht'/>
<feature name='lahf_lm'/>
<feature name='cmp_legacy'/>
<feature name='svm'/>
@@ -28,6 +23,11 @@
<feature name='ibs'/>
<feature name='skinit'/>
<feature name='wdt'/>
+ <feature name='syscall'/>
+ <feature name='fxsr_opt'/>
+ <feature name='pdpe1gb'/>
+ <feature name='rdtscp'/>
+ <feature name='lm'/>
<feature name='invtsc'/>
<feature name='npt'/>
<feature name='lbrv'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml
b/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml
index 7f6289c6d7..91bfb6244a 100644
--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml
@@ -1,17 +1,13 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>athlon</model>
<vendor>AMD</vendor>
- <feature policy='require' name='mca'/>
- <feature policy='require' name='clflush'/>
<feature policy='require' name='pni'/>
<feature policy='require' name='cx16'/>
<feature policy='require' name='x2apic'/>
<feature policy='require' name='popcnt'/>
<feature policy='require' name='hypervisor'/>
- <feature policy='require' name='syscall'/>
- <feature policy='require' name='fxsr_opt'/>
- <feature policy='require' name='pdpe1gb'/>
- <feature policy='require' name='lm'/>
+ <feature policy='require' name='mca'/>
+ <feature policy='require' name='clflush'/>
<feature policy='require' name='lahf_lm'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='cr8legacy'/>
@@ -20,6 +16,10 @@
<feature policy='require' name='misalignsse'/>
<feature policy='require' name='3dnowprefetch'/>
<feature policy='require' name='osvw'/>
+ <feature policy='require' name='syscall'/>
+ <feature policy='require' name='fxsr_opt'/>
+ <feature policy='require' name='pdpe1gb'/>
+ <feature policy='require' name='lm'/>
<feature policy='require' name='npt'/>
<feature policy='require' name='nrip-save'/>
</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..68fa956557 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,9 +1,9 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>EPYC</model>
<vendor>AMD</vendor>
- <feature policy='require' name='ht'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='osxsave'/>
+ <feature policy='require' name='ht'/>
<feature policy='require' name='xsaves'/>
<feature policy='require' name='cmp_legacy'/>
<feature policy='require' name='extapic'/>
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..0f7a5ad4e4 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
@@ -3,9 +3,9 @@
<model>EPYC</model>
<vendor>AMD</vendor>
<signature family='23' model='1' stepping='1'/>
- <feature name='ht'/>
<feature name='monitor'/>
<feature name='osxsave'/>
+ <feature name='ht'/>
<feature name='xsaves'/>
<feature name='cmp_legacy'/>
<feature name='extapic'/>
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..8ab0737eb3 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
@@ -1,9 +1,9 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>EPYC-Rome</model>
<vendor>AMD</vendor>
- <feature policy='require' name='ht'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='osxsave'/>
+ <feature policy='require' name='ht'/>
<feature policy='require' name='cmt'/>
<feature policy='require' name='xsaves'/>
<feature policy='require' name='mbm_total'/>
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..25e1f45186 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
@@ -3,9 +3,9 @@
<model>EPYC-Rome</model>
<vendor>AMD</vendor>
<signature family='23' model='113' stepping='0'/>
- <feature name='ht'/>
<feature name='monitor'/>
<feature name='osxsave'/>
+ <feature name='ht'/>
<feature name='cmt'/>
<feature name='xsaves'/>
<feature name='mbm_total'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-5110-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-5110-guest.xml
index d1b442d33f..7561906d88 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-5110-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-5110-guest.xml
@@ -1,13 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Conroe</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='dtes64'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ds_cpl'/>
@@ -17,4 +10,11 @@
<feature policy='require' name='xtpr'/>
<feature policy='require' name='pdcm'/>
<feature policy='require' name='dca'/>
+ <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'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml
index beb465df86..ec509f92e4 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml
@@ -3,13 +3,6 @@
<model>Conroe</model>
<vendor>Intel</vendor>
<signature family='6' model='15' stepping='6'/>
- <feature name='vme'/>
- <feature name='ds'/>
- <feature name='acpi'/>
- <feature name='ss'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -19,4 +12,11 @@
<feature name='xtpr'/>
<feature name='pdcm'/>
<feature name='dca'/>
+ <feature name='vme'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
</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..43038faac3 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
@@ -1,12 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
- <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='dtes64'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ds_cpl'/>
@@ -17,6 +11,12 @@
<feature policy='require' name='xtpr'/>
<feature policy='require' name='pdcm'/>
<feature policy='require' name='osxsave'/>
+ <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='tsc_adjust'/>
<feature policy='require' name='sgx'/>
<feature policy='require' name='clflushopt'/>
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..be752ae794 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
@@ -3,12 +3,6 @@
<model>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
<signature family='6' model='94' stepping='3'/>
- <feature name='ds'/>
- <feature name='acpi'/>
- <feature name='ss'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -19,6 +13,12 @@
<feature name='xtpr'/>
<feature name='pdcm'/>
<feature name='osxsave'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='tsc_adjust'/>
<feature name='sgx'/>
<feature name='clflushopt'/>
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..9ff862a51b 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
@@ -1,8 +1,8 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
- <feature policy='require' name='ss'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='md-clear'/>
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..073b099b76 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
@@ -1,12 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Skylake-Client</model>
<vendor>Intel</vendor>
- <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='dtes64'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ds_cpl'/>
@@ -17,6 +11,12 @@
<feature policy='require' name='xtpr'/>
<feature policy='require' name='pdcm'/>
<feature policy='require' name='osxsave'/>
+ <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='tsc_adjust'/>
<feature policy='require' name='sgx'/>
<feature policy='require' name='clflushopt'/>
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..50890d7006 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
@@ -3,12 +3,6 @@
<model>Skylake-Client</model>
<vendor>Intel</vendor>
<signature family='6' model='94' stepping='3'/>
- <feature name='ds'/>
- <feature name='acpi'/>
- <feature name='ss'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -19,6 +13,12 @@
<feature name='xtpr'/>
<feature name='pdcm'/>
<feature name='osxsave'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='tsc_adjust'/>
<feature name='sgx'/>
<feature name='clflushopt'/>
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..df83cf79a0 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
@@ -1,9 +1,9 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Skylake-Client</model>
<vendor>Intel</vendor>
- <feature policy='require' name='ss'/>
<feature policy='require' name='vmx'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='xsaves'/>
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..9f7b0376b5 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,13 +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'/>
- <feature policy='require' name='ht'/>
- <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'/>
@@ -21,12 +14,19 @@
<feature policy='require' name='osxsave'/>
<feature policy='require' name='f16c'/>
<feature policy='require' name='rdrand'/>
+ <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='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='pdpe1gb'/>
<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..d641d70bbd 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,13 +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'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -23,12 +16,19 @@
<feature name='osxsave'/>
<feature name='f16c'/>
<feature name='rdrand'/>
+ <feature name='vme'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='arat'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
<feature name='stibp'/>
<feature name='xsaveopt'/>
- <feature name='pdpe1gb'/>
<feature name='abm'/>
+ <feature name='pdpe1gb'/>
<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..07100abac9 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,14 @@
<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='vme'/>
+ <feature policy='require' name='ss'/>
<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='pdpe1gb'/>
</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..49ed41e473 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,13 +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'/>
- <feature policy='require' name='ht'/>
- <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'/>
@@ -21,6 +14,13 @@
<feature policy='require' name='osxsave'/>
<feature policy='require' name='f16c'/>
<feature policy='require' name='rdrand'/>
+ <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='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmt'/>
@@ -29,7 +29,7 @@
<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='pdpe1gb'/>
<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..ab7c422861 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,13 +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'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -23,6 +16,13 @@
<feature name='osxsave'/>
<feature name='f16c'/>
<feature name='rdrand'/>
+ <feature name='vme'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='arat'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
@@ -31,7 +31,7 @@
<feature name='xsaveopt'/>
<feature name='mbm_total'/>
<feature name='mbm_local'/>
- <feature name='pdpe1gb'/>
<feature name='abm'/>
+ <feature name='pdpe1gb'/>
<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..c76a4b4cd4 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,14 @@
<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='vme'/>
+ <feature policy='require' name='ss'/>
<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='pdpe1gb'/>
</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..833b859048 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,13 +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'/>
- <feature policy='require' name='ht'/>
- <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'/>
@@ -21,11 +14,18 @@
<feature policy='require' name='osxsave'/>
<feature policy='require' name='f16c'/>
<feature policy='require' name='rdrand'/>
+ <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='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='pdpe1gb'/>
<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..b8bafccab3 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,13 +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'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -23,11 +16,18 @@
<feature name='osxsave'/>
<feature name='f16c'/>
<feature name='rdrand'/>
+ <feature name='vme'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='arat'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
<feature name='xsaveopt'/>
- <feature name='pdpe1gb'/>
<feature name='abm'/>
+ <feature name='pdpe1gb'/>
<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..53cfd07643 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,13 @@
<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='vme'/>
+ <feature policy='require' name='ss'/>
<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='pdpe1gb'/>
</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..2cd4308710 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,13 +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'/>
- <feature policy='require' name='ht'/>
- <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'/>
@@ -21,6 +14,13 @@
<feature policy='require' name='osxsave'/>
<feature policy='require' name='f16c'/>
<feature policy='require' name='rdrand'/>
+ <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='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmt'/>
@@ -28,7 +28,7 @@
<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='pdpe1gb'/>
<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..feb5514d22 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,13 +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'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -23,6 +16,13 @@
<feature name='osxsave'/>
<feature name='f16c'/>
<feature name='rdrand'/>
+ <feature name='vme'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='arat'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
@@ -30,7 +30,7 @@
<feature name='xsaveopt'/>
<feature name='mbm_total'/>
<feature name='mbm_local'/>
- <feature name='pdpe1gb'/>
<feature name='abm'/>
+ <feature name='pdpe1gb'/>
<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..ffa518e2a4 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,14 @@
<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='vme'/>
+ <feature policy='require' name='ss'/>
<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='pdpe1gb'/>
</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..d681717372 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml
@@ -1,13 +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'/>
- <feature policy='require' name='ht'/>
- <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'/>
@@ -20,6 +13,13 @@
<feature policy='require' name='pcid'/>
<feature policy='require' name='dca'/>
<feature policy='require' name='osxsave'/>
+ <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='arat'/>
<feature policy='require' name='stibp'/>
<feature policy='require' name='flush-l1d'/>
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..8f56d42213 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
@@ -3,13 +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'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -22,6 +15,13 @@
<feature name='pcid'/>
<feature name='dca'/>
<feature name='osxsave'/>
+ <feature name='vme'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='arat'/>
<feature name='stibp'/>
<feature name='flush-l1d'/>
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..b7e1891225 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml
@@ -1,10 +1,10 @@
<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='vme'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='stibp'/>
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..833b859048 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,13 +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'/>
- <feature policy='require' name='ht'/>
- <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'/>
@@ -21,11 +14,18 @@
<feature policy='require' name='osxsave'/>
<feature policy='require' name='f16c'/>
<feature policy='require' name='rdrand'/>
+ <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='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='pdpe1gb'/>
<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..b8bafccab3 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,13 +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'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -23,11 +16,18 @@
<feature name='osxsave'/>
<feature name='f16c'/>
<feature name='rdrand'/>
+ <feature name='vme'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='arat'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
<feature name='xsaveopt'/>
- <feature name='pdpe1gb'/>
<feature name='abm'/>
+ <feature name='pdpe1gb'/>
<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..db42950fe6 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,12 @@
<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='vme'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='abm'/>
+ <feature policy='require' name='pdpe1gb'/>
</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..2cd4308710 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,13 +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'/>
- <feature policy='require' name='ht'/>
- <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'/>
@@ -21,6 +14,13 @@
<feature policy='require' name='osxsave'/>
<feature policy='require' name='f16c'/>
<feature policy='require' name='rdrand'/>
+ <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='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='cmt'/>
@@ -28,7 +28,7 @@
<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='pdpe1gb'/>
<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..feb5514d22 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,13 +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'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -23,6 +16,13 @@
<feature name='osxsave'/>
<feature name='f16c'/>
<feature name='rdrand'/>
+ <feature name='vme'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='arat'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
@@ -30,7 +30,7 @@
<feature name='xsaveopt'/>
<feature name='mbm_total'/>
<feature name='mbm_local'/>
- <feature name='pdpe1gb'/>
<feature name='abm'/>
+ <feature name='pdpe1gb'/>
<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..ffa518e2a4 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,14 @@
<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='vme'/>
+ <feature policy='require' name='ss'/>
<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='pdpe1gb'/>
</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..b7ddd7e1d7 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml
@@ -1,13 +1,6 @@
<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'/>
@@ -21,6 +14,13 @@
<feature policy='require' name='pcid'/>
<feature policy='require' name='dca'/>
<feature policy='require' name='x2apic'/>
+ <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='arat'/>
<feature policy='require' name='pdpe1gb'/>
<feature policy='require' name='rdtscp'/>
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..728c9c4264 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml
@@ -3,13 +3,6 @@
<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'/>
@@ -23,6 +16,13 @@
<feature name='pcid'/>
<feature name='dca'/>
<feature name='x2apic'/>
+ <feature name='vme'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='arat'/>
<feature name='pdpe1gb'/>
<feature name='rdtscp'/>
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..f9d226917b 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml
@@ -1,13 +1,13 @@
<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='vme'/>
+ <feature policy='require' name='ss'/>
<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-4830-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-guest.xml
index 659779687a..b7ddd7e1d7 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-guest.xml
@@ -1,13 +1,6 @@
<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'/>
@@ -21,6 +14,13 @@
<feature policy='require' name='pcid'/>
<feature policy='require' name='dca'/>
<feature policy='require' name='x2apic'/>
+ <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='arat'/>
<feature policy='require' name='pdpe1gb'/>
<feature policy='require' name='rdtscp'/>
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..728c9c4264 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml
@@ -3,13 +3,6 @@
<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'/>
@@ -23,6 +16,13 @@
<feature name='pcid'/>
<feature name='dca'/>
<feature name='x2apic'/>
+ <feature name='vme'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='arat'/>
<feature name='pdpe1gb'/>
<feature name='rdtscp'/>
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..7e9b5f2ba4 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-json.xml
@@ -1,13 +1,13 @@
<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='vme'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='pdpe1gb'/>
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..dc91fceaef 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,13 +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'/>
- <feature policy='require' name='ht'/>
- <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'/>
@@ -21,11 +14,18 @@
<feature policy='require' name='osxsave'/>
<feature policy='require' name='f16c'/>
<feature policy='require' name='rdrand'/>
+ <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='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='pdpe1gb'/>
<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..92d9206242 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,13 +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'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -23,11 +16,18 @@
<feature name='osxsave'/>
<feature name='f16c'/>
<feature name='rdrand'/>
+ <feature name='vme'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='arat'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
<feature name='xsaveopt'/>
- <feature name='pdpe1gb'/>
<feature name='abm'/>
+ <feature name='pdpe1gb'/>
<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..9d49bb9aa6 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,14 @@
<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='vme'/>
+ <feature policy='require' name='ss'/>
<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='pdpe1gb'/>
</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..18211373a9 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-guest.xml
@@ -1,13 +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'/>
- <feature policy='require' name='ht'/>
- <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'/>
@@ -18,6 +11,13 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='dca'/>
<feature policy='require' name='x2apic'/>
+ <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='stibp'/>
<feature policy='require' name='flush-l1d'/>
<feature policy='require' name='ssbd'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml
index 15fea29e06..3575991eae 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml
@@ -3,13 +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'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -20,6 +13,13 @@
<feature name='pdcm'/>
<feature name='dca'/>
<feature name='x2apic'/>
+ <feature name='vme'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='stibp'/>
<feature name='flush-l1d'/>
<feature name='ssbd'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-json.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-json.xml
index 32cd1000c8..d2acd9cabf 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-json.xml
@@ -1,11 +1,11 @@
<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'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='vme'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='arat'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='stibp'/>
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..d0fdec7691 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
@@ -1,12 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Skylake-Server-IBRS</model>
<vendor>Intel</vendor>
- <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='dtes64'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ds_cpl'/>
@@ -18,6 +12,12 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='dca'/>
<feature policy='require' name='osxsave'/>
+ <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='tsc_adjust'/>
<feature policy='require' name='cmt'/>
<feature policy='require' name='clflushopt'/>
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..bbf82dfd9f 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
@@ -3,12 +3,6 @@
<model>Skylake-Server-IBRS</model>
<vendor>Intel</vendor>
<signature family='6' model='85' stepping='4'/>
- <feature name='ds'/>
- <feature name='acpi'/>
- <feature name='ss'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -20,6 +14,12 @@
<feature name='pdcm'/>
<feature name='dca'/>
<feature name='osxsave'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
<feature name='clflushopt'/>
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..e92cfaba48 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-json.xml
@@ -1,8 +1,8 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Skylake-Server-IBRS</model>
<vendor>Intel</vendor>
- <feature policy='require' name='ss'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='clflushopt'/>
</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..4a42d170c2 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
@@ -1,12 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Skylake-Server-IBRS</model>
<vendor>Intel</vendor>
- <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='dtes64'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ds_cpl'/>
@@ -18,6 +12,12 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='dca'/>
<feature policy='require' name='osxsave'/>
+ <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='tsc_adjust'/>
<feature policy='require' name='cmt'/>
<feature policy='require' name='clflushopt'/>
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..44a0e1a30f 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
@@ -3,12 +3,6 @@
<model>Skylake-Server-IBRS</model>
<vendor>Intel</vendor>
<signature family='6' model='85' stepping='4'/>
- <feature name='ds'/>
- <feature name='acpi'/>
- <feature name='ss'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -20,6 +14,12 @@
<feature name='pdcm'/>
<feature name='dca'/>
<feature name='osxsave'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
<feature name='clflushopt'/>
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..a1b79e7e18 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
@@ -1,9 +1,9 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Skylake-Server-IBRS</model>
<vendor>Intel</vendor>
- <feature policy='require' name='ss'/>
<feature policy='require' name='vmx'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='umip'/>
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..4b2d012e72 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
@@ -1,12 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Skylake-Server</model>
<vendor>Intel</vendor>
- <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='dtes64'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ds_cpl'/>
@@ -18,6 +12,12 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='dca'/>
<feature policy='require' name='osxsave'/>
+ <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='tsc_adjust'/>
<feature policy='require' name='cmt'/>
<feature policy='require' name='clflushopt'/>
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..2959878fe6 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
@@ -3,12 +3,6 @@
<model>Skylake-Server</model>
<vendor>Intel</vendor>
<signature family='6' model='85' stepping='4'/>
- <feature name='ds'/>
- <feature name='acpi'/>
- <feature name='ss'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -20,6 +14,12 @@
<feature name='pdcm'/>
<feature name='dca'/>
<feature name='osxsave'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
<feature name='clflushopt'/>
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..ccf9875dc9 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml
@@ -1,8 +1,8 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Skylake-Server</model>
<vendor>Intel</vendor>
- <feature policy='require' name='ss'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='clflushopt'/>
</cpu>
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..d707faf63d 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
@@ -1,12 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Cascadelake-Server</model>
<vendor>Intel</vendor>
- <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='dtes64'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ds_cpl'/>
@@ -18,6 +12,12 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='dca'/>
<feature policy='require' name='osxsave'/>
+ <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='tsc_adjust'/>
<feature policy='require' name='cmt'/>
<feature policy='require' name='intel-pt'/>
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..6cb65b2a90 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
@@ -3,12 +3,6 @@
<model>Cascadelake-Server</model>
<vendor>Intel</vendor>
<signature family='6' model='85' stepping='6'/>
- <feature name='ds'/>
- <feature name='acpi'/>
- <feature name='ss'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -20,6 +14,12 @@
<feature name='pdcm'/>
<feature name='dca'/>
<feature name='osxsave'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
<feature name='intel-pt'/>
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..d8ac5f373f 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml
@@ -1,8 +1,8 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Cascadelake-Server</model>
<vendor>Intel</vendor>
- <feature policy='require' name='ss'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='umip'/>
<feature policy='require' name='pku'/>
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..f86d2889c6 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml
@@ -1,12 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Cascadelake-Server</model>
<vendor>Intel</vendor>
- <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='dtes64'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ds_cpl'/>
@@ -18,6 +12,12 @@
<feature policy='require' name='pdcm'/>
<feature policy='require' name='dca'/>
<feature policy='require' name='osxsave'/>
+ <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='tsc_adjust'/>
<feature policy='require' name='cmt'/>
<feature policy='require' name='intel-pt'/>
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..7289d4cda5 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
@@ -3,12 +3,6 @@
<model>Cascadelake-Server</model>
<vendor>Intel</vendor>
<signature family='6' model='85' stepping='7'/>
- <feature name='ds'/>
- <feature name='acpi'/>
- <feature name='ss'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -20,6 +14,12 @@
<feature name='pdcm'/>
<feature name='dca'/>
<feature name='osxsave'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='tsc_adjust'/>
<feature name='cmt'/>
<feature name='intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
index ac0e520767..bd187b3d72 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
@@ -1,9 +1,9 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Cascadelake-Server</model>
<vendor>Intel</vendor>
- <feature policy='require' name='ss'/>
<feature policy='require' name='vmx'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='umip'/>
<feature policy='require' name='pku'/>
@@ -41,9 +41,6 @@
<feature policy='require' name='vmx-rdseed-exit'/>
<feature policy='require' name='vmx-pml'/>
<feature policy='require' name='vmx-xsaves'/>
- <feature policy='require' name='vmx-invvpid'/>
- <feature policy='require' name='vmx-invvpid-single-addr'/>
- <feature policy='require' name='vmx-invvpid-all-context'/>
<feature policy='require' name='vmx-ept-execonly'/>
<feature policy='require' name='vmx-page-walk-4'/>
<feature policy='require' name='vmx-ept-2mb'/>
@@ -52,6 +49,9 @@
<feature policy='require' name='vmx-eptad'/>
<feature policy='require' name='vmx-invept-single-context'/>
<feature policy='require' name='vmx-invept-all-context'/>
+ <feature policy='require' name='vmx-invvpid'/>
+ <feature policy='require' name='vmx-invvpid-single-addr'/>
+ <feature policy='require' name='vmx-invvpid-all-context'/>
<feature policy='require' name='vmx-intr-exit'/>
<feature policy='require' name='vmx-nmi-exit'/>
<feature policy='require' name='vmx-vnmi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml
index 9c975c6792..f5ce1183c6 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml
@@ -1,13 +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'/>
- <feature policy='require' name='ht'/>
- <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'/>
@@ -17,6 +10,13 @@
<feature policy='require' name='xtpr'/>
<feature policy='require' name='pdcm'/>
<feature policy='require' name='dca'/>
+ <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='rdtscp'/>
<feature policy='require' name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml
index 35dd63f360..453b56ff1f 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml
@@ -3,13 +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'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -19,6 +12,13 @@
<feature name='xtpr'/>
<feature name='pdcm'/>
<feature name='dca'/>
+ <feature name='vme'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
<feature name='rdtscp'/>
<feature name='invtsc'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml
index 038c98e1d1..b708bae41d 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml
@@ -1,10 +1,10 @@
<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'/>
+ <feature policy='require' name='vme'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='rdtscp'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-guest.xml
index a97efc5657..b02cca7595 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-guest.xml
@@ -1,13 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='forbid'>Penryn</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='dtes64'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ds_cpl'/>
@@ -17,4 +10,11 @@
<feature policy='require' name='xtpr'/>
<feature policy='require' name='pdcm'/>
<feature policy='require' name='dca'/>
+ <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'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml
index 91ab9726da..b7bc4cbb5b 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml
@@ -3,13 +3,6 @@
<model>Penryn</model>
<vendor>Intel</vendor>
<signature family='6' model='23' stepping='6'/>
- <feature name='vme'/>
- <feature name='ds'/>
- <feature name='acpi'/>
- <feature name='ss'/>
- <feature name='ht'/>
- <feature name='tm'/>
- <feature name='pbe'/>
<feature name='dtes64'/>
<feature name='monitor'/>
<feature name='ds_cpl'/>
@@ -19,4 +12,11 @@
<feature name='xtpr'/>
<feature name='pdcm'/>
<feature name='dca'/>
+ <feature name='vme'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
</cpu>
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..8d75dc29fb 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,14 @@
<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='vme'/>
+ <feature policy='require' name='ss'/>
<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='pdpe1gb'/>
</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..bdc005acc5 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Icelake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Icelake.xml
@@ -1,8 +1,8 @@
<cpu mode='custom' match='exact'>
<model fallback='allow'>Cascadelake-Server</model>
<vendor>Intel</vendor>
- <feature policy='require' name='ss'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='umip'/>
<feature policy='require' name='pku'/>
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..28992ac163 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake-IBRS.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake-IBRS.xml
@@ -1,8 +1,8 @@
<cpu mode='custom' match='exact'>
<model fallback='allow'>Skylake-Server-IBRS</model>
<vendor>Intel</vendor>
- <feature policy='require' name='ss'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='umip'/>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake.xml
b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake.xml
index 906259df0b..98b1c48e70 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake.xml
@@ -1,8 +1,8 @@
<cpu mode='custom' match='exact'>
<model fallback='allow'>Skylake-Server</model>
<vendor>Intel</vendor>
- <feature policy='require' name='ss'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='clflushopt'/>
</cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml
b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml
index f9e9c476b5..833de33a2d 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml
@@ -1,9 +1,9 @@
<cpu mode='custom' match='exact'>
<model fallback='allow'>Cascadelake-Server</model>
<vendor>Intel</vendor>
- <feature policy='require' name='ss'/>
<feature policy='require' name='vmx'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='umip'/>
<feature policy='require' name='pku'/>
@@ -41,9 +41,6 @@
<feature policy='require' name='vmx-rdseed-exit'/>
<feature policy='require' name='vmx-pml'/>
<feature policy='require' name='vmx-xsaves'/>
- <feature policy='require' name='vmx-invvpid'/>
- <feature policy='require' name='vmx-invvpid-single-addr'/>
- <feature policy='require' name='vmx-invvpid-all-context'/>
<feature policy='require' name='vmx-ept-execonly'/>
<feature policy='require' name='vmx-page-walk-4'/>
<feature policy='require' name='vmx-ept-2mb'/>
@@ -52,6 +49,9 @@
<feature policy='require' name='vmx-eptad'/>
<feature policy='require' name='vmx-invept-single-context'/>
<feature policy='require' name='vmx-invept-all-context'/>
+ <feature policy='require' name='vmx-invvpid'/>
+ <feature policy='require' name='vmx-invvpid-single-addr'/>
+ <feature policy='require' name='vmx-invvpid-all-context'/>
<feature policy='require' name='vmx-intr-exit'/>
<feature policy='require' name='vmx-nmi-exit'/>
<feature policy='require' name='vmx-vnmi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Icelake.xml
b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Icelake.xml
index 071c799ba2..bdc005acc5 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Icelake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Icelake.xml
@@ -1,8 +1,8 @@
<cpu mode='custom' match='exact'>
<model fallback='allow'>Cascadelake-Server</model>
<vendor>Intel</vendor>
- <feature policy='require' name='ss'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='umip'/>
<feature policy='require' name='pku'/>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Haswell+Skylake.xml
b/tests/cputestdata/x86_64-cpuid-baseline-Haswell+Skylake.xml
index e687a679b3..a81ba24fa7 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Haswell+Skylake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Haswell+Skylake.xml
@@ -1,14 +1,14 @@
<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='vme'/>
+ <feature policy='require' name='ss'/>
<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='pdpe1gb'/>
</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..b937c49fa4 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,14 @@
<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='vme'/>
+ <feature policy='require' name='ss'/>
<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='pdpe1gb'/>
</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..1d9e49f109 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,14 @@
<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='vme'/>
+ <feature policy='require' name='ss'/>
<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='pdpe1gb'/>
</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..b937c49fa4 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,14 @@
<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='vme'/>
+ <feature policy='require' name='ss'/>
<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='pdpe1gb'/>
</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..34331b0f15 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Skylake-Client+Server.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Skylake-Client+Server.xml
@@ -1,8 +1,8 @@
<cpu mode='custom' match='exact'>
<model fallback='allow'>Skylake-Client</model>
<vendor>Intel</vendor>
- <feature policy='require' name='ss'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='pdpe1gb'/>
diff --git a/tests/cputestdata/x86_64-host+guest,model486-result.xml
b/tests/cputestdata/x86_64-host+guest,model486-result.xml
index b533f22b88..07fc300fe6 100644
--- a/tests/cputestdata/x86_64-host+guest,model486-result.xml
+++ b/tests/cputestdata/x86_64-host+guest,model486-result.xml
@@ -1,6 +1,13 @@
<cpu mode='custom' match='exact'>
<model fallback='allow'>486</model>
<topology sockets='2' dies='1' clusters='1'
cores='4' threads='1'/>
+ <feature policy='require' name='pni'/>
+ <feature policy='force' name='monitor'/>
+ <feature policy='require' name='ssse3'/>
+ <feature policy='require' name='cx16'/>
+ <feature policy='require' name='xtpr'/>
+ <feature policy='require' name='dca'/>
+ <feature policy='require' name='sse4.1'/>
<feature policy='require' name='de'/>
<feature policy='require' name='tsc'/>
<feature policy='require' name='msr'/>
@@ -20,19 +27,12 @@
<feature policy='require' name='fxsr'/>
<feature policy='require' name='sse2'/>
<feature policy='force' name='pbe'/>
- <feature policy='require' name='pni'/>
- <feature policy='force' name='monitor'/>
- <feature policy='require' name='ssse3'/>
- <feature policy='require' name='cx16'/>
- <feature policy='require' name='xtpr'/>
- <feature policy='require' name='dca'/>
- <feature policy='require' name='sse4.1'/>
+ <feature policy='require' name='lahf_lm'/>
+ <feature policy='force' name='svm'/>
<feature policy='require' name='syscall'/>
<feature policy='require' name='nx'/>
<feature policy='require' name='lm'/>
<feature policy='force' name='3dnowext'/>
- <feature policy='require' name='lahf_lm'/>
- <feature policy='force' name='svm'/>
<feature policy='disable' name='vme'/>
<feature policy='disable' name='sse4.2'/>
<feature policy='disable' name='3dnow'/>
diff --git a/tests/cputestdata/x86_64-host+guest,models-result.xml
b/tests/cputestdata/x86_64-host+guest,models-result.xml
index e975d9bc18..92405750d8 100644
--- a/tests/cputestdata/x86_64-host+guest,models-result.xml
+++ b/tests/cputestdata/x86_64-host+guest,models-result.xml
@@ -1,14 +1,14 @@
<cpu mode='custom' match='exact'>
<model fallback='allow'>qemu64</model>
<topology sockets='2' dies='1' clusters='1'
cores='4' threads='1'/>
- <feature policy='force' name='pbe'/>
<feature policy='force' name='monitor'/>
<feature policy='require' name='ssse3'/>
<feature policy='require' name='xtpr'/>
<feature policy='require' name='dca'/>
<feature policy='require' name='sse4.1'/>
- <feature policy='force' name='3dnowext'/>
+ <feature policy='force' name='pbe'/>
<feature policy='require' name='lahf_lm'/>
+ <feature policy='force' name='3dnowext'/>
<feature policy='disable' name='sse'/>
<feature policy='disable' name='sse4.2'/>
<feature policy='disable' name='3dnow'/>
diff --git a/tests/cputestdata/x86_64-host+host+host-model,models-result.xml
b/tests/cputestdata/x86_64-host+host+host-model,models-result.xml
index 4be4701c6e..7ccdad5e3a 100644
--- a/tests/cputestdata/x86_64-host+host+host-model,models-result.xml
+++ b/tests/cputestdata/x86_64-host+host+host-model,models-result.xml
@@ -1,12 +1,6 @@
<cpu mode='custom' match='exact'>
<model fallback='allow'>core2duo</model>
<vendor>Intel</vendor>
- <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='ds_cpl'/>
<feature policy='require' name='vmx'/>
<feature policy='require' name='est'/>
@@ -15,6 +9,12 @@
<feature policy='require' name='xtpr'/>
<feature policy='require' name='dca'/>
<feature policy='require' name='sse4.1'/>
+ <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='lahf_lm'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='vme'/>
diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
index 152f201ff9..5ac1c405f2 100644
--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
@@ -44,9 +44,9 @@
<model fallback='forbid'>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
<maxphysaddr mode='passthrough' limit='64'/>
- <feature policy='require' name='ss'/>
<feature policy='require' name='vmx'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='umip'/>
@@ -79,9 +79,6 @@
<feature policy='require' name='vmx-rdseed-exit'/>
<feature policy='require' name='vmx-pml'/>
<feature policy='require' name='vmx-xsaves'/>
- <feature policy='require' name='vmx-invvpid'/>
- <feature policy='require' name='vmx-invvpid-single-addr'/>
- <feature policy='require' name='vmx-invvpid-all-context'/>
<feature policy='require' name='vmx-ept-execonly'/>
<feature policy='require' name='vmx-page-walk-4'/>
<feature policy='require' name='vmx-ept-2mb'/>
@@ -90,6 +87,9 @@
<feature policy='require' name='vmx-eptad'/>
<feature policy='require' name='vmx-invept-single-context'/>
<feature policy='require' name='vmx-invept-all-context'/>
+ <feature policy='require' name='vmx-invvpid'/>
+ <feature policy='require' name='vmx-invvpid-single-addr'/>
+ <feature policy='require' name='vmx-invvpid-all-context'/>
<feature policy='require' name='vmx-intr-exit'/>
<feature policy='require' name='vmx-nmi-exit'/>
<feature policy='require' name='vmx-vnmi'/>
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..5766bcc428 100644
--- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
@@ -37,8 +37,6 @@
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Opteron_G3</model>
<vendor>AMD</vendor>
- <feature policy='require' name='acpi'/>
- <feature policy='require' name='ss'/>
<feature policy='require' name='pclmuldq'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ssse3'/>
@@ -49,6 +47,8 @@
<feature policy='require' name='xsave'/>
<feature policy='require' name='rdrand'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='acpi'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='arat'/>
<feature policy='require' name='fsgsbase'/>
<feature policy='require' name='bmi1'/>
@@ -65,11 +65,11 @@
<feature policy='require' name='la57'/>
<feature policy='require' name='xsaveopt'/>
<feature policy='require' name='xgetbv1'/>
+ <feature policy='require' name='cr8legacy'/>
<feature policy='require' name='mmxext'/>
<feature policy='require' name='pdpe1gb'/>
<feature policy='require' name='3dnowext'/>
<feature policy='require' name='3dnow'/>
- <feature policy='require' name='cr8legacy'/>
<feature policy='require' name='npt'/>
<feature policy='disable' name='misalignsse'/>
</mode>
diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
index 8b7cf44d6d..7b13d3ba3a 100644
--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
@@ -43,9 +43,9 @@
<model fallback='forbid'>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
<maxphysaddr mode='passthrough' limit='64'/>
- <feature policy='require' name='ss'/>
<feature policy='require' name='vmx'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='umip'/>
@@ -78,9 +78,6 @@
<feature policy='require' name='vmx-rdseed-exit'/>
<feature policy='require' name='vmx-pml'/>
<feature policy='require' name='vmx-xsaves'/>
- <feature policy='require' name='vmx-invvpid'/>
- <feature policy='require' name='vmx-invvpid-single-addr'/>
- <feature policy='require' name='vmx-invvpid-all-context'/>
<feature policy='require' name='vmx-ept-execonly'/>
<feature policy='require' name='vmx-page-walk-4'/>
<feature policy='require' name='vmx-ept-2mb'/>
@@ -89,6 +86,9 @@
<feature policy='require' name='vmx-eptad'/>
<feature policy='require' name='vmx-invept-single-context'/>
<feature policy='require' name='vmx-invept-all-context'/>
+ <feature policy='require' name='vmx-invvpid'/>
+ <feature policy='require' name='vmx-invvpid-single-addr'/>
+ <feature policy='require' name='vmx-invvpid-all-context'/>
<feature policy='require' name='vmx-intr-exit'/>
<feature policy='require' name='vmx-nmi-exit'/>
<feature policy='require' name='vmx-vnmi'/>
diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
index 1d29a40f74..edc36e2a84 100644
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
@@ -44,9 +44,9 @@
<model fallback='forbid'>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
<maxphysaddr mode='passthrough' limit='64'/>
- <feature policy='require' name='ss'/>
<feature policy='require' name='vmx'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='umip'/>
@@ -79,9 +79,6 @@
<feature policy='require' name='vmx-rdseed-exit'/>
<feature policy='require' name='vmx-pml'/>
<feature policy='require' name='vmx-xsaves'/>
- <feature policy='require' name='vmx-invvpid'/>
- <feature policy='require' name='vmx-invvpid-single-addr'/>
- <feature policy='require' name='vmx-invvpid-all-context'/>
<feature policy='require' name='vmx-ept-execonly'/>
<feature policy='require' name='vmx-page-walk-4'/>
<feature policy='require' name='vmx-ept-2mb'/>
@@ -90,6 +87,9 @@
<feature policy='require' name='vmx-eptad'/>
<feature policy='require' name='vmx-invept-single-context'/>
<feature policy='require' name='vmx-invept-all-context'/>
+ <feature policy='require' name='vmx-invvpid'/>
+ <feature policy='require' name='vmx-invvpid-single-addr'/>
+ <feature policy='require' name='vmx-invvpid-all-context'/>
<feature policy='require' name='vmx-intr-exit'/>
<feature policy='require' name='vmx-nmi-exit'/>
<feature policy='require' name='vmx-vnmi'/>
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..d2b82e5581 100644
--- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
@@ -37,8 +37,6 @@
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Opteron_G3</model>
<vendor>AMD</vendor>
- <feature policy='require' name='acpi'/>
- <feature policy='require' name='ss'/>
<feature policy='require' name='pclmuldq'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ssse3'/>
@@ -49,6 +47,8 @@
<feature policy='require' name='xsave'/>
<feature policy='require' name='rdrand'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='acpi'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='arat'/>
<feature policy='require' name='fsgsbase'/>
<feature policy='require' name='bmi1'/>
@@ -65,11 +65,11 @@
<feature policy='require' name='la57'/>
<feature policy='require' name='xsaveopt'/>
<feature policy='require' name='xgetbv1'/>
+ <feature policy='require' name='cr8legacy'/>
<feature policy='require' name='mmxext'/>
<feature policy='require' name='pdpe1gb'/>
<feature policy='require' name='3dnowext'/>
<feature policy='require' name='3dnow'/>
- <feature policy='require' name='cr8legacy'/>
<feature policy='require' name='npt'/>
<feature policy='disable' name='misalignsse'/>
</mode>
diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
index f3b3adb19e..7fe44b5e97 100644
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
@@ -43,9 +43,9 @@
<model fallback='forbid'>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
<maxphysaddr mode='passthrough' limit='64'/>
- <feature policy='require' name='ss'/>
<feature policy='require' name='vmx'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='tsc_adjust'/>
<feature policy='require' name='clflushopt'/>
<feature policy='require' name='umip'/>
@@ -78,9 +78,6 @@
<feature policy='require' name='vmx-rdseed-exit'/>
<feature policy='require' name='vmx-pml'/>
<feature policy='require' name='vmx-xsaves'/>
- <feature policy='require' name='vmx-invvpid'/>
- <feature policy='require' name='vmx-invvpid-single-addr'/>
- <feature policy='require' name='vmx-invvpid-all-context'/>
<feature policy='require' name='vmx-ept-execonly'/>
<feature policy='require' name='vmx-page-walk-4'/>
<feature policy='require' name='vmx-ept-2mb'/>
@@ -89,6 +86,9 @@
<feature policy='require' name='vmx-eptad'/>
<feature policy='require' name='vmx-invept-single-context'/>
<feature policy='require' name='vmx-invept-all-context'/>
+ <feature policy='require' name='vmx-invvpid'/>
+ <feature policy='require' name='vmx-invvpid-single-addr'/>
+ <feature policy='require' name='vmx-invvpid-all-context'/>
<feature policy='require' name='vmx-intr-exit'/>
<feature policy='require' name='vmx-nmi-exit'/>
<feature policy='require' name='vmx-vnmi'/>
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..2743f91431 100644
--- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
@@ -37,8 +37,6 @@
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Opteron_G3</model>
<vendor>AMD</vendor>
- <feature policy='require' name='acpi'/>
- <feature policy='require' name='ss'/>
<feature policy='require' name='pclmuldq'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ssse3'/>
@@ -49,6 +47,8 @@
<feature policy='require' name='xsave'/>
<feature policy='require' name='rdrand'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='acpi'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='arat'/>
<feature policy='require' name='fsgsbase'/>
<feature policy='require' name='bmi1'/>
@@ -65,11 +65,11 @@
<feature policy='require' name='la57'/>
<feature policy='require' name='xsaveopt'/>
<feature policy='require' name='xgetbv1'/>
+ <feature policy='require' name='cr8legacy'/>
<feature policy='require' name='mmxext'/>
<feature policy='require' name='pdpe1gb'/>
<feature policy='require' name='3dnowext'/>
<feature policy='require' name='3dnow'/>
- <feature policy='require' name='cr8legacy'/>
<feature policy='require' name='npt'/>
<feature policy='disable' name='misalignsse'/>
</mode>
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..7e5f3c8c2b 100644
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -37,8 +37,6 @@
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Opteron_G3</model>
<vendor>AMD</vendor>
- <feature policy='require' name='acpi'/>
- <feature policy='require' name='ss'/>
<feature policy='require' name='pclmuldq'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ssse3'/>
@@ -49,6 +47,8 @@
<feature policy='require' name='xsave'/>
<feature policy='require' name='rdrand'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='acpi'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='arat'/>
<feature policy='require' name='fsgsbase'/>
<feature policy='require' name='bmi1'/>
@@ -65,11 +65,11 @@
<feature policy='require' name='la57'/>
<feature policy='require' name='xsaveopt'/>
<feature policy='require' name='xgetbv1'/>
+ <feature policy='require' name='cr8legacy'/>
<feature policy='require' name='mmxext'/>
<feature policy='require' name='pdpe1gb'/>
<feature policy='require' name='3dnowext'/>
<feature policy='require' name='3dnow'/>
- <feature policy='require' name='cr8legacy'/>
<feature policy='require' name='npt'/>
<feature policy='disable' name='misalignsse'/>
</mode>
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..169e777644 100644
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -37,8 +37,6 @@
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Opteron_G3</model>
<vendor>AMD</vendor>
- <feature policy='require' name='acpi'/>
- <feature policy='require' name='ss'/>
<feature policy='require' name='pclmuldq'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ssse3'/>
@@ -49,6 +47,8 @@
<feature policy='require' name='xsave'/>
<feature policy='require' name='rdrand'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='acpi'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='arat'/>
<feature policy='require' name='fsgsbase'/>
<feature policy='require' name='bmi1'/>
@@ -66,11 +66,11 @@
<feature policy='require' name='pks'/>
<feature policy='require' name='xsaveopt'/>
<feature policy='require' name='xgetbv1'/>
+ <feature policy='require' name='cr8legacy'/>
<feature policy='require' name='mmxext'/>
<feature policy='require' name='pdpe1gb'/>
<feature policy='require' name='3dnowext'/>
<feature policy='require' name='3dnow'/>
- <feature policy='require' name='cr8legacy'/>
<feature policy='require' name='npt'/>
<feature policy='disable' name='misalignsse'/>
</mode>
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..35f31f4ae8 100644
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -37,8 +37,6 @@
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Opteron_G3</model>
<vendor>AMD</vendor>
- <feature policy='require' name='acpi'/>
- <feature policy='require' name='ss'/>
<feature policy='require' name='pclmuldq'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ssse3'/>
@@ -49,6 +47,8 @@
<feature policy='require' name='xsave'/>
<feature policy='require' name='rdrand'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='acpi'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='arat'/>
<feature policy='require' name='fsgsbase'/>
<feature policy='require' name='bmi1'/>
@@ -66,11 +66,11 @@
<feature policy='require' name='pks'/>
<feature policy='require' name='xsaveopt'/>
<feature policy='require' name='xgetbv1'/>
+ <feature policy='require' name='cr8legacy'/>
<feature policy='require' name='mmxext'/>
<feature policy='require' name='pdpe1gb'/>
<feature policy='require' name='3dnowext'/>
<feature policy='require' name='3dnow'/>
- <feature policy='require' name='cr8legacy'/>
<feature policy='require' name='npt'/>
<feature policy='disable' name='misalignsse'/>
</mode>
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..fa1c32f138 100644
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -37,8 +37,6 @@
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Opteron_G3</model>
<vendor>AMD</vendor>
- <feature policy='require' name='acpi'/>
- <feature policy='require' name='ss'/>
<feature policy='require' name='pclmuldq'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ssse3'/>
@@ -49,6 +47,8 @@
<feature policy='require' name='xsave'/>
<feature policy='require' name='rdrand'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='acpi'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='arat'/>
<feature policy='require' name='fsgsbase'/>
<feature policy='require' name='bmi1'/>
@@ -66,11 +66,11 @@
<feature policy='require' name='pks'/>
<feature policy='require' name='xsaveopt'/>
<feature policy='require' name='xgetbv1'/>
+ <feature policy='require' name='cr8legacy'/>
<feature policy='require' name='mmxext'/>
<feature policy='require' name='pdpe1gb'/>
<feature policy='require' name='3dnowext'/>
<feature policy='require' name='3dnow'/>
- <feature policy='require' name='cr8legacy'/>
<feature policy='require' name='npt'/>
<feature policy='require' name='vgif'/>
<feature policy='require' name='svme-addr-chk'/>
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..8a98f7ed87 100644
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -37,8 +37,6 @@
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Opteron_G3</model>
<vendor>AMD</vendor>
- <feature policy='require' name='acpi'/>
- <feature policy='require' name='ss'/>
<feature policy='require' name='pclmuldq'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ssse3'/>
@@ -49,6 +47,8 @@
<feature policy='require' name='xsave'/>
<feature policy='require' name='rdrand'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='acpi'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='arat'/>
<feature policy='require' name='fsgsbase'/>
<feature policy='require' name='bmi1'/>
@@ -67,11 +67,11 @@
<feature policy='require' name='pks'/>
<feature policy='require' name='xsaveopt'/>
<feature policy='require' name='xgetbv1'/>
+ <feature policy='require' name='cr8legacy'/>
<feature policy='require' name='mmxext'/>
<feature policy='require' name='pdpe1gb'/>
<feature policy='require' name='3dnowext'/>
<feature policy='require' name='3dnow'/>
- <feature policy='require' name='cr8legacy'/>
<feature policy='require' name='npt'/>
<feature policy='require' name='vgif'/>
<feature policy='require' name='svme-addr-chk'/>
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..4741164370 100644
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -37,8 +37,6 @@
<mode name='host-model' supported='yes'>
<model fallback='forbid'>Opteron_G3</model>
<vendor>AMD</vendor>
- <feature policy='require' name='acpi'/>
- <feature policy='require' name='ss'/>
<feature policy='require' name='pclmuldq'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='ssse3'/>
@@ -49,6 +47,8 @@
<feature policy='require' name='xsave'/>
<feature policy='require' name='rdrand'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='acpi'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='arat'/>
<feature policy='require' name='fsgsbase'/>
<feature policy='require' name='bmi1'/>
@@ -67,11 +67,11 @@
<feature policy='require' name='pks'/>
<feature policy='require' name='xsaveopt'/>
<feature policy='require' name='xgetbv1'/>
+ <feature policy='require' name='cr8legacy'/>
<feature policy='require' name='mmxext'/>
<feature policy='require' name='pdpe1gb'/>
<feature policy='require' name='3dnowext'/>
<feature policy='require' name='3dnow'/>
- <feature policy='require' name='cr8legacy'/>
<feature policy='require' name='npt'/>
<feature policy='require' name='vgif'/>
<feature policy='require' name='svme-addr-chk'/>
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..bba0e5069b 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
@@ -37,10 +37,10 @@
<mode name='host-model' supported='yes'>
<model fallback='forbid'>EPYC</model>
<vendor>AMD</vendor>
- <feature policy='require' name='acpi'/>
- <feature policy='require' name='ss'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='acpi'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='erms'/>
<feature policy='require' name='mpx'/>
<feature policy='require' name='pcommit'/>
@@ -59,11 +59,11 @@
<feature policy='disable' name='rdseed'/>
<feature policy='disable' name='sha-ni'/>
<feature policy='disable' name='xsavec'/>
- <feature policy='disable' name='fxsr_opt'/>
<feature policy='disable' name='misalignsse'/>
<feature policy='disable' name='3dnowprefetch'/>
<feature policy='disable' name='osvw'/>
<feature policy='disable' name='topoext'/>
+ <feature policy='disable' name='fxsr_opt'/>
<feature policy='disable' name='nrip-save'/>
</mode>
<mode name='custom' supported='yes'>
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..bba0e5069b 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -37,10 +37,10 @@
<mode name='host-model' supported='yes'>
<model fallback='forbid'>EPYC</model>
<vendor>AMD</vendor>
- <feature policy='require' name='acpi'/>
- <feature policy='require' name='ss'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='acpi'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='erms'/>
<feature policy='require' name='mpx'/>
<feature policy='require' name='pcommit'/>
@@ -59,11 +59,11 @@
<feature policy='disable' name='rdseed'/>
<feature policy='disable' name='sha-ni'/>
<feature policy='disable' name='xsavec'/>
- <feature policy='disable' name='fxsr_opt'/>
<feature policy='disable' name='misalignsse'/>
<feature policy='disable' name='3dnowprefetch'/>
<feature policy='disable' name='osvw'/>
<feature policy='disable' name='topoext'/>
+ <feature policy='disable' name='fxsr_opt'/>
<feature policy='disable' name='nrip-save'/>
</mode>
<mode name='custom' supported='yes'>
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..ce9035cb9b 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -37,10 +37,10 @@
<mode name='host-model' supported='yes'>
<model fallback='forbid'>EPYC</model>
<vendor>AMD</vendor>
- <feature policy='require' name='acpi'/>
- <feature policy='require' name='ss'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='acpi'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='erms'/>
<feature policy='require' name='mpx'/>
<feature policy='require' name='pcommit'/>
@@ -63,11 +63,11 @@
<feature policy='disable' name='rdseed'/>
<feature policy='disable' name='sha-ni'/>
<feature policy='disable' name='xsavec'/>
- <feature policy='disable' name='fxsr_opt'/>
<feature policy='disable' name='misalignsse'/>
<feature policy='disable' name='3dnowprefetch'/>
<feature policy='disable' name='osvw'/>
<feature policy='disable' name='topoext'/>
+ <feature policy='disable' name='fxsr_opt'/>
<feature policy='disable' name='nrip-save'/>
</mode>
<mode name='custom' supported='yes'>
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..b8a566920f 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -37,10 +37,10 @@
<mode name='host-model' supported='yes'>
<model fallback='forbid'>EPYC</model>
<vendor>AMD</vendor>
- <feature policy='require' name='acpi'/>
- <feature policy='require' name='ss'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='acpi'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='erms'/>
<feature policy='require' name='mpx'/>
<feature policy='require' name='pcommit'/>
@@ -65,10 +65,10 @@
<feature policy='disable' name='vme'/>
<feature policy='disable' name='sha-ni'/>
<feature policy='disable' name='xsavec'/>
- <feature policy='disable' name='fxsr_opt'/>
<feature policy='disable' name='misalignsse'/>
<feature policy='disable' name='osvw'/>
<feature policy='disable' name='topoext'/>
+ <feature policy='disable' name='fxsr_opt'/>
<feature policy='disable' name='nrip-save'/>
</mode>
<mode name='custom' supported='yes'>
diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
index 784a29acd9..e215b5d946 100644
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -37,10 +37,10 @@
<mode name='host-model' supported='yes'>
<model fallback='forbid'>EPYC</model>
<vendor>AMD</vendor>
- <feature policy='require' name='acpi'/>
- <feature policy='require' name='ss'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='acpi'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='erms'/>
<feature policy='require' name='mpx'/>
<feature policy='require' name='pcommit'/>
@@ -64,10 +64,10 @@
<feature policy='require' name='svme-addr-chk'/>
<feature policy='disable' name='vme'/>
<feature policy='disable' name='xsavec'/>
- <feature policy='disable' name='fxsr_opt'/>
<feature policy='disable' name='misalignsse'/>
<feature policy='disable' name='osvw'/>
<feature policy='disable' name='topoext'/>
+ <feature policy='disable' name='fxsr_opt'/>
<feature policy='disable' name='nrip-save'/>
</mode>
<mode name='custom' supported='yes'>
diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
index ab81e07510..53a28902a7 100644
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
@@ -37,10 +37,10 @@
<mode name='host-model' supported='yes'>
<model fallback='forbid'>EPYC</model>
<vendor>AMD</vendor>
- <feature policy='require' name='acpi'/>
- <feature policy='require' name='ss'/>
<feature policy='require' name='monitor'/>
<feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='acpi'/>
+ <feature policy='require' name='ss'/>
<feature policy='require' name='erms'/>
<feature policy='require' name='mpx'/>
<feature policy='require' name='pcommit'/>
@@ -65,10 +65,10 @@
<feature policy='require' name='svme-addr-chk'/>
<feature policy='disable' name='vme'/>
<feature policy='disable' name='xsavec'/>
- <feature policy='disable' name='fxsr_opt'/>
<feature policy='disable' name='misalignsse'/>
<feature policy='disable' name='osvw'/>
<feature policy='disable' name='topoext'/>
+ <feature policy='disable' name='fxsr_opt'/>
<feature policy='disable' name='nrip-save'/>
</mode>
<mode name='custom' supported='yes'>
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-4.2.0.args
b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-4.2.0.args
index f5f0e818af..52d2ac7b33 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-4.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.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-i440fx-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,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on,vmx-entry-noload-debugctl=on,vmx-entry-ia32e-mode=on,vmx-entry-load-pat=on,vmx-entry-load-efer=on,vmx-eptp-switching=on
\
+-cpu
Skylake-Client-IBRS,vmx=on,hypervisor=on,ss=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,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on,vmx-entry-noload-debugctl=on,vmx-entry-ia32e-mode=on,vmx-entry-load-pat=on,vmx-entry-load-efer=on,vmx-eptp-switching=on
\
-m size=219136k \
-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.0.0.args
b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.0.0.args
index 699f48fbaa..ca8bff1080 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.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-i440fx-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,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on,vmx-entry-noload-debugctl=on,vmx-entry-ia32e-mode=on,vmx-entry-load-pat=on,vmx-entry-load-efer=on,vmx-eptp-switching=on
\
+-cpu
Skylake-Client-IBRS,vmx=on,hypervisor=on,ss=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,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on,vmx-entry-noload-debugctl=on,vmx-entry-ia32e-mode=on,vmx-entry-load-pat=on,vmx-entry-load-efer=on,vmx-eptp-switching=on
\
-m size=219136k \
-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-4.2.0.args
b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-4.2.0.args
index cf7ad7b5f4..e4c805bf4e 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-4.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.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-i440fx-4.2,usb=off,dump-guest-core=off \
-accel tcg \
--cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
+-cpu
Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off
\
-m size=219136k \
-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.0.0.args
b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.0.0.args
index 257b271386..b90e177dce 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.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-i440fx-5.0,usb=off,dump-guest-core=off \
-accel tcg \
--cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
+-cpu
Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off
\
-m size=219136k \
-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.1.0.args
b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.1.0.args
index 71551b51a3..837fb78129 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.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-i440fx-5.1,usb=off,dump-guest-core=off \
-accel tcg \
--cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
+-cpu
Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off
\
-m size=219136k \
-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.2.0.args
b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.2.0.args
index 834d92c35a..5f356d87d4 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.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 tcg \
--cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
+-cpu
Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off
\
-m size=219136k \
-object memory-backend-ram,id=pc.ram,size=224395264 \
-overcommit mem-lock=off \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.0.0.args
b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.0.0.args
index 611bf05482..c929861cfa 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.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-i440fx-6.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel tcg \
--cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
+-cpu
Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off
\
-m size=219136k \
-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.1.0.args
b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.1.0.args
index 79ae00e993..c19affe3c6 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.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-i440fx-6.1,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel tcg \
--cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
+-cpu
Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off
\
-m size=219136k \
-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.2.0.args
b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.2.0.args
index 9c8331629a..09d287f68a 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.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-i440fx-6.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel tcg \
--cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off
\
+-cpu
Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off
\
-m size=219136k \
-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.0.0.args
b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.0.0.args
index 5929c9a87b..771ef9e453 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.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-i440fx-7.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel tcg \
--cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off
\
+-cpu
Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off
\
-m size=219136k \
-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.1.0.args
b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.1.0.args
index 141c2e36eb..40cc53482e 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.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-i440fx-7.1,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel tcg \
--cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off
\
+-cpu
Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off
\
-m size=219136k \
-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.2.0.args
b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.2.0.args
index 1e7f444d73..20b3865d00 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.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,monitor=on,hypervisor=on,acpi=on,ss=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,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,fxsr-opt=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/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.0.0.args
b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.0.0.args
index 943b0d477b..7e1a3a8be8 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.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,monitor=on,hypervisor=on,acpi=on,ss=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,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,fxsr-opt=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/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.1.0.args
b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.1.0.args
index 177f7da2b5..2c81adbb23 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.1.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc-i440fx-8.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel 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,monitor=on,hypervisor=on,acpi=on,ss=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,misalignsse=off,osvw=off,topoext=off,fxsr-opt=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/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-latest.args
b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-latest.args
index e0b49dc318..85117194f4 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.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,cmpccxadd=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,xsavec=off,fxsr-opt=off,misalignsse=off,osvw=off,topoext=off,nrip-save=off
\
+-cpu
EPYC,monitor=on,hypervisor=on,acpi=on,ss=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,cmpccxadd=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,xsavec=off,misalignsse=off,osvw=off,topoext=off,fxsr-opt=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/qemuxmlconfdata/cpu-host-model-kvm.x86_64-4.2.0.args
b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-4.2.0.args
index aacba803e8..42619fdff3 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-4.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.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,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on,vmx-entry-noload-debugctl=on,vmx-entry-ia32e-mode=on,vmx-entry-load-pat=on,vmx-entry-load-efer=on,vmx-eptp-switching=on
\
+-cpu
Skylake-Client-IBRS,vmx=on,hypervisor=on,ss=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,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on,vmx-entry-noload-debugctl=on,vmx-entry-ia32e-mode=on,vmx-entry-load-pat=on,vmx-entry-load-efer=on,vmx-eptp-switching=on
\
-m size=219136k \
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.0.0.args
b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.0.0.args
index a2415bb667..baceda1d3d 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.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,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on,vmx-entry-noload-debugctl=on,vmx-entry-ia32e-mode=on,vmx-entry-load-pat=on,vmx-entry-load-efer=on,vmx-eptp-switching=on
\
+-cpu
Skylake-Client-IBRS,vmx=on,hypervisor=on,ss=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,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on,vmx-entry-noload-debugctl=on,vmx-entry-ia32e-mode=on,vmx-entry-load-pat=on,vmx-entry-load-efer=on,vmx-eptp-switching=on
\
-m size=219136k \
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-4.2.0.args
b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-4.2.0.args
index f5f0e818af..52d2ac7b33 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-4.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.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-i440fx-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,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on,vmx-entry-noload-debugctl=on,vmx-entry-ia32e-mode=on,vmx-entry-load-pat=on,vmx-entry-load-efer=on,vmx-eptp-switching=on
\
+-cpu
Skylake-Client-IBRS,vmx=on,hypervisor=on,ss=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,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on,vmx-entry-noload-debugctl=on,vmx-entry-ia32e-mode=on,vmx-entry-load-pat=on,vmx-entry-load-efer=on,vmx-eptp-switching=on
\
-m size=219136k \
-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.0.0.args
b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.0.0.args
index 699f48fbaa..ca8bff1080 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.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-i440fx-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,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on,vmx-entry-noload-debugctl=on,vmx-entry-ia32e-mode=on,vmx-entry-load-pat=on,vmx-entry-load-efer=on,vmx-eptp-switching=on
\
+-cpu
Skylake-Client-IBRS,vmx=on,hypervisor=on,ss=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,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on,vmx-entry-noload-debugctl=on,vmx-entry-ia32e-mode=on,vmx-entry-load-pat=on,vmx-entry-load-efer=on,vmx-eptp-switching=on
\
-m size=219136k \
-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-4.2.0.args
b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-4.2.0.args
index cf7ad7b5f4..e4c805bf4e 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-4.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.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-i440fx-4.2,usb=off,dump-guest-core=off \
-accel tcg \
--cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
+-cpu
Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off
\
-m size=219136k \
-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.0.0.args
b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.0.0.args
index 257b271386..b90e177dce 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.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-i440fx-5.0,usb=off,dump-guest-core=off \
-accel tcg \
--cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
+-cpu
Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off
\
-m size=219136k \
-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.1.0.args
b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.1.0.args
index 71551b51a3..837fb78129 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.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-i440fx-5.1,usb=off,dump-guest-core=off \
-accel tcg \
--cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
+-cpu
Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off
\
-m size=219136k \
-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.2.0.args
b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.2.0.args
index 834d92c35a..5f356d87d4 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.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 tcg \
--cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
+-cpu
Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off
\
-m size=219136k \
-object memory-backend-ram,id=pc.ram,size=224395264 \
-overcommit mem-lock=off \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.0.0.args
b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.0.0.args
index 611bf05482..c929861cfa 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.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-i440fx-6.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel tcg \
--cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
+-cpu
Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off
\
-m size=219136k \
-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.1.0.args
b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.1.0.args
index 79ae00e993..c19affe3c6 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.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-i440fx-6.1,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel tcg \
--cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
+-cpu
Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off
\
-m size=219136k \
-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.2.0.args
b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.2.0.args
index 9c8331629a..09d287f68a 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.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-i440fx-6.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel tcg \
--cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off
\
+-cpu
Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off
\
-m size=219136k \
-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.0.0.args
b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.0.0.args
index 5929c9a87b..771ef9e453 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.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-i440fx-7.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel tcg \
--cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off
\
+-cpu
Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off
\
-m size=219136k \
-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.1.0.args
b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.1.0.args
index 141c2e36eb..40cc53482e 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.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-i440fx-7.1,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel tcg \
--cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off
\
+-cpu
Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off
\
-m size=219136k \
-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.2.0.args
b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.2.0.args
index 1e7f444d73..20b3865d00 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.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,monitor=on,hypervisor=on,acpi=on,ss=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,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,fxsr-opt=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/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.0.0.args
b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.0.0.args
index 943b0d477b..7e1a3a8be8 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.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,monitor=on,hypervisor=on,acpi=on,ss=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,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,fxsr-opt=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/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.1.0.args
b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.1.0.args
index 177f7da2b5..2c81adbb23 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.1.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc-i440fx-8.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel 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,monitor=on,hypervisor=on,acpi=on,ss=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,misalignsse=off,osvw=off,topoext=off,fxsr-opt=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/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-latest.args
b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-latest.args
index e0b49dc318..85117194f4 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.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,cmpccxadd=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,xsavec=off,fxsr-opt=off,misalignsse=off,osvw=off,topoext=off,nrip-save=off
\
+-cpu
EPYC,monitor=on,hypervisor=on,acpi=on,ss=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,cmpccxadd=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,xsavec=off,misalignsse=off,osvw=off,topoext=off,fxsr-opt=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/qemuxmlconfdata/cpu-host-model-tcg.x86_64-4.2.0.args
b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-4.2.0.args
index e419c1734d..425a0d3a7c 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-4.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.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 tcg \
--cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
+-cpu
Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off
\
-m size=219136k \
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.0.0.args
b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.0.0.args
index a7fd187f12..4e1912f76e 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.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 tcg \
--cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
+-cpu
Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off
\
-m size=219136k \
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.1.0.args
b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.1.0.args
index 71b61fbbc5..35c764045e 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.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 tcg \
--cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
+-cpu
Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off
\
-m size=219136k \
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.2.0.args
b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.2.0.args
index e48bcd61e3..1f976ddeda 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.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 tcg \
--cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
+-cpu
Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off
\
-m size=219136k \
-object memory-backend-ram,id=pc.ram,size=224395264 \
-overcommit mem-lock=off \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.0.0.args
b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.0.0.args
index b3deb63cf0..bdc3d5f20d 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.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 tcg \
--cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
+-cpu
Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off
\
-m size=219136k \
-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.1.0.args
b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.1.0.args
index 5835958a55..057a8aabe6 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.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 tcg \
--cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
+-cpu
Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,misalignsse=off
\
-m size=219136k \
-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.2.0.args
b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.2.0.args
index 6b1a1a6055..262aa05e46 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.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 tcg \
--cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off
\
+-cpu
Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off
\
-m size=219136k \
-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.0.0.args
b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.0.0.args
index b023c9e280..abba7d38ba 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.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 tcg \
--cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off
\
+-cpu
Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off
\
-m size=219136k \
-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.1.0.args
b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.1.0.args
index 4c2255868d..f698ad8f3c 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.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 tcg \
--cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off
\
+-cpu
Opteron_G3,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,acpi=on,ss=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,cr8legacy=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off
\
-m size=219136k \
-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.2.0.args
b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.2.0.args
index 4f411a718a..87eab5218e 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.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 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,monitor=on,hypervisor=on,acpi=on,ss=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,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,fxsr-opt=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/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.0.0.args
b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.0.0.args
index ae10640e4d..7ca5d33b42 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.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 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,monitor=on,hypervisor=on,acpi=on,ss=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,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,fxsr-opt=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/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.1.0.args
b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.1.0.args
index 4d132a9da0..9763f7370b 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.1.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc-q35-8.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel 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,monitor=on,hypervisor=on,acpi=on,ss=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,misalignsse=off,osvw=off,topoext=off,fxsr-opt=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/qemuxmlconfdata/cpu-host-model-tcg.x86_64-latest.args
b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-latest.args
index edd492b222..69d278c72c 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.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 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,cmpccxadd=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,xsavec=off,fxsr-opt=off,misalignsse=off,osvw=off,topoext=off,nrip-save=off
\
+-cpu
EPYC,monitor=on,hypervisor=on,acpi=on,ss=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,cmpccxadd=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,xsavec=off,misalignsse=off,osvw=off,topoext=off,fxsr-opt=off,nrip-save=off
\
-m size=219136k \
-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
--
2.43.0
4:44 a.m.
New subject: [PATCH v2 2/4] cpu_map: Format register values
Use "0x%08x" as format for all values:
sed \
-e "s/'0x\(..\)'/'0x000000\\1'/g" \
-e "s/'0x\(...\)'/'0x00000\\1'/g"
Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com>
---
src/cpu_map/x86_features.xml | 538 +++++++++++++++++------------------
1 file changed, 269 insertions(+), 269 deletions(-)
diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index ded81c3667..b89bd5a2fa 100644
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -8,516 +8,516 @@
<!-- standard features, ECX -->
<feature name='pni'>
<alias name='sse3' source='qemu'/>
- <cpuid eax_in='0x01' ecx='0x00000001'/>
+ <cpuid eax_in='0x00000001' ecx='0x00000001'/>
</feature>
<feature name='pclmuldq'>
<alias name='pclmulqdq' source='qemu'/>
- <cpuid eax_in='0x01' ecx='0x00000002'/>
+ <cpuid eax_in='0x00000001' ecx='0x00000002'/>
</feature>
<feature name='dtes64'>
- <cpuid eax_in='0x01' ecx='0x00000004'/>
+ <cpuid eax_in='0x00000001' ecx='0x00000004'/>
</feature>
<feature name='monitor'>
- <cpuid eax_in='0x01' ecx='0x00000008'/>
+ <cpuid eax_in='0x00000001' ecx='0x00000008'/>
</feature>
<feature name='ds_cpl'>
<alias name='ds-cpl' source='qemu'/>
- <cpuid eax_in='0x01' ecx='0x00000010'/>
+ <cpuid eax_in='0x00000001' ecx='0x00000010'/>
</feature>
<feature name='vmx'>
- <cpuid eax_in='0x01' ecx='0x00000020'/>
+ <cpuid eax_in='0x00000001' ecx='0x00000020'/>
</feature>
<feature name='smx'>
- <cpuid eax_in='0x01' ecx='0x00000040'/>
+ <cpuid eax_in='0x00000001' ecx='0x00000040'/>
</feature>
<feature name='est'>
- <cpuid eax_in='0x01' ecx='0x00000080'/>
+ <cpuid eax_in='0x00000001' ecx='0x00000080'/>
</feature>
<feature name='tm2'>
- <cpuid eax_in='0x01' ecx='0x00000100'/>
+ <cpuid eax_in='0x00000001' ecx='0x00000100'/>
</feature>
<feature name='ssse3'>
- <cpuid eax_in='0x01' ecx='0x00000200'/>
+ <cpuid eax_in='0x00000001' ecx='0x00000200'/>
</feature>
<feature name='cid'>
- <cpuid eax_in='0x01' ecx='0x00000400'/>
+ <cpuid eax_in='0x00000001' ecx='0x00000400'/>
</feature>
<feature name='fma'>
- <cpuid eax_in='0x01' ecx='0x00001000'/>
+ <cpuid eax_in='0x00000001' ecx='0x00001000'/>
</feature>
<feature name='cx16'>
- <cpuid eax_in='0x01' ecx='0x00002000'/>
+ <cpuid eax_in='0x00000001' ecx='0x00002000'/>
</feature>
<feature name='xtpr'>
- <cpuid eax_in='0x01' ecx='0x00004000'/>
+ <cpuid eax_in='0x00000001' ecx='0x00004000'/>
</feature>
<feature name='pdcm'>
- <cpuid eax_in='0x01' ecx='0x00008000'/>
+ <cpuid eax_in='0x00000001' ecx='0x00008000'/>
</feature>
<feature name='pcid'>
- <cpuid eax_in='0x01' ecx='0x00020000'/>
+ <cpuid eax_in='0x00000001' ecx='0x00020000'/>
</feature>
<feature name='dca'>
- <cpuid eax_in='0x01' ecx='0x00040000'/>
+ <cpuid eax_in='0x00000001' ecx='0x00040000'/>
</feature>
<feature name='sse4.1'>
<alias name='sse4-1' source='qemu'/>
<alias name='sse4_1' source='qemu'/>
- <cpuid eax_in='0x01' ecx='0x00080000'/>
+ <cpuid eax_in='0x00000001' ecx='0x00080000'/>
</feature>
<feature name='sse4.2'>
<alias name='sse4-2' source='qemu'/>
<alias name='sse4_2' source='qemu'/>
- <cpuid eax_in='0x01' ecx='0x00100000'/>
+ <cpuid eax_in='0x00000001' ecx='0x00100000'/>
</feature>
<feature name='x2apic'>
- <cpuid eax_in='0x01' ecx='0x00200000'/>
+ <cpuid eax_in='0x00000001' ecx='0x00200000'/>
</feature>
<feature name='movbe'>
- <cpuid eax_in='0x01' ecx='0x00400000'/>
+ <cpuid eax_in='0x00000001' ecx='0x00400000'/>
</feature>
<feature name='popcnt'>
- <cpuid eax_in='0x01' ecx='0x00800000'/>
+ <cpuid eax_in='0x00000001' ecx='0x00800000'/>
</feature>
<feature name='tsc-deadline'>
- <cpuid eax_in='0x01' ecx='0x01000000'/>
+ <cpuid eax_in='0x00000001' ecx='0x01000000'/>
</feature>
<feature name='aes'>
- <cpuid eax_in='0x01' ecx='0x02000000'/>
+ <cpuid eax_in='0x00000001' ecx='0x02000000'/>
</feature>
<feature name='xsave'>
- <cpuid eax_in='0x01' ecx='0x04000000'/>
+ <cpuid eax_in='0x00000001' ecx='0x04000000'/>
</feature>
<feature name='osxsave'>
- <cpuid eax_in='0x01' ecx='0x08000000'/>
+ <cpuid eax_in='0x00000001' ecx='0x08000000'/>
</feature>
<feature name='avx'>
- <cpuid eax_in='0x01' ecx='0x10000000'/>
+ <cpuid eax_in='0x00000001' ecx='0x10000000'/>
</feature>
<feature name='f16c'>
- <cpuid eax_in='0x01' ecx='0x20000000'/>
+ <cpuid eax_in='0x00000001' ecx='0x20000000'/>
</feature>
<feature name='rdrand'>
- <cpuid eax_in='0x01' ecx='0x40000000'/>
+ <cpuid eax_in='0x00000001' ecx='0x40000000'/>
</feature>
<feature name='hypervisor'>
- <cpuid eax_in='0x01' ecx='0x80000000'/>
+ <cpuid eax_in='0x00000001' ecx='0x80000000'/>
</feature>
<!-- standard features, EDX -->
<feature name='fpu'>
- <cpuid eax_in='0x01' edx='0x00000001'/>
+ <cpuid eax_in='0x00000001' edx='0x00000001'/>
</feature>
<feature name='vme'>
- <cpuid eax_in='0x01' edx='0x00000002'/>
+ <cpuid eax_in='0x00000001' edx='0x00000002'/>
</feature>
<feature name='de'>
- <cpuid eax_in='0x01' edx='0x00000004'/>
+ <cpuid eax_in='0x00000001' edx='0x00000004'/>
</feature>
<feature name='pse'>
- <cpuid eax_in='0x01' edx='0x00000008'/>
+ <cpuid eax_in='0x00000001' edx='0x00000008'/>
</feature>
<feature name='tsc'>
- <cpuid eax_in='0x01' edx='0x00000010'/>
+ <cpuid eax_in='0x00000001' edx='0x00000010'/>
</feature>
<feature name='msr'>
- <cpuid eax_in='0x01' edx='0x00000020'/>
+ <cpuid eax_in='0x00000001' edx='0x00000020'/>
</feature>
<feature name='pae'>
- <cpuid eax_in='0x01' edx='0x00000040'/>
+ <cpuid eax_in='0x00000001' edx='0x00000040'/>
</feature>
<feature name='mce'>
- <cpuid eax_in='0x01' edx='0x00000080'/>
+ <cpuid eax_in='0x00000001' edx='0x00000080'/>
</feature>
<feature name='cx8'>
- <cpuid eax_in='0x01' edx='0x00000100'/>
+ <cpuid eax_in='0x00000001' edx='0x00000100'/>
</feature>
<feature name='apic'>
- <cpuid eax_in='0x01' edx='0x00000200'/>
+ <cpuid eax_in='0x00000001' edx='0x00000200'/>
</feature>
<feature name='sep'>
- <cpuid eax_in='0x01' edx='0x00000800'/>
+ <cpuid eax_in='0x00000001' edx='0x00000800'/>
</feature>
<feature name='mtrr'>
- <cpuid eax_in='0x01' edx='0x00001000'/>
+ <cpuid eax_in='0x00000001' edx='0x00001000'/>
</feature>
<feature name='pge'>
- <cpuid eax_in='0x01' edx='0x00002000'/>
+ <cpuid eax_in='0x00000001' edx='0x00002000'/>
</feature>
<feature name='mca'>
- <cpuid eax_in='0x01' edx='0x00004000'/>
+ <cpuid eax_in='0x00000001' edx='0x00004000'/>
</feature>
<feature name='cmov'>
- <cpuid eax_in='0x01' edx='0x00008000'/>
+ <cpuid eax_in='0x00000001' edx='0x00008000'/>
</feature>
<feature name='pat'>
- <cpuid eax_in='0x01' edx='0x00010000'/>
+ <cpuid eax_in='0x00000001' edx='0x00010000'/>
</feature>
<feature name='pse36'>
- <cpuid eax_in='0x01' edx='0x00020000'/>
+ <cpuid eax_in='0x00000001' edx='0x00020000'/>
</feature>
<feature name='pn'>
- <cpuid eax_in='0x01' edx='0x00040000'/>
+ <cpuid eax_in='0x00000001' edx='0x00040000'/>
</feature>
<feature name='clflush'>
- <cpuid eax_in='0x01' edx='0x00080000'/>
+ <cpuid eax_in='0x00000001' edx='0x00080000'/>
</feature>
<feature name='ds'>
- <cpuid eax_in='0x01' edx='0x00200000'/>
+ <cpuid eax_in='0x00000001' edx='0x00200000'/>
</feature>
<feature name='acpi'>
- <cpuid eax_in='0x01' edx='0x00400000'/>
+ <cpuid eax_in='0x00000001' edx='0x00400000'/>
</feature>
<feature name='mmx'>
- <cpuid eax_in='0x01' edx='0x00800000'/>
+ <cpuid eax_in='0x00000001' edx='0x00800000'/>
</feature>
<feature name='fxsr'>
- <cpuid eax_in='0x01' edx='0x01000000'/>
+ <cpuid eax_in='0x00000001' edx='0x01000000'/>
</feature>
<feature name='sse'>
- <cpuid eax_in='0x01' edx='0x02000000'/>
+ <cpuid eax_in='0x00000001' edx='0x02000000'/>
</feature>
<feature name='sse2'>
- <cpuid eax_in='0x01' edx='0x04000000'/>
+ <cpuid eax_in='0x00000001' edx='0x04000000'/>
</feature>
<feature name='ss'>
- <cpuid eax_in='0x01' edx='0x08000000'/>
+ <cpuid eax_in='0x00000001' edx='0x08000000'/>
</feature>
<feature name='ht'>
- <cpuid eax_in='0x01' edx='0x10000000'/>
+ <cpuid eax_in='0x00000001' edx='0x10000000'/>
</feature>
<feature name='tm'>
- <cpuid eax_in='0x01' edx='0x20000000'/>
+ <cpuid eax_in='0x00000001' edx='0x20000000'/>
</feature>
<feature name='ia64'>
- <cpuid eax_in='0x01' edx='0x40000000'/>
+ <cpuid eax_in='0x00000001' edx='0x40000000'/>
</feature>
<feature name='pbe'>
- <cpuid eax_in='0x01' edx='0x80000000'/>
+ <cpuid eax_in='0x00000001' edx='0x80000000'/>
</feature>
<!-- Termal Power and Management -->
<feature name='arat'>
- <cpuid eax_in='0x06' eax='0x00000004'/>
+ <cpuid eax_in='0x00000006' eax='0x00000004'/>
</feature>
<!-- cpuid function 0x7 ecx 0x0 features -->
<feature name='fsgsbase'>
- <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000001'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00000001'/>
</feature>
<feature name='tsc_adjust'>
<alias name='tsc-adjust' source='qemu'/>
- <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000002'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00000002'/>
</feature>
<feature name='sgx'>
- <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000004'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00000004'/>
</feature>
<feature name='bmi1'>
- <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000008'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00000008'/>
</feature>
<feature name='hle'>
- <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000010'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00000010'/>
</feature>
<feature name='avx2'>
- <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000020'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00000020'/>
</feature>
<feature name='smep'>
- <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000080'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00000080'/>
</feature>
<feature name='bmi2'>
- <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000100'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00000100'/>
</feature>
<feature name='erms'>
- <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000200'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00000200'/>
</feature>
<feature name='invpcid'>
- <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000400'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00000400'/>
</feature>
<feature name='rtm'>
- <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00000800'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00000800'/>
</feature>
<feature name='cmt'>
<alias name='cqm' source='linux'/>
- <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00001000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00001000'/>
</feature>
<feature name='mpx'>
- <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00004000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00004000'/>
</feature>
<feature name='avx512f'>
- <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00010000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00010000'/>
</feature>
<feature name='avx512dq'>
- <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00020000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00020000'/>
</feature>
<feature name='rdseed'>
- <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00040000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00040000'/>
</feature>
<feature name='adx'>
- <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00080000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00080000'/>
</feature>
<feature name='smap'>
- <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00100000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00100000'/>
</feature>
<feature name='avx512ifma'>
- <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00200000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00200000'/>
</feature>
<feature name='pcommit'>
- <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00400000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00400000'/>
</feature>
<feature name='clflushopt'>
- <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x00800000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00800000'/>
</feature>
<feature name='clwb'>
- <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x01000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x01000000'/>
</feature>
<feature name='intel-pt'>
- <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x02000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x02000000'/>
</feature>
<feature name='avx512pf'>
- <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x04000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x04000000'/>
</feature>
<feature name='avx512er'>
- <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x08000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x08000000'/>
</feature>
<feature name='avx512cd'>
- <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x10000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x10000000'/>
</feature>
<feature name='sha-ni'>
- <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x20000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x20000000'/>
</feature>
<feature name='avx512bw'>
- <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x40000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x40000000'/>
</feature>
<feature name='avx512vl'>
- <cpuid eax_in='0x07' ecx_in='0x00' ebx='0x80000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x80000000'/>
</feature>
<feature name='avx512vbmi'>
- <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000002'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ecx='0x00000002'/>
</feature>
<feature name='umip'>
- <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000004'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ecx='0x00000004'/>
</feature>
<feature name='pku'>
- <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000008'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ecx='0x00000008'/>
</feature>
<feature name='ospke'>
- <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000010'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ecx='0x00000010'/>
</feature>
<feature name='waitpkg'>
- <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000020'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ecx='0x00000020'/>
</feature>
<feature name='avx512vbmi2'>
- <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000040'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ecx='0x00000040'/>
</feature>
<feature name='gfni'>
- <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000100'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ecx='0x00000100'/>
</feature>
<feature name='vaes'>
- <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000200'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ecx='0x00000200'/>
</feature>
<feature name='vpclmulqdq'>
- <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000400'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ecx='0x00000400'/>
</feature>
<feature name='avx512vnni'>
- <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00000800'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ecx='0x00000800'/>
</feature>
<feature name='avx512bitalg'>
- <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00001000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ecx='0x00001000'/>
</feature>
<feature name='avx512-vpopcntdq'>
- <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00004000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ecx='0x00004000'/>
</feature>
<feature name='la57'>
- <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00010000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ecx='0x00010000'/>
</feature>
<feature name='rdpid'>
- <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x00400000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ecx='0x00400000'/>
</feature>
<feature name='bus-lock-detect'>
- <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x01000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ecx='0x01000000'/>
</feature>
<feature name='cldemote'>
- <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x02000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ecx='0x02000000'/>
</feature>
<feature name='movdiri'>
- <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x08000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ecx='0x08000000'/>
</feature>
<feature name='movdir64b'>
- <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x10000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ecx='0x10000000'/>
</feature>
<feature name='sgxlc'>
- <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x40000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ecx='0x40000000'/>
</feature>
<feature name='pks'>
- <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x80000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
ecx='0x80000000'/>
</feature>
<feature name='avx512-4vnniw'>
- <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000004'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
edx='0x00000004'/>
</feature>
<feature name='avx512-4fmaps'>
- <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000008'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
edx='0x00000008'/>
</feature>
<feature name='fsrm'>
- <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000010'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
edx='0x00000010'/>
</feature>
<feature name='avx512-vp2intersect'>
- <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000100'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
edx='0x00000100'/>
</feature>
<feature name='md-clear'>
<alias name='md_clear' source='linux'/>
- <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000400'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
edx='0x00000400'/>
</feature>
<feature name='serialize'>
- <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00004000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
edx='0x00004000'/>
</feature>
<feature name='tsx-ldtrk'>
- <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00010000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
edx='0x00010000'/>
</feature>
<feature name='pconfig'>
- <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00040000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
edx='0x00040000'/>
</feature>
<feature name='arch-lbr'>
- <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00080000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
edx='0x00080000'/>
</feature>
<feature name='amx-bf16'>
- <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00400000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
edx='0x00400000'/>
</feature>
<feature name='avx512-fp16'>
- <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00800000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
edx='0x00800000'/>
</feature>
<feature name='amx-tile'>
- <cpuid eax_in='0x07' ecx_in='0x00' edx='0x01000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
edx='0x01000000'/>
</feature>
<feature name='amx-int8'>
- <cpuid eax_in='0x07' ecx_in='0x00' edx='0x02000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
edx='0x02000000'/>
</feature>
<feature name='spec-ctrl'>
- <cpuid eax_in='0x07' ecx_in='0x00' edx='0x04000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
edx='0x04000000'/>
</feature>
<feature name='stibp'>
- <cpuid eax_in='0x07' ecx_in='0x00' edx='0x08000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
edx='0x08000000'/>
</feature>
<feature name='flush-l1d'>
- <cpuid eax_in='0x07' ecx_in='0x00' edx='0x10000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
edx='0x10000000'/>
</feature>
<feature name='arch-capabilities'>
<alias name='arch_capabilities' source='linux'/>
- <cpuid eax_in='0x07' ecx_in='0x00' edx='0x20000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
edx='0x20000000'/>
</feature>
<feature name='core-capability'>
- <cpuid eax_in='0x07' ecx_in='0x00' edx='0x40000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
edx='0x40000000'/>
</feature>
<feature name='ssbd'>
- <cpuid eax_in='0x07' ecx_in='0x00' edx='0x80000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000000'
edx='0x80000000'/>
</feature>
<feature name='avx-vnni'>
- <cpuid eax_in='0x07' ecx_in='0x01' eax='0x00000010'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000001'
eax='0x00000010'/>
</feature>
<feature name='avx512-bf16'>
- <cpuid eax_in='0x07' ecx_in='0x01' eax='0x00000020'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000001'
eax='0x00000020'/>
</feature>
<feature name='cmpccxadd'>
- <cpuid eax_in='0x07' ecx_in='0x01' eax='0x00000080'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000001'
eax='0x00000080'/>
</feature>
<feature name='fzrm'>
- <cpuid eax_in='0x07' ecx_in='0x01' eax='0x00000400'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000001'
eax='0x00000400'/>
</feature>
<feature name='fsrs'>
- <cpuid eax_in='0x07' ecx_in='0x01' eax='0x00000800'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000001'
eax='0x00000800'/>
</feature>
<feature name='fsrc'>
- <cpuid eax_in='0x07' ecx_in='0x01' eax='0x00001000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000001'
eax='0x00001000'/>
</feature>
<feature name='amx-fp16'>
- <cpuid eax_in='0x07' ecx_in='0x01' eax='0x00200000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000001'
eax='0x00200000'/>
</feature>
<feature name='avx-ifma'>
- <cpuid eax_in='0x07' ecx_in='0x01' eax='0x00800000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000001'
eax='0x00800000'/>
</feature>
<feature name='avx-vnni-int8'>
- <cpuid eax_in='0x07' ecx_in='0x01' edx='0x00000010'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000001'
edx='0x00000010'/>
</feature>
<feature name='avx-ne-convert'>
- <cpuid eax_in='0x07' ecx_in='0x01' edx='0x00000020'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000001'
edx='0x00000020'/>
</feature>
<feature name='amx-complex'>
- <cpuid eax_in='0x07' ecx_in='0x01' edx='0x00000100'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000001'
edx='0x00000100'/>
</feature>
<feature name='prefetchiti'>
- <cpuid eax_in='0x07' ecx_in='0x01' edx='0x00004000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000001'
edx='0x00004000'/>
</feature>
<feature name='mcdt-no'>
- <cpuid eax_in='0x07' ecx_in='0x02' edx='0x00000020'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00000002'
edx='0x00000020'/>
</feature>
<!-- Processor Extended State Enumeration sub leaf 1 -->
<feature name='xsaveopt'>
- <cpuid eax_in='0x0d' ecx_in='0x01' eax='0x00000001'/>
+ <cpuid eax_in='0x0000000d' ecx_in='0x00000001'
eax='0x00000001'/>
</feature>
<feature name='xsavec'>
- <cpuid eax_in='0x0d' ecx_in='0x01' eax='0x00000002'/>
+ <cpuid eax_in='0x0000000d' ecx_in='0x00000001'
eax='0x00000002'/>
</feature>
<feature name='xgetbv1'>
- <cpuid eax_in='0x0d' ecx_in='0x01' eax='0x00000004'/>
+ <cpuid eax_in='0x0000000d' ecx_in='0x00000001'
eax='0x00000004'/>
</feature>
<feature name='xsaves' migratable='no'>
- <cpuid eax_in='0x0d' ecx_in='0x01' eax='0x00000008'/>
+ <cpuid eax_in='0x0000000d' ecx_in='0x00000001'
eax='0x00000008'/>
</feature>
<feature name='xfd'>
- <cpuid eax_in='0x0d' ecx_in='0x01' eax='0x00000010'/>
+ <cpuid eax_in='0x0000000d' ecx_in='0x00000001'
eax='0x00000010'/>
</feature>
<!-- cpuid level 0x0000000f:1 (edx) -->
<feature name='mbm_total'>
- <cpuid eax_in='0x0f' ecx_in='0x01' edx='0x00000002'/>
+ <cpuid eax_in='0x0000000f' ecx_in='0x00000001'
edx='0x00000002'/>
</feature>
<feature name='mbm_local'>
- <cpuid eax_in='0x0f' ecx_in='0x01' edx='0x00000004'/>
+ <cpuid eax_in='0x0000000f' ecx_in='0x00000001'
edx='0x00000004'/>
</feature>
<!-- cpuid level 0x00000012 ecx 0x0 features -->
<feature name='sgx1'>
- <cpuid eax_in='0x12' ecx_in='0x00' eax='0x00000001'/>
+ <cpuid eax_in='0x00000012' ecx_in='0x00000000'
eax='0x00000001'/>
</feature>
<feature name='sgx2'>
- <cpuid eax_in='0x12' ecx_in='0x00' eax='0x00000002'/>
+ <cpuid eax_in='0x00000012' ecx_in='0x00000000'
eax='0x00000002'/>
</feature>
<feature name='sgx-edeccssa'>
- <cpuid eax_in='0x12' ecx_in='0x00' eax='0x00000800'/>
+ <cpuid eax_in='0x00000012' ecx_in='0x00000000'
eax='0x00000800'/>
</feature>
<feature name='sgx-exinfo'>
- <cpuid eax_in='0x12' ecx_in='0x00' ebx='0x00000001'/>
+ <cpuid eax_in='0x00000012' ecx_in='0x00000000'
ebx='0x00000001'/>
</feature>
<!-- cpuid level 0x00000012 ecx 0x1 features -->
<feature name='sgx-debug'>
- <cpuid eax_in='0x12' ecx_in='0x01' eax='0x00000002'/>
+ <cpuid eax_in='0x00000012' ecx_in='0x00000001'
eax='0x00000002'/>
</feature>
<feature name='sgx-mode64'>
- <cpuid eax_in='0x12' ecx_in='0x01' eax='0x00000004'/>
+ <cpuid eax_in='0x00000012' ecx_in='0x00000001'
eax='0x00000004'/>
</feature>
<feature name='sgx-provisionkey'>
- <cpuid eax_in='0x12' ecx_in='0x01' eax='0x00000010'/>
+ <cpuid eax_in='0x00000012' ecx_in='0x00000001'
eax='0x00000010'/>
</feature>
<feature name='sgx-tokenkey'>
- <cpuid eax_in='0x12' ecx_in='0x01' eax='0x00000020'/>
+ <cpuid eax_in='0x00000012' ecx_in='0x00000001'
eax='0x00000020'/>
</feature>
<feature name='sgx-kss'>
- <cpuid eax_in='0x12' ecx_in='0x01' eax='0x00000080'/>
+ <cpuid eax_in='0x00000012' ecx_in='0x00000001'
eax='0x00000080'/>
</feature>
<feature name='sgx-aex-notify'>
- <cpuid eax_in='0x12' ecx_in='0x01' eax='0x00000400'/>
+ <cpuid eax_in='0x00000012' ecx_in='0x00000001'
eax='0x00000400'/>
</feature>
<!-- cpuid level 0x00000014 ecx 0x0 features -->
<feature name='intel-pt-lip'>
- <cpuid eax_in='0x14' ecx_in='0x00' ecx='0x80000000'/>
+ <cpuid eax_in='0x00000014' ecx_in='0x00000000'
ecx='0x80000000'/>
</feature>
<!-- extended features, ECX -->
@@ -737,342 +737,342 @@
<!-- IA32_CORE_CAPABILITIES features -->
<feature name='split-lock-detect'>
- <msr index='0xcf' edx='0x00000000' eax='0x00000020'/>
+ <msr index='0x000000cf' edx='0x00000000'
eax='0x00000020'/>
</feature>
<!-- IA32_ARCH_CAPABILITIES features -->
<feature name='rdctl-no'>
- <msr index='0x10a' edx='0x00000000' eax='0x00000001'/>
+ <msr index='0x0000010a' edx='0x00000000'
eax='0x00000001'/>
</feature>
<feature name='ibrs-all'>
- <msr index='0x10a' edx='0x00000000' eax='0x00000002'/>
+ <msr index='0x0000010a' edx='0x00000000'
eax='0x00000002'/>
</feature>
<feature name='rsba'>
- <msr index='0x10a' edx='0x00000000' eax='0x00000004'/>
+ <msr index='0x0000010a' edx='0x00000000'
eax='0x00000004'/>
</feature>
<feature name='skip-l1dfl-vmentry'>
- <msr index='0x10a' edx='0x00000000' eax='0x00000008'/>
+ <msr index='0x0000010a' edx='0x00000000'
eax='0x00000008'/>
</feature>
<feature name='ssb-no'>
- <msr index='0x10a' edx='0x00000000' eax='0x00000010'/>
+ <msr index='0x0000010a' edx='0x00000000'
eax='0x00000010'/>
</feature>
<feature name='mds-no'>
- <msr index='0x10a' edx='0x00000000' eax='0x00000020'/>
+ <msr index='0x0000010a' edx='0x00000000'
eax='0x00000020'/>
</feature>
<feature name='pschange-mc-no'>
- <msr index='0x10a' edx='0x00000000' eax='0x00000040'/>
+ <msr index='0x0000010a' edx='0x00000000'
eax='0x00000040'/>
</feature>
<feature name='tsx-ctrl'>
- <msr index='0x10a' edx='0x00000000' eax='0x00000080'/>
+ <msr index='0x0000010a' edx='0x00000000'
eax='0x00000080'/>
</feature>
<feature name='taa-no'>
- <msr index='0x10a' edx='0x00000000' eax='0x00000100'/>
+ <msr index='0x0000010a' edx='0x00000000'
eax='0x00000100'/>
</feature>
<feature name='sbdr-ssdp-no'>
- <msr index='0x10a' edx='0x00000000' eax='0x00002000'/>
+ <msr index='0x0000010a' edx='0x00000000'
eax='0x00002000'/>
</feature>
<feature name='fbsdp-no'>
- <msr index='0x10a' edx='0x00000000' eax='0x00004000'/>
+ <msr index='0x0000010a' edx='0x00000000'
eax='0x00004000'/>
</feature>
<feature name='psdp-no'>
- <msr index='0x10a' edx='0x00000000' eax='0x00008000'/>
+ <msr index='0x0000010a' edx='0x00000000'
eax='0x00008000'/>
</feature>
<feature name='fb-clear'>
- <msr index='0x10a' edx='0x00000000' eax='0x00020000'/>
+ <msr index='0x0000010a' edx='0x00000000'
eax='0x00020000'/>
</feature>
<feature name='pbrsb-no'>
- <msr index='0x10a' edx='0x00000000' eax='0x01000000'/>
+ <msr index='0x0000010a' edx='0x00000000'
eax='0x01000000'/>
</feature>
<feature name='gds-no'>
- <msr index='0x10a' edx='0x00000000' eax='0x04000000'/>
+ <msr index='0x0000010a' edx='0x00000000'
eax='0x04000000'/>
</feature>
<feature name='vmx-ins-outs'>
- <msr index='0x480' edx='0x00400000' eax='0x00000000'/>
+ <msr index='0x00000480' edx='0x00400000'
eax='0x00000000'/>
</feature>
<feature name='vmx-true-ctls'>
- <msr index='0x480' edx='0x00800000' eax='0x00000000'/>
+ <msr index='0x00000480' edx='0x00800000'
eax='0x00000000'/>
</feature>
<feature name='vmx-any-errcode'>
- <msr index='0x480' edx='0x01000000' eax='0x00000000'/>
+ <msr index='0x00000480' edx='0x01000000'
eax='0x00000000'/>
</feature>
<feature name='vmx-store-lma'>
- <msr index='0x485' edx='0x00000000' eax='0x00000020'/>
+ <msr index='0x00000485' edx='0x00000000'
eax='0x00000020'/>
</feature>
<feature name='vmx-activity-hlt'>
- <msr index='0x485' edx='0x00000000' eax='0x00000040'/>
+ <msr index='0x00000485' edx='0x00000000'
eax='0x00000040'/>
</feature>
<feature name='vmx-activity-shutdown'>
- <msr index='0x485' edx='0x00000000' eax='0x00000080'/>
+ <msr index='0x00000485' edx='0x00000000'
eax='0x00000080'/>
</feature>
<feature name='vmx-activity-wait-sipi'>
- <msr index='0x485' edx='0x00000000' eax='0x00000100'/>
+ <msr index='0x00000485' edx='0x00000000'
eax='0x00000100'/>
</feature>
<feature name='vmx-vmwrite-vmexit-fields'>
- <msr index='0x485' edx='0x00000000' eax='0x20000000'/>
+ <msr index='0x00000485' edx='0x00000000'
eax='0x20000000'/>
</feature>
<feature name='vmx-zero-len-inject'>
- <msr index='0x485' edx='0x00000000' eax='0x40000000'/>
+ <msr index='0x00000485' edx='0x00000000'
eax='0x40000000'/>
</feature>
<feature name='vmx-apicv-xapic'>
- <msr index='0x48b' edx='0x00000000' eax='0x00000001'/>
+ <msr index='0x0000048b' edx='0x00000000'
eax='0x00000001'/>
</feature>
<feature name='vmx-ept'>
- <msr index='0x48b' edx='0x00000000' eax='0x00000002'/>
+ <msr index='0x0000048b' edx='0x00000000'
eax='0x00000002'/>
</feature>
<feature name='vmx-desc-exit'>
- <msr index='0x48b' edx='0x00000000' eax='0x00000004'/>
+ <msr index='0x0000048b' edx='0x00000000'
eax='0x00000004'/>
</feature>
<feature name='vmx-rdtscp-exit'>
- <msr index='0x48b' edx='0x00000000' eax='0x00000008'/>
+ <msr index='0x0000048b' edx='0x00000000'
eax='0x00000008'/>
</feature>
<feature name='vmx-apicv-x2apic'>
- <msr index='0x48b' edx='0x00000000' eax='0x00000010'/>
+ <msr index='0x0000048b' edx='0x00000000'
eax='0x00000010'/>
</feature>
<feature name='vmx-vpid'>
- <msr index='0x48b' edx='0x00000000' eax='0x00000020'/>
+ <msr index='0x0000048b' edx='0x00000000'
eax='0x00000020'/>
</feature>
<feature name='vmx-wbinvd-exit'>
- <msr index='0x48b' edx='0x00000000' eax='0x00000040'/>
+ <msr index='0x0000048b' edx='0x00000000'
eax='0x00000040'/>
</feature>
<feature name='vmx-unrestricted-guest'>
- <msr index='0x48b' edx='0x00000000' eax='0x00000080'/>
+ <msr index='0x0000048b' edx='0x00000000'
eax='0x00000080'/>
</feature>
<feature name='vmx-apicv-register'>
- <msr index='0x48b' edx='0x00000000' eax='0x00000100'/>
+ <msr index='0x0000048b' edx='0x00000000'
eax='0x00000100'/>
</feature>
<feature name='vmx-apicv-vid'>
- <msr index='0x48b' edx='0x00000000' eax='0x00000200'/>
+ <msr index='0x0000048b' edx='0x00000000'
eax='0x00000200'/>
</feature>
<feature name='vmx-ple'>
- <msr index='0x48b' edx='0x00000000' eax='0x00000400'/>
+ <msr index='0x0000048b' edx='0x00000000'
eax='0x00000400'/>
</feature>
<feature name='vmx-rdrand-exit'>
- <msr index='0x48b' edx='0x00000000' eax='0x00000800'/>
+ <msr index='0x0000048b' edx='0x00000000'
eax='0x00000800'/>
</feature>
<feature name='vmx-invpcid-exit'>
- <msr index='0x48b' edx='0x00000000' eax='0x00001000'/>
+ <msr index='0x0000048b' edx='0x00000000'
eax='0x00001000'/>
</feature>
<feature name='vmx-vmfunc'>
- <msr index='0x48b' edx='0x00000000' eax='0x00002000'/>
+ <msr index='0x0000048b' edx='0x00000000'
eax='0x00002000'/>
</feature>
<feature name='vmx-shadow-vmcs'>
- <msr index='0x48b' edx='0x00000000' eax='0x00004000'/>
+ <msr index='0x0000048b' edx='0x00000000'
eax='0x00004000'/>
</feature>
<feature name='vmx-encls-exit'>
- <msr index='0x48b' edx='0x00000000' eax='0x00008000'/>
+ <msr index='0x0000048b' edx='0x00000000'
eax='0x00008000'/>
</feature>
<feature name='vmx-rdseed-exit'>
- <msr index='0x48b' edx='0x00000000' eax='0x00010000'/>
+ <msr index='0x0000048b' edx='0x00000000'
eax='0x00010000'/>
</feature>
<feature name='vmx-pml'>
- <msr index='0x48b' edx='0x00000000' eax='0x00020000'/>
+ <msr index='0x0000048b' edx='0x00000000'
eax='0x00020000'/>
</feature>
<feature name='vmx-xsaves'>
- <msr index='0x48b' edx='0x00000000' eax='0x00100000'/>
+ <msr index='0x0000048b' edx='0x00000000'
eax='0x00100000'/>
</feature>
<feature name='vmx-tsc-scaling'>
- <msr index='0x48b' edx='0x00000000' eax='0x02000000'/>
+ <msr index='0x0000048b' edx='0x00000000'
eax='0x02000000'/>
</feature>
<feature name='vmx-enable-user-wait-pause'>
- <msr index='0x48b' edx='0x00000000' eax='0x04000000'/>
+ <msr index='0x0000048b' edx='0x00000000'
eax='0x04000000'/>
</feature>
<feature name='vmx-ept-execonly'>
- <msr index='0x48c' edx='0x00000000' eax='0x00000001'/>
+ <msr index='0x0000048c' edx='0x00000000'
eax='0x00000001'/>
</feature>
<feature name='vmx-page-walk-4'>
- <msr index='0x48c' edx='0x00000000' eax='0x00000040'/>
+ <msr index='0x0000048c' edx='0x00000000'
eax='0x00000040'/>
</feature>
<feature name='vmx-page-walk-5'>
- <msr index='0x48c' edx='0x00000000' eax='0x00000080'/>
+ <msr index='0x0000048c' edx='0x00000000'
eax='0x00000080'/>
</feature>
<feature name='vmx-ept-uc'>
- <msr index='0x48c' edx='0x00000000' eax='0x00000100'/>
+ <msr index='0x0000048c' edx='0x00000000'
eax='0x00000100'/>
</feature>
<feature name='vmx-ept-wb'>
- <msr index='0x48c' edx='0x00000000' eax='0x00004000'/>
+ <msr index='0x0000048c' edx='0x00000000'
eax='0x00004000'/>
</feature>
<feature name='vmx-ept-2mb'>
- <msr index='0x48c' edx='0x00000000' eax='0x00010000'/>
+ <msr index='0x0000048c' edx='0x00000000'
eax='0x00010000'/>
</feature>
<feature name='vmx-ept-1gb'>
- <msr index='0x48c' edx='0x00000000' eax='0x00020000'/>
+ <msr index='0x0000048c' edx='0x00000000'
eax='0x00020000'/>
</feature>
<feature name='vmx-invept'>
- <msr index='0x48c' edx='0x00000000' eax='0x00100000'/>
+ <msr index='0x0000048c' edx='0x00000000'
eax='0x00100000'/>
</feature>
<feature name='vmx-eptad'>
- <msr index='0x48c' edx='0x00000000' eax='0x00200000'/>
+ <msr index='0x0000048c' edx='0x00000000'
eax='0x00200000'/>
</feature>
<feature name='vmx-ept-advanced-exitinfo'>
- <msr index='0x48c' edx='0x00000000' eax='0x00400000'/>
+ <msr index='0x0000048c' edx='0x00000000'
eax='0x00400000'/>
</feature>
<feature name='vmx-invept-single-context'>
- <msr index='0x48c' edx='0x00000000' eax='0x02000000'/>
+ <msr index='0x0000048c' edx='0x00000000'
eax='0x02000000'/>
</feature>
<feature name='vmx-invept-all-context'>
- <msr index='0x48c' edx='0x00000000' eax='0x04000000'/>
+ <msr index='0x0000048c' edx='0x00000000'
eax='0x04000000'/>
</feature>
<feature name='vmx-invvpid'>
- <msr index='0x48c' edx='0x00000001' eax='0x00000000'/>
+ <msr index='0x0000048c' edx='0x00000001'
eax='0x00000000'/>
</feature>
<feature name='vmx-invvpid-single-addr'>
- <msr index='0x48c' edx='0x00000100' eax='0x00000000'/>
+ <msr index='0x0000048c' edx='0x00000100'
eax='0x00000000'/>
</feature>
<feature name='vmx-invvpid-single-context'>
- <msr index='0x48c' edx='0x00000200' eax='0x00000000'/>
+ <msr index='0x0000048c' edx='0x00000200'
eax='0x00000000'/>
</feature>
<feature name='vmx-invvpid-all-context'>
- <msr index='0x48c' edx='0x00000400' eax='0x00000000'/>
+ <msr index='0x0000048c' edx='0x00000400'
eax='0x00000000'/>
</feature>
<feature name='vmx-invvpid-single-context-noglobals'>
<alias name='vmx-invept-single-context-noglobals'
source='qemu'/>
- <msr index='0x48c' edx='0x00000800' eax='0x00000000'/>
+ <msr index='0x0000048c' edx='0x00000800'
eax='0x00000000'/>
</feature>
<feature name='vmx-intr-exit'>
- <msr index='0x48d' edx='0x00000000' eax='0x00000001'/>
+ <msr index='0x0000048d' edx='0x00000000'
eax='0x00000001'/>
</feature>
<feature name='vmx-nmi-exit'>
- <msr index='0x48d' edx='0x00000000' eax='0x00000008'/>
+ <msr index='0x0000048d' edx='0x00000000'
eax='0x00000008'/>
</feature>
<feature name='vmx-vnmi'>
- <msr index='0x48d' edx='0x00000000' eax='0x00000020'/>
+ <msr index='0x0000048d' edx='0x00000000'
eax='0x00000020'/>
</feature>
<feature name='vmx-preemption-timer'>
- <msr index='0x48d' edx='0x00000000' eax='0x00000040'/>
+ <msr index='0x0000048d' edx='0x00000000'
eax='0x00000040'/>
</feature>
<feature name='vmx-posted-intr'>
- <msr index='0x48d' edx='0x00000000' eax='0x00000080'/>
+ <msr index='0x0000048d' edx='0x00000000'
eax='0x00000080'/>
</feature>
<feature name='vmx-vintr-pending'>
- <msr index='0x48e' edx='0x00000000' eax='0x00000004'/>
+ <msr index='0x0000048e' edx='0x00000000'
eax='0x00000004'/>
</feature>
<feature name='vmx-tsc-offset'>
- <msr index='0x48e' edx='0x00000000' eax='0x00000008'/>
+ <msr index='0x0000048e' edx='0x00000000'
eax='0x00000008'/>
</feature>
<feature name='vmx-hlt-exit'>
- <msr index='0x48e' edx='0x00000000' eax='0x00000080'/>
+ <msr index='0x0000048e' edx='0x00000000'
eax='0x00000080'/>
</feature>
<feature name='vmx-invlpg-exit'>
- <msr index='0x48e' edx='0x00000000' eax='0x00000200'/>
+ <msr index='0x0000048e' edx='0x00000000'
eax='0x00000200'/>
</feature>
<feature name='vmx-mwait-exit'>
- <msr index='0x48e' edx='0x00000000' eax='0x00000400'/>
+ <msr index='0x0000048e' edx='0x00000000'
eax='0x00000400'/>
</feature>
<feature name='vmx-rdpmc-exit'>
- <msr index='0x48e' edx='0x00000000' eax='0x00000800'/>
+ <msr index='0x0000048e' edx='0x00000000'
eax='0x00000800'/>
</feature>
<feature name='vmx-rdtsc-exit'>
- <msr index='0x48e' edx='0x00000000' eax='0x00001000'/>
+ <msr index='0x0000048e' edx='0x00000000'
eax='0x00001000'/>
</feature>
<feature name='vmx-cr3-load-noexit'>
- <msr index='0x48e' edx='0x00000000' eax='0x00008000'/>
+ <msr index='0x0000048e' edx='0x00000000'
eax='0x00008000'/>
</feature>
<feature name='vmx-cr3-store-noexit'>
- <msr index='0x48e' edx='0x00000000' eax='0x00010000'/>
+ <msr index='0x0000048e' edx='0x00000000'
eax='0x00010000'/>
</feature>
<feature name='vmx-cr8-load-exit'>
- <msr index='0x48e' edx='0x00000000' eax='0x00080000'/>
+ <msr index='0x0000048e' edx='0x00000000'
eax='0x00080000'/>
</feature>
<feature name='vmx-cr8-store-exit'>
- <msr index='0x48e' edx='0x00000000' eax='0x00100000'/>
+ <msr index='0x0000048e' edx='0x00000000'
eax='0x00100000'/>
</feature>
<feature name='vmx-flexpriority'>
- <msr index='0x48e' edx='0x00000000' eax='0x00200000'/>
+ <msr index='0x0000048e' edx='0x00000000'
eax='0x00200000'/>
</feature>
<feature name='vmx-vnmi-pending'>
- <msr index='0x48e' edx='0x00000000' eax='0x00400000'/>
+ <msr index='0x0000048e' edx='0x00000000'
eax='0x00400000'/>
</feature>
<feature name='vmx-movdr-exit'>
- <msr index='0x48e' edx='0x00000000' eax='0x00800000'/>
+ <msr index='0x0000048e' edx='0x00000000'
eax='0x00800000'/>
</feature>
<feature name='vmx-io-exit'>
- <msr index='0x48e' edx='0x00000000' eax='0x01000000'/>
+ <msr index='0x0000048e' edx='0x00000000'
eax='0x01000000'/>
</feature>
<feature name='vmx-io-bitmap'>
- <msr index='0x48e' edx='0x00000000' eax='0x02000000'/>
+ <msr index='0x0000048e' edx='0x00000000'
eax='0x02000000'/>
</feature>
<feature name='vmx-mtf'>
- <msr index='0x48e' edx='0x00000000' eax='0x08000000'/>
+ <msr index='0x0000048e' edx='0x00000000'
eax='0x08000000'/>
</feature>
<feature name='vmx-msr-bitmap'>
- <msr index='0x48e' edx='0x00000000' eax='0x10000000'/>
+ <msr index='0x0000048e' edx='0x00000000'
eax='0x10000000'/>
</feature>
<feature name='vmx-monitor-exit'>
- <msr index='0x48e' edx='0x00000000' eax='0x20000000'/>
+ <msr index='0x0000048e' edx='0x00000000'
eax='0x20000000'/>
</feature>
<feature name='vmx-pause-exit'>
- <msr index='0x48e' edx='0x00000000' eax='0x40000000'/>
+ <msr index='0x0000048e' edx='0x00000000'
eax='0x40000000'/>
</feature>
<feature name='vmx-secondary-ctls'>
- <msr index='0x48e' edx='0x00000000' eax='0x80000000'/>
+ <msr index='0x0000048e' edx='0x00000000'
eax='0x80000000'/>
</feature>
<feature name='vmx-exit-nosave-debugctl'>
- <msr index='0x48f' edx='0x00000000' eax='0x00000004'/>
+ <msr index='0x0000048f' edx='0x00000000'
eax='0x00000004'/>
</feature>
<feature name='vmx-exit-load-perf-global-ctrl'>
- <msr index='0x48f' edx='0x00000000' eax='0x00001000'/>
+ <msr index='0x0000048f' edx='0x00000000'
eax='0x00001000'/>
</feature>
<feature name='vmx-exit-ack-intr'>
- <msr index='0x48f' edx='0x00000000' eax='0x00008000'/>
+ <msr index='0x0000048f' edx='0x00000000'
eax='0x00008000'/>
</feature>
<feature name='vmx-exit-save-pat'>
- <msr index='0x48f' edx='0x00000000' eax='0x00040000'/>
+ <msr index='0x0000048f' edx='0x00000000'
eax='0x00040000'/>
</feature>
<feature name='vmx-exit-load-pat'>
- <msr index='0x48f' edx='0x00000000' eax='0x00080000'/>
+ <msr index='0x0000048f' edx='0x00000000'
eax='0x00080000'/>
</feature>
<feature name='vmx-exit-save-efer'>
- <msr index='0x48f' edx='0x00000000' eax='0x00100000'/>
+ <msr index='0x0000048f' edx='0x00000000'
eax='0x00100000'/>
</feature>
<feature name='vmx-exit-load-efer'>
- <msr index='0x48f' edx='0x00000000' eax='0x00200000'/>
+ <msr index='0x0000048f' edx='0x00000000'
eax='0x00200000'/>
</feature>
<feature name='vmx-exit-save-preemption-timer'>
- <msr index='0x48f' edx='0x00000000' eax='0x00400000'/>
+ <msr index='0x0000048f' edx='0x00000000'
eax='0x00400000'/>
</feature>
<feature name='vmx-exit-clear-bndcfgs'>
- <msr index='0x48f' edx='0x00000000' eax='0x00800000'/>
+ <msr index='0x0000048f' edx='0x00000000'
eax='0x00800000'/>
</feature>
<feature name='vmx-exit-clear-rtit-ctl'>
- <msr index='0x48f' edx='0x00000000' eax='0x02000000'/>
+ <msr index='0x0000048f' edx='0x00000000'
eax='0x02000000'/>
</feature>
<feature name='vmx-exit-load-pkrs'>
- <msr index='0x48f' edx='0x00000000' eax='0x20000000'/>
+ <msr index='0x0000048f' edx='0x00000000'
eax='0x20000000'/>
</feature>
<feature name='vmx-entry-noload-debugctl'>
- <msr index='0x490' edx='0x00000000' eax='0x00000004'/>
+ <msr index='0x00000490' edx='0x00000000'
eax='0x00000004'/>
</feature>
<feature name='vmx-entry-ia32e-mode'>
- <msr index='0x490' edx='0x00000000' eax='0x00000200'/>
+ <msr index='0x00000490' edx='0x00000000'
eax='0x00000200'/>
</feature>
<feature name='vmx-entry-load-perf-global-ctrl'>
- <msr index='0x490' edx='0x00000000' eax='0x00002000'/>
+ <msr index='0x00000490' edx='0x00000000'
eax='0x00002000'/>
</feature>
<feature name='vmx-entry-load-pat'>
- <msr index='0x490' edx='0x00000000' eax='0x00004000'/>
+ <msr index='0x00000490' edx='0x00000000'
eax='0x00004000'/>
</feature>
<feature name='vmx-entry-load-efer'>
- <msr index='0x490' edx='0x00000000' eax='0x00008000'/>
+ <msr index='0x00000490' edx='0x00000000'
eax='0x00008000'/>
</feature>
<feature name='vmx-entry-load-bndcfgs'>
- <msr index='0x490' edx='0x00000000' eax='0x00010000'/>
+ <msr index='0x00000490' edx='0x00000000'
eax='0x00010000'/>
</feature>
<feature name='vmx-entry-load-rtit-ctl'>
- <msr index='0x490' edx='0x00000000' eax='0x00040000'/>
+ <msr index='0x00000490' edx='0x00000000'
eax='0x00040000'/>
</feature>
<feature name='vmx-entry-load-pkrs'>
- <msr index='0x490' edx='0x00000000' eax='0x00400000'/>
+ <msr index='0x00000490' edx='0x00000000'
eax='0x00400000'/>
</feature>
<feature name='vmx-eptp-switching'>
- <msr index='0x491' edx='0x00000000' eax='0x00000001'/>
+ <msr index='0x00000491' edx='0x00000000'
eax='0x00000001'/>
</feature>
</cpus>
--
2.43.0
5:12 a.m.
New subject: [PATCH v2 2/4] cpu_map: Format register values
On Mon, Feb 05, 2024 at 11:44:22 +0100, Tim Wiederhake wrote:
Use "0x%08x" as format for all values:
sed \
-e "s/'0x\(..\)'/'0x000000\\1'/g" \
-e "s/'0x\(...\)'/'0x00000\\1'/g"
Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com>
---
src/cpu_map/x86_features.xml | 538 +++++++++++++++++------------------
1 file changed, 269 insertions(+), 269 deletions(-)
Reviewed-by: Jiri Denemark <jdenemar(a)redhat.com>
4:44 a.m.
New subject: [PATCH v2 3/4] cpu_map: Format comments
Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com>
---
src/cpu_map/x86_features.xml | 50 ++++++++++++++++++++++++------------
1 file changed, 33 insertions(+), 17 deletions(-)
diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index b89bd5a2fa..8d1dbe68e8 100644
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -5,7 +5,8 @@
-->
<cpus>
- <!-- standard features, ECX -->
+
+ <!-- cpuid level 0x00000001 (ecx) -->
<feature name='pni'>
<alias name='sse3' source='qemu'/>
<cpuid eax_in='0x00000001' ecx='0x00000001'/>
@@ -104,7 +105,7 @@
<cpuid eax_in='0x00000001' ecx='0x80000000'/>
</feature>
- <!-- standard features, EDX -->
+ <!-- cpuid level 0x00000001 (edx) -->
<feature name='fpu'>
<cpuid eax_in='0x00000001' edx='0x00000001'/>
</feature>
@@ -196,12 +197,12 @@
<cpuid eax_in='0x00000001' edx='0x80000000'/>
</feature>
- <!-- Termal Power and Management -->
+ <!-- cpuid level 0x00000006 (eax) -->
<feature name='arat'>
<cpuid eax_in='0x00000006' eax='0x00000004'/>
</feature>
- <!-- cpuid function 0x7 ecx 0x0 features -->
+ <!-- cpuid level 0x00000007, 0x0000 (ebx) -->
<feature name='fsgsbase'>
<cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x00000001'/>
</feature>
@@ -292,6 +293,7 @@
<cpuid eax_in='0x00000007' ecx_in='0x00000000'
ebx='0x80000000'/>
</feature>
+ <!-- cpuid level 0x00000007, 0x0000 (ecx) -->
<feature name='avx512vbmi'>
<cpuid eax_in='0x00000007' ecx_in='0x00000000'
ecx='0x00000002'/>
</feature>
@@ -353,6 +355,7 @@
<cpuid eax_in='0x00000007' ecx_in='0x00000000'
ecx='0x80000000'/>
</feature>
+ <!-- cpuid level 0x00000007, 0x0000 (edx) -->
<feature name='avx512-4vnniw'>
<cpuid eax_in='0x00000007' ecx_in='0x00000000'
edx='0x00000004'/>
</feature>
@@ -413,6 +416,7 @@
<cpuid eax_in='0x00000007' ecx_in='0x00000000'
edx='0x80000000'/>
</feature>
+ <!-- cpuid level 0x00000007, 0x0001 (eax) -->
<feature name='avx-vnni'>
<cpuid eax_in='0x00000007' ecx_in='0x00000001'
eax='0x00000010'/>
</feature>
@@ -438,6 +442,7 @@
<cpuid eax_in='0x00000007' ecx_in='0x00000001'
eax='0x00800000'/>
</feature>
+ <!-- cpuid level 0x00000007, 0x0001 (edx) -->
<feature name='avx-vnni-int8'>
<cpuid eax_in='0x00000007' ecx_in='0x00000001'
edx='0x00000010'/>
</feature>
@@ -451,11 +456,12 @@
<cpuid eax_in='0x00000007' ecx_in='0x00000001'
edx='0x00004000'/>
</feature>
+ <!-- cpuid level 0x00000007, 0x0002 (edx) -->
<feature name='mcdt-no'>
<cpuid eax_in='0x00000007' ecx_in='0x00000002'
edx='0x00000020'/>
</feature>
- <!-- Processor Extended State Enumeration sub leaf 1 -->
+ <!-- cpuid level 0x0000000d, 0x0001 (eax) -->
<feature name='xsaveopt'>
<cpuid eax_in='0x0000000d' ecx_in='0x00000001'
eax='0x00000001'/>
</feature>
@@ -472,7 +478,7 @@
<cpuid eax_in='0x0000000d' ecx_in='0x00000001'
eax='0x00000010'/>
</feature>
- <!-- cpuid level 0x0000000f:1 (edx) -->
+ <!-- cpuid level 0x0000000f, 0x0001 (edx) -->
<feature name='mbm_total'>
<cpuid eax_in='0x0000000f' ecx_in='0x00000001'
edx='0x00000002'/>
</feature>
@@ -480,7 +486,7 @@
<cpuid eax_in='0x0000000f' ecx_in='0x00000001'
edx='0x00000004'/>
</feature>
- <!-- cpuid level 0x00000012 ecx 0x0 features -->
+ <!-- cpuid level 0x00000012, 0x0000 (eax) -->
<feature name='sgx1'>
<cpuid eax_in='0x00000012' ecx_in='0x00000000'
eax='0x00000001'/>
</feature>
@@ -491,11 +497,12 @@
<cpuid eax_in='0x00000012' ecx_in='0x00000000'
eax='0x00000800'/>
</feature>
+ <!-- cpuid level 0x00000012, 0x0000 (ebx) -->
<feature name='sgx-exinfo'>
<cpuid eax_in='0x00000012' ecx_in='0x00000000'
ebx='0x00000001'/>
</feature>
- <!-- cpuid level 0x00000012 ecx 0x1 features -->
+ <!-- cpuid level 0x00000012, 0x0001 (eax) -->
<feature name='sgx-debug'>
<cpuid eax_in='0x00000012' ecx_in='0x00000001'
eax='0x00000002'/>
</feature>
@@ -515,12 +522,12 @@
<cpuid eax_in='0x00000012' ecx_in='0x00000001'
eax='0x00000400'/>
</feature>
- <!-- cpuid level 0x00000014 ecx 0x0 features -->
+ <!-- cpuid level 0x00000014, 0x0000 (ecx) -->
<feature name='intel-pt-lip'>
<cpuid eax_in='0x00000014' ecx_in='0x00000000'
ecx='0x80000000'/>
</feature>
- <!-- extended features, ECX -->
+ <!-- cpuid level 0x80000001 (ecx) -->
<feature name='lahf_lm'>
<alias name='lahf-lm' source='qemu'/>
<cpuid eax_in='0x80000001' ecx='0x00000001'/>
@@ -596,7 +603,7 @@
<cpuid eax_in='0x80000001' ecx='0x01000000'/>
</feature>
- <!-- extended features, EDX -->
+ <!-- cpuid level 0x80000001 (edx) -->
<feature name='syscall'>
<cpuid eax_in='0x80000001' edx='0x00000800'/>
</feature>
@@ -629,12 +636,12 @@
<cpuid eax_in='0x80000001' edx='0x80000000'/>
</feature>
- <!-- Advanced Power Management edx features -->
+ <!-- cpuid level 0x80000007 (edx) -->
<feature name='invtsc' migratable='no'>
<cpuid eax_in='0x80000007' edx='0x00000100'/>
</feature>
- <!-- More AMD-specific features -->
+ <!-- cpuid level 0x80000008 (ebx) -->
<feature name='clzero'>
<cpuid eax_in='0x80000008' ebx='0x00000001'/>
</feature>
@@ -669,7 +676,7 @@
<cpuid eax_in='0x80000008' ebx='0x10000000'/>
</feature>
- <!-- SVM features -->
+ <!-- cpuid level 0x8000000a (edx) -->
<feature name='npt'>
<cpuid eax_in='0x8000000a' edx='0x00000001'/>
</feature>
@@ -721,7 +728,7 @@
<cpuid eax_in='0x8000000a' edx='0x10000000'/>
</feature>
- <!-- cpuid level 0x80000021 ecx 0x0 features -->
+ <!-- cpuid level 0x80000021 (eax) -->
<feature name='no-nested-data-bp'>
<cpuid eax_in='0x80000021' eax='0x00000001'/>
</feature>
@@ -735,12 +742,12 @@
<cpuid eax_in='0x80000021' eax='0x00000100'/>
</feature>
- <!-- IA32_CORE_CAPABILITIES features -->
+ <!-- msr 0x000000cf -->
<feature name='split-lock-detect'>
<msr index='0x000000cf' edx='0x00000000'
eax='0x00000020'/>
</feature>
- <!-- IA32_ARCH_CAPABILITIES features -->
+ <!-- msr 0x0000010a -->
<feature name='rdctl-no'>
<msr index='0x0000010a' edx='0x00000000'
eax='0x00000001'/>
</feature>
@@ -787,6 +794,7 @@
<msr index='0x0000010a' edx='0x00000000'
eax='0x04000000'/>
</feature>
+ <!-- msr 0x00000480 -->
<feature name='vmx-ins-outs'>
<msr index='0x00000480' edx='0x00400000'
eax='0x00000000'/>
</feature>
@@ -797,6 +805,7 @@
<msr index='0x00000480' edx='0x01000000'
eax='0x00000000'/>
</feature>
+ <!-- msr 0x00000485 -->
<feature name='vmx-store-lma'>
<msr index='0x00000485' edx='0x00000000'
eax='0x00000020'/>
</feature>
@@ -816,6 +825,7 @@
<msr index='0x00000485' edx='0x00000000'
eax='0x40000000'/>
</feature>
+ <!-- msr 0x0000048b -->
<feature name='vmx-apicv-xapic'>
<msr index='0x0000048b' edx='0x00000000'
eax='0x00000001'/>
</feature>
@@ -880,6 +890,7 @@
<msr index='0x0000048b' edx='0x00000000'
eax='0x04000000'/>
</feature>
+ <!-- msr 0x0000048c -->
<feature name='vmx-ept-execonly'>
<msr index='0x0000048c' edx='0x00000000'
eax='0x00000001'/>
</feature>
@@ -933,6 +944,7 @@
<msr index='0x0000048c' edx='0x00000800'
eax='0x00000000'/>
</feature>
+ <!-- msr 0x0000048d -->
<feature name='vmx-intr-exit'>
<msr index='0x0000048d' edx='0x00000000'
eax='0x00000001'/>
</feature>
@@ -949,6 +961,7 @@
<msr index='0x0000048d' edx='0x00000000'
eax='0x00000080'/>
</feature>
+ <!-- msr 0x0000048e -->
<feature name='vmx-vintr-pending'>
<msr index='0x0000048e' edx='0x00000000'
eax='0x00000004'/>
</feature>
@@ -1013,6 +1026,7 @@
<msr index='0x0000048e' edx='0x00000000'
eax='0x80000000'/>
</feature>
+ <!-- msr 0x0000048f -->
<feature name='vmx-exit-nosave-debugctl'>
<msr index='0x0000048f' edx='0x00000000'
eax='0x00000004'/>
</feature>
@@ -1047,6 +1061,7 @@
<msr index='0x0000048f' edx='0x00000000'
eax='0x20000000'/>
</feature>
+ <!-- msr 0x00000490 -->
<feature name='vmx-entry-noload-debugctl'>
<msr index='0x00000490' edx='0x00000000'
eax='0x00000004'/>
</feature>
@@ -1072,6 +1087,7 @@
<msr index='0x00000490' edx='0x00000000'
eax='0x00400000'/>
</feature>
+ <!-- msr 0x00000491 -->
<feature name='vmx-eptp-switching'>
<msr index='0x00000491' edx='0x00000000'
eax='0x00000001'/>
</feature>
--
2.43.0
5:12 a.m.
New subject: [PATCH v2 3/4] cpu_map: Format comments
On Mon, Feb 05, 2024 at 11:44:23 +0100, Tim Wiederhake wrote:
Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com>
---
src/cpu_map/x86_features.xml | 50 ++++++++++++++++++++++++------------
1 file changed, 33 insertions(+), 17 deletions(-)
Reviewed-by: Jiri Denemark <jdenemar(a)redhat.com>
4:44 a.m.
New subject: [PATCH v2 4/4] cpu_map: Rewrite feature sync script
Previously, the script would only detect differences between
libvirt's and qemu's list of x86 features, adding those features
to libvirt was a manual and error prone procedure.
Replace with a script that can generate libvirt's feature list
directly from qemu source code.
---
src/cpu_map/sync_qemu_features_i386.py | 627 ++++++++++++++++++-------
src/cpu_map/x86_features.xml | 7 +-
2 files changed, 461 insertions(+), 173 deletions(-)
diff --git a/src/cpu_map/sync_qemu_features_i386.py
b/src/cpu_map/sync_qemu_features_i386.py
index dcd58cd590..e4b1f7275a 100755
--- a/src/cpu_map/sync_qemu_features_i386.py
+++ b/src/cpu_map/sync_qemu_features_i386.py
@@ -1,190 +1,479 @@
#!/usr/bin/env python3
import argparse
-import json
-import subprocess
-import xml.etree.ElementTree
-
-
-def ignore_feature(feature):
- ignored_features = [
- # VIA/Cyrix/Centaur-defined CPU features
- # CPUID level 0xC0000001, word 5
- "ace2",
- "ace2-en",
- "phe",
- "phe-en",
- "pmm",
- "pmm-en",
- "xcrypt",
- "xcrypt-en",
- "xstore",
- "xstore-en",
-
- # non-features
- "check",
- "cpuid-0xb",
- "enforce",
- "fill-mtrr-mask",
- "full-cpuid-auto-level",
- "full-width-write",
- "host-cache-info",
- "host-phys-bits",
- "hotpluggable",
- "hotplugged",
- "hv-apicv",
- "hv-avic",
- "hv-crash",
- "hv-emsr-bitmap",
- "hv-enforce-cpuid",
- "hv-evmcs",
- "hv-frequencies",
- "hv-ipi",
- "hv-passthrough",
- "hv-reenlightenment",
- "hv-relaxed",
- "hv-reset",
- "hv-runtime",
- "hv-stimer",
- "hv-stimer-direct",
- "hv-syndbg",
- "hv-synic",
- "hv-time",
- "hv-tlbflush",
- "hv-tlbflush-direct",
- "hv-tlbflush-ext",
- "hv-vapic",
- "hv-vpindex",
- "hv-xmm-input",
- "kvm",
- "kvm-asyncpf",
- "kvm-asyncpf-int",
- "kvm-hint-dedicated",
- "kvm-mmu",
- "kvm-msi-ext-dest-id",
- "kvm-no-smi-migration",
- "kvm-nopiodelay",
- "kvm-poll-control",
- "kvm-pv-enforce-cpuid",
- "kvm-pv-eoi",
- "kvm-pv-ipi",
- "kvm-pv-sched-yield",
- "kvm-pv-tlb-flush",
- "kvm-pv-unhalt",
- "kvm-steal-time",
- "kvm_asyncpf",
- "kvm_asyncpf_int",
- "kvm_mmu",
- "kvm_nopiodelay",
- "kvm_poll_control",
- "kvm_pv_eoi",
- "kvm_pv_unhalt",
- "kvm_steal_time",
- "kvmclock",
- "kvmclock-stable-bit",
- "l3-cache",
- "legacy-cache",
- "lmce",
- "migratable",
- "pmu",
- "realized",
- "start-powered-off",
- "tcg-cpuid",
- "vmware-cpuid-freq",
- "xen-vapic",
- ]
-
- if feature["type"] != "bool":
- return True
-
- name = feature["name"]
-
- if name.startswith("x-"):
- return True
-
- if name in ignored_features:
- return True
-
- return False
-
-
-def get_qemu_feature_list(path_to_qemu):
- cmd = [
- path_to_qemu,
- "-machine", "accel=kvm",
- "-cpu", "host",
- "-nodefaults",
- "-nographic",
- "-qmp",
- "stdio"
- ]
-
- request = """
- {
- "execute": "qmp_capabilities"
- }
- {
- "execute": "qom-list-properties",
- "arguments": {
- "typename": "max-x86_64-cpu"
- },
- "id": "qom-list-properties"
- }
- {
- "execute": "quit"
+import os
+import re
+
+
+# features in qemu that we do not want in libvirt
+FEATURES_IGNORE = (
+ "kvm-asyncpf",
+ "kvm-asyncpf-int",
+ "kvm-hint-dedicated",
+ "kvm-mmu",
+ "kvm-msi-ext-dest-id",
+ "kvm-nopiodelay",
+ "kvm-poll-control",
+ "kvm-pv-eoi",
+ "kvm-pv-ipi",
+ "kvm-pv-sched-yield",
+ "kvm-pv-tlb-flush",
+ "kvm-pv-unhalt",
+ "kvm-steal-time",
+ "kvmclock",
+ "kvmclock-stable-bit",
+
+ "xstore",
+ "xstore-en",
+ "xcrypt",
+ "xcrypt-en",
+ "ace2",
+ "ace2-en",
+ "phe",
+ "phe-en",
+ "pmm",
+ "pmm-en",
+
+ "full-width-write",
+)
+
+
+# features in libvirt, that qemu does not know. as python cannot use dicts
+# as keys in other dicts, use tuples. three-tuples "eax, ecx, register name"
+# for cpuid features; one-tuples "index" for msrs. The values for the dict are
+# mappings from "bit index" to "feature name".
+FEATURES_EXTRA = {
+ (0x00000001, None, "ecx"): {
+ 27: "osxsave",
+ },
+ (0x00000007, 0x0000, "ebx"): {
+ 12: "cmt",
+ },
+ (0x00000007, 0x0000, "ecx"): {
+ 4: "ospke",
+ },
+ (0x00000007, 0x0000, "edx"): {
+ 18: "pconfig",
+ },
+ (0x0000000f, 0x0001, "edx"): {
+ 1: "mbm_total",
+ 2: "mbm_local",
+ },
+ (0x80000001, None, "ecx"): {
+ 18: "cvt16",
+ },
+ (0x0000048c,): {
+ 8: "vmx-ept-uc",
+ 14: "vmx-ept-wb",
+ 41: "vmx-invvpid-single-context", # wrong name in qemu
+ 43: "vmx-invvpid-single-context-noglobals", # wrong name in qemu
}
- """
-
- decoder = json.JSONDecoder()
- output = subprocess.check_output(cmd, input=request, text=True)
- while output:
- obj, idx = decoder.raw_decode(output)
- output = output[idx:].strip()
- if obj.get("id") != "qom-list-properties":
+}
+
+
+# alias information to add to generated file
+FEATURES_ALIASES = {
+ "arch-capabilities": (
+ ("arch_capabilities", "linux"),
+ ),
+ "cmp_legacy": (
+ ("cmp-legacy", "qemu"),
+ ),
+ "cmt": (
+ ("cqm", "linux"),
+ ),
+ "ds_cpl": (
+ ("ds-cpl", "qemu"),
+ ),
+ "fxsr_opt": (
+ ("ffxsr", "qemu"),
+ ("fxsr-opt", "qemu"),
+ ),
+ "lahf_lm": (
+ ("lahf-lm", "qemu"),
+ ),
+ "lm": (
+ ("i64", "qemu"),
+ ),
+ "md-clear": (
+ ("md_clear", "linux"),
+ ),
+ "nodeid_msr": (
+ ("nodeid-msr", "qemu"),
+ ),
+ "nrip-save": (
+ ("nrip_save", "qemu"),
+ ),
+ "nx": (
+ ("xd", "qemu"),
+ ),
+ "pause-filter": (
+ ("pause_filter", "qemu"),
+ ),
+ "pclmuldq": (
+ ("pclmulqdq", "qemu"),
+ ),
+ "perfctr_core": (
+ ("perfctr-core", "qemu"),
+ ),
+ "perfctr_nb": (
+ ("perfctr-nb", "qemu"),
+ ),
+ "pni": (
+ ("sse3", "qemu"),
+ ),
+ "sse4.1": (
+ ("sse4-1", "qemu"),
+ ("sse4_1", "qemu"),
+ ),
+ "sse4.2": (
+ ("sse4-2", "qemu"),
+ ("sse4_2", "qemu"),
+ ),
+ "svm-lock": (
+ ("svm_lock", "qemu"),
+ ),
+ "tsc-scale": (
+ ("tsc_scale", "qemu"),
+ ),
+ "tsc_adjust": (
+ ("tsc-adjust", "qemu"),
+ ),
+ "vmcb-clean": (
+ ("vmcb_clean", "qemu"),
+ ),
+ "vmx-invvpid-single-context-noglobals": (
+ ("vmx-invept-single-context-noglobals", "qemu"),
+ ),
+}
+
+
+# list non-migratable features here
+FEATURES_NON_MIGRATABLE = (
+ "xsaves",
+ "invtsc",
+)
+
+
+# mapping from "symbol name" to "value" for "#define"s in
qemu source code
+_CONSTANTS = dict()
+
+
+# tree of known features. top level index is either "cpuid" or
"msr".
+# further indices for cpuid: eax_in, ecx_in (may be `None`), register name
+# further indices for msr: index
+_FEATURES = dict()
+
+
+# fill _CONSTANTS with the #defines from qemu source code
+def read_headers(path):
+ pattern_define = re.compile("^#define\\s+(\\S+)\\s+(.*)$")
+
+ headers = (
+ "include/standard-headers/asm-x86/kvm_para.h",
+ "target/i386/cpu.h",
+ )
+
+ _CONSTANTS["true"] = "1"
+
+ for header in headers:
+ with open(os.path.join(path, header), "tr") as f:
+ for line in f.readlines():
+ match = pattern_define.match(line)
+ if match:
+ key = match.group(1)
+ val = match.group(2)
+ _CONSTANTS[key] = val
+
+
+# add new cpuid feature bit
+def add_feature_cpuid(eax, ecx, reg, bit, name):
+ if not name:
+ return
+
+ if "cpuid" not in _FEATURES:
+ _FEATURES["cpuid"] = dict()
+
+ if eax not in _FEATURES["cpuid"]:
+ _FEATURES["cpuid"][eax] = dict()
+
+ if ecx not in _FEATURES["cpuid"][eax]:
+ _FEATURES["cpuid"][eax][ecx] = dict()
+
+ if reg not in _FEATURES["cpuid"][eax][ecx]:
+ _FEATURES["cpuid"][eax][ecx][reg] = dict()
+
+ _FEATURES["cpuid"][eax][ecx][reg][bit] = name
+
+
+# add new msr feature bit
+def add_feature_msr(msr, bit, name):
+ if not name:
+ return
+
+ if "msr" not in _FEATURES:
+ _FEATURES["msr"] = dict()
+
+ if msr not in _FEATURES["msr"]:
+ _FEATURES["msr"][msr] = dict()
+
+ _FEATURES["msr"][msr][bit] = name
+
+
+# add features from EXTRA_FEATURE to the list of known features
+def add_extra_features():
+ for key, val in FEATURES_EXTRA.items():
+ for bit, name in val.items():
+ if len(key) == 3:
+ add_feature_cpuid(key[0], key[1], key[2], bit, name)
+ else:
+ add_feature_msr(key[0], bit, name)
+
+
+# add a feature from qemu to the list of known features. translates features
+# names according to FEATURE_ALIASES and applies symbolic values defined in
+# _CONSTANTS.
+def add_feature_qemu(query, data):
+ # split names into individual items
+ data = [n.strip() for n in "".join(data).split(",")]
+
+ names = dict()
+ if any([e.startswith("[") for e in data]):
+ for entry in data:
+ entry = entry.strip()
+ if not entry:
+ continue
+ index, name = entry.split("=", 2)
+ index = int(index.strip().strip("[").strip("]"), 0)
+ names[index] = name.strip().strip("\"")
+ else:
+ for index, name in enumerate(data):
+ if not name or name == "NULL":
+ continue
+ name = name.strip("\"")
+ if name in FEATURES_IGNORE:
+ continue
+ names[index] = name.strip("\"")
+
+ # cut out part between "{" and "}". easiest way to get rid of
unwanted
+ # extra info such as ".tcg_features" or multi line comments
+ query = "".join(query).split("{")[1].split("}")[0]
+
+ eax = None
+ ecx = None
+ reg = None
+ msr = None
+ for entry in [e.strip() for e in query.split(",")]:
+ if not entry:
continue
- for feature in obj["return"]:
- if ignore_feature(feature):
+ left, right = [e.strip() for e in entry.split("=", 2)]
+ if left == ".eax":
+ eax = int(_CONSTANTS.get(right, right), 0)
+ if left == ".ecx":
+ ecx = int(_CONSTANTS.get(right, right), 0)
+ if left == ".reg":
+ reg = right.lower()[2:]
+ if left == ".index":
+ msr = int(_CONSTANTS.get(right, right), 0)
+
+ # qemu defines some empty feature words, filter them out
+ if not names:
+ return
+ if all([e is None for e in names.values()]):
+ return
+
+ # apply name translation and add to list of known features
+ for bit, name in sorted(names.items()):
+ for newname, data in FEATURES_ALIASES.items():
+ for oldname, source in data:
+ if name == oldname and source == "qemu":
+ name = newname
+
+ if msr:
+ add_feature_msr(msr, bit, name)
+ else:
+ add_feature_cpuid(eax, ecx, reg, bit, name)
+
+
+# read the `feature_word_info` struct from qemu's cpu.c into a list of strings
+def read_cpu_c(path):
+ pattern_comment = re.compile("/\\*.*?\\*/")
+ marker_begin = "FeatureWordInfo feature_word_info[FEATURE_WORDS] = {\n"
+ marker_end = "};\n"
+
+ with open(os.path.join(path, "target/i386/cpu.c"), "tr") as f:
+ # skip until begin marker
+ while True:
+ line = f.readline()
+ if not line:
+ exit("begin marker not found in cpu.c")
+ if line == marker_begin:
+ break
+
+ # read until end marker
+ while True:
+ line = f.readline()
+ if not line:
+ exit("end marker not found in cpu.c")
+ if line == marker_end:
+ break
+
+ # remove comments and white space
+ line = re.sub(pattern_comment, "", line).strip()
+
+ yield line
+
+
+# simple state machine to extract feature names and definitions from extracted
+# qemu source code
+def parse_feature_words(lines):
+ state_waiting_for_type = 1
+ state_waiting_for_names = 2
+ state_read_names = 3
+ state_waiting_for_query = 4
+ state_read_query = 5
+
+ pattern_type = re.compile("^\\.type\\s*=\\s*(.+)$")
+ pattern_names = re.compile("^\\.feat_names\\s*=\\s*{$")
+ pattern_data = re.compile("^\\.(cpuid|msr).*$")
+ pattern_end = re.compile("^},?$")
+
+ state = state_waiting_for_type
+ for line in lines:
+ if state == state_waiting_for_type:
+ match = pattern_type.match(line)
+ if match:
+ data_names = list()
+ data_query = list()
+ state = state_waiting_for_names
+
+ elif state == state_waiting_for_names:
+ # special case for missing ".feat_names" entry:
+ match = pattern_data.match(line)
+ if match:
+ data_query.append(line)
+ state = state_read_query
continue
- yield feature["name"]
+ match = pattern_names.match(line)
+ if match:
+ state = state_read_names
+
+ elif state == state_read_names:
+ match = pattern_end.match(line)
+ if match:
+ state = state_waiting_for_query
+ else:
+ data_names.append(line)
+
+ elif state == state_waiting_for_query:
+ match = pattern_data.match(line)
+ if match:
+ data_query.append(line)
+ state = state_read_query
+
+ elif state == state_read_query:
+ match = pattern_end.match(line)
+ data_query.append(line)
+ if match:
+ state = state_waiting_for_type
+ add_feature_qemu(data_query, data_names)
+
+ else:
+ exit("parsing state machine in invalid state")
-def get_libvirt_feature_list(path_to_featuresfile):
- dom = xml.etree.ElementTree.parse(path_to_featuresfile)
- for feature in dom.getroot().iter("feature"):
- yield feature.get("name")
- for alias in feature:
- if alias.tag == "alias" and alias.get("source") ==
"qemu":
- yield alias.get("name")
+ if state != state_waiting_for_type:
+ exit("parsing incomplete")
+
+
+# generate x86_features.xml from list of known features
+def write_output(path):
+ with open(path, "tw") as f:
+ f.write("<!--\n Generated file, do not edit!\n Use the ")
+ f.write("sync_qemu_features_i386.py script to make
changes.\n-->\n\n")
+ f.write("<cpus>\n")
+
+ for eax in sorted(_FEATURES["cpuid"]):
+ for ecx in sorted(_FEATURES["cpuid"][eax]):
+ for reg in sorted(_FEATURES["cpuid"][eax][ecx]):
+ f.write(f"\n <!-- cpuid level 0x{eax:08x}")
+ if ecx is not None:
+ f.write(f", 0x{ecx:04x}")
+ f.write(f" ({reg:s}) -->\n")
+
+ names = sorted(_FEATURES["cpuid"][eax][ecx][reg].items())
+ for bit, name in names:
+ mask = 1 << bit
+ f.write(f" <feature name='{name}'")
+ if name in FEATURES_NON_MIGRATABLE:
+ f.write(" migratable='no'")
+ f.write(">\n")
+ for alias in FEATURES_ALIASES.get(name, []):
+ f.write(f" <alias
name='{alias[0]}'")
+ f.write(f" source='{alias[1]}'/>\n")
+ f.write(f" <cpuid eax_in='0x{eax:08x}'
")
+ if ecx is not None:
+ f.write(f"ecx_in='0x{ecx:08x}' ")
+ f.write(f"{reg:s}='0x{mask:08x}'/>\n")
+ f.write(" </feature>\n")
+
+ for msr in sorted(_FEATURES["msr"]):
+ f.write(f"\n <!-- msr 0x{msr:08x} -->\n")
+ names = sorted(_FEATURES["msr"][msr].items())
+ for bit, name in names:
+ mask = 1 << bit
+ f.write(f" <feature name='{name}'")
+ if name in FEATURES_NON_MIGRATABLE:
+ f.write(" migratable='no'")
+ f.write(">\n")
+ for alias in FEATURES_ALIASES.get(name, []):
+ f.write(f" <alias name='{alias[0]}'")
+ f.write(f" source='{alias[1]}'/>\n")
+ f.write(f" <msr index='0x{msr:08x}' ")
+ f.write(f"edx='0x{(mask >> 32):08x}' ")
+ f.write(f"eax='0x{(mask &
0xffffffff):08x}'/>\n")
+ f.write(" </feature>\n")
+
+ f.write("</cpus>\n")
def main():
+ dirname = os.path.dirname(__file__)
+
parser = argparse.ArgumentParser(
- description="Synchronize x86 cpu features from QEMU i386 target.")
+ description="Synchronize x86 cpu features from QEMU."
+ )
parser.add_argument(
- "--qemu",
- help="Path to qemu executable",
- default="qemu-system-x86_64",
- type=str)
+ "qemu",
+ help="Path to qemu source code",
+ default=os.path.realpath(os.path.join(dirname, "../../../qemu")),
+ nargs="?",
+ type=os.path.realpath,
+ )
parser.add_argument(
- "--features",
- help="Path to 'src/cpu_map/x86_features.xml' file in "
- "the libvirt repository",
- default="x86_features.xml",
- type=str)
-
+ "--output",
+ "-o",
+ help="Path to output file",
+ default=os.path.realpath(os.path.join(dirname, "x86_features.xml")),
+ type=os.path.realpath
+ )
args = parser.parse_args()
- qfeatures = get_qemu_feature_list(args.qemu)
- lfeatures = list(get_libvirt_feature_list(args.features))
- missing = [f for f in sorted(qfeatures) if f not in lfeatures]
+ if not os.path.isdir(args.qemu):
+ parser.print_help()
+ exit("qemu source directory not found")
- if missing:
- print("The following features were reported by qemu but are "
- "unknown to libvirt:")
- for feature in missing:
- print(" *", feature)
+ read_headers(args.qemu)
+ lines = read_cpu_c(args.qemu)
+ parse_feature_words(lines)
+ add_extra_features()
+ write_output(args.output)
- return len(missing) != 0
+ print(
+ "After adding new features, update existing test files by running "
+ "`tests/cputestdata/cpu-data.py diff tests/cputestdata/"
+ "x86_64-cpuid-*.json`"
+ )
if __name__ == "__main__":
diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index 8d1dbe68e8..da71a3a6a0 100644
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -1,9 +1,8 @@
<!--
- After adding new features, update existing test files with
-
- tests/cputestdata/cpu-data.py diff tests/cputestdata/x86_64-cpuid-*.json
-
+ Generated file, do not edit!
+ Use the sync_qemu_features_i386.py script to make changes.
-->
+
<cpus>
<!-- cpuid level 0x00000001 (ecx) -->
--
2.43.0
7:15 a.m.
New subject: [PATCH v2 4/4] cpu_map: Rewrite feature sync script
On Mon, 2024-02-05 at 11:44 +0100, Tim Wiederhake wrote:
Previously, the script would only detect differences between
libvirt's and qemu's list of x86 features, adding those features
to libvirt was a manual and error prone procedure.
Replace with a script that can generate libvirt's feature list
directly from qemu source code.
---
The commit message was cut off. Missing paragraphs are:
Usage: sync_qemu_features_i386.py [--output OUTPUT] [qemu]
If not specified otherwise, "output" defaults to x86_features.xml
in the same directory as sync_qemu_features_i386.py. If a checkout
of the qemu source code resides next to the libvirt directory, it
will be found automatically and need not be specified.
Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com>
5:32 a.m.
New subject: [PATCH v2 4/4] cpu_map: Rewrite feature sync script
On Mon, Feb 05, 2024 at 11:44:24 +0100, Tim Wiederhake wrote:
Previously, the script would only detect differences between
libvirt's and qemu's list of x86 features, adding those features
to libvirt was a manual and error prone procedure.
Replace with a script that can generate libvirt's feature list
directly from qemu source code.
---
src/cpu_map/sync_qemu_features_i386.py | 627 ++++++++++++++++++-------
src/cpu_map/x86_features.xml | 7 +-
2 files changed, 461 insertions(+), 173 deletions(-)
Reviewed-by: Jiri Denemark <jdenemar(a)redhat.com>
310
days inactive
325
days old
9 comments
2 participants
participants (2)
-
Jiri Denemark -
Tim Wiederhake