[libvirt PATCH 8/8] cpu_map: Drop 'monitor' from modern x86 CPU models

The feature is never enabled by default on KVM and QEMU dropped it from the models long ago. https://bugzilla.redhat.com/show_bug.cgi?id=1798004 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/cpu_map/x86_Dhyana.xml | 2 +- src/cpu_map/x86_EPYC-IBPB.xml | 2 +- src/cpu_map/x86_EPYC.xml | 2 +- src/cpu_map/x86_Opteron_G3.xml | 2 +- tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml | 1 + tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml | 1 + .../x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml | 1 + .../x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml | 1 + .../x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml | 2 +- tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-json.xml | 2 +- .../x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml | 1 + .../x86_64-cpuid-Hygon-C86-7185-32-core-host.xml | 1 + .../x86_64-cpuid-Hygon-C86-7185-32-core-json.xml | 2 +- tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml | 1 + tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml | 1 + tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml | 1 + tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml | 1 + tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml | 2 +- tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml | 1 + tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml | 2 +- .../x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml | 1 + .../x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml | 1 + .../x86_64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml | 2 +- tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 1 + tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args | 6 +++--- 34 files changed, 36 insertions(+), 13 deletions(-) diff --git a/src/cpu_map/x86_Dhyana.xml b/src/cpu_map/x86_Dhyana.xml index 689daf8649..cfde07f99f 100644 --- a/src/cpu_map/x86_Dhyana.xml +++ b/src/cpu_map/x86_Dhyana.xml @@ -33,7 +33,7 @@ <feature name='misalignsse'/> <feature name='mmx'/> <feature name='mmxext'/> - <feature name='monitor'/> + <feature name='monitor' removed='yes'/> <feature name='movbe'/> <feature name='msr'/> <feature name='mtrr'/> diff --git a/src/cpu_map/x86_EPYC-IBPB.xml b/src/cpu_map/x86_EPYC-IBPB.xml index 983c5f4445..fc5aadf52e 100644 --- a/src/cpu_map/x86_EPYC-IBPB.xml +++ b/src/cpu_map/x86_EPYC-IBPB.xml @@ -34,7 +34,7 @@ <feature name='misalignsse'/> <feature name='mmx'/> <feature name='mmxext'/> - <feature name='monitor'/> + <feature name='monitor' removed='yes'/> <feature name='movbe'/> <feature name='msr'/> <feature name='mtrr'/> diff --git a/src/cpu_map/x86_EPYC.xml b/src/cpu_map/x86_EPYC.xml index 3ebba9f4ed..3b406de37a 100644 --- a/src/cpu_map/x86_EPYC.xml +++ b/src/cpu_map/x86_EPYC.xml @@ -33,7 +33,7 @@ <feature name='misalignsse'/> <feature name='mmx'/> <feature name='mmxext'/> - <feature name='monitor'/> + <feature name='monitor' removed='yes'/> <feature name='movbe'/> <feature name='msr'/> <feature name='mtrr'/> diff --git a/src/cpu_map/x86_Opteron_G3.xml b/src/cpu_map/x86_Opteron_G3.xml index dab59d4f82..cf00af8698 100644 --- a/src/cpu_map/x86_Opteron_G3.xml +++ b/src/cpu_map/x86_Opteron_G3.xml @@ -18,7 +18,7 @@ <feature name='mce'/> <feature name='misalignsse'/> <feature name='mmx'/> - <feature name='monitor'/> + <feature name='monitor' removed='yes'/> <feature name='msr'/> <feature name='mtrr'/> <feature name='nx'/> 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 0053913327..9d14213a0b 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 @@ -2,6 +2,7 @@ <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='xsaves'/> <feature policy='require' name='cmp_legacy'/> 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 7acab0a999..8c2c975fdd 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,6 +3,7 @@ <model>EPYC</model> <vendor>AMD</vendor> <feature name='ht'/> + <feature name='monitor'/> <feature name='osxsave'/> <feature name='xsaves'/> <feature name='cmp_legacy'/> 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 9164987bbd..1fee2fa9f8 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 @@ -2,6 +2,7 @@ <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='xsaves'/> <feature policy='require' name='cmp_legacy'/> 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 2fa8861e44..c3bbf78396 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,6 +3,7 @@ <model>EPYC-IBPB</model> <vendor>AMD</vendor> <feature name='ht'/> + <feature name='monitor'/> <feature name='osxsave'/> <feature name='xsaves'/> <feature name='cmp_legacy'/> 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 af1e7f2f32..45f27a9a1f 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='monitor'/> <feature policy='disable' name='rdtscp'/> <feature policy='disable' name='svm'/> + <feature policy='disable' name='monitor'/> </cpu> diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-json.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-json.xml index 4450a40f61..5af19749e7 100644 --- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-json.xml +++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-json.xml @@ -8,6 +8,6 @@ <feature policy='require' name='cmp_legacy'/> <feature policy='require' name='npt'/> <feature policy='require' name='nrip-save'/> - <feature policy='disable' name='monitor'/> <feature policy='disable' name='svm'/> + <feature policy='disable' name='monitor'/> </cpu> 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 08c574255e..5df21521f6 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 @@ -2,6 +2,7 @@ <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='xsaves'/> <feature policy='require' name='cmp_legacy'/> 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 f1cddb6a19..76c3753505 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,6 +3,7 @@ <model>Dhyana</model> <vendor>Hygon</vendor> <feature name='ht'/> + <feature name='monitor'/> <feature name='osxsave'/> <feature name='xsaves'/> <feature name='cmp_legacy'/> diff --git a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-json.xml b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-json.xml index 0fdd934c08..0408d51c10 100644 --- a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-json.xml @@ -9,6 +9,6 @@ <feature policy='require' name='virt-ssbd'/> <feature policy='require' name='npt'/> <feature policy='require' name='nrip-save'/> - <feature policy='disable' name='monitor'/> <feature policy='disable' name='svm'/> + <feature policy='disable' name='monitor'/> </cpu> diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml b/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml index a52c4cd303..99c6420579 100644 --- a/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml +++ b/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml @@ -3,6 +3,7 @@ <vendor>AMD</vendor> <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'/> diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml index 800b092f14..ecd532167a 100644 --- a/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml @@ -4,6 +4,7 @@ <vendor>AMD</vendor> <feature name='vme'/> <feature name='ht'/> + <feature name='monitor'/> <feature name='mmxext'/> <feature name='fxsr_opt'/> <feature name='pdpe1gb'/> diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml index a52c4cd303..99c6420579 100644 --- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml +++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml @@ -3,6 +3,7 @@ <vendor>AMD</vendor> <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'/> diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml index 800b092f14..ecd532167a 100644 --- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml +++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml @@ -4,6 +4,7 @@ <vendor>AMD</vendor> <feature name='vme'/> <feature name='ht'/> + <feature name='monitor'/> <feature name='mmxext'/> <feature name='fxsr_opt'/> <feature name='pdpe1gb'/> diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml index d128553c13..d874bfc049 100644 --- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml @@ -15,6 +15,6 @@ <feature policy='require' name='3dnowprefetch'/> <feature policy='require' name='osvw'/> <feature policy='require' name='npt'/> - <feature policy='disable' name='monitor'/> <feature policy='disable' name='rdtscp'/> + <feature policy='disable' name='monitor'/> </cpu> diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml index ab0e99f97d..f6106fdb1f 100644 --- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml +++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml @@ -3,6 +3,7 @@ <vendor>AMD</vendor> <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'/> diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml index d161709981..b4198f66a5 100644 --- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml @@ -15,8 +15,8 @@ <feature policy='require' name='osvw'/> <feature policy='require' name='npt'/> <feature policy='require' name='nrip-save'/> - <feature policy='disable' name='monitor'/> <feature policy='disable' name='nx'/> <feature policy='disable' name='rdtscp'/> <feature policy='disable' name='svm'/> + <feature policy='disable' name='monitor'/> </cpu> diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml index 0053913327..9d14213a0b 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 @@ -2,6 +2,7 @@ <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='xsaves'/> <feature policy='require' name='cmp_legacy'/> 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 7acab0a999..8c2c975fdd 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,6 +3,7 @@ <model>EPYC</model> <vendor>AMD</vendor> <feature name='ht'/> + <feature name='monitor'/> <feature name='osxsave'/> <feature name='xsaves'/> <feature name='cmp_legacy'/> diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml index aecc335c1e..9b9af2a6f7 100644 --- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml @@ -8,6 +8,6 @@ <feature policy='require' name='cmp_legacy'/> <feature policy='require' name='npt'/> <feature policy='require' name='nrip-save'/> - <feature policy='disable' name='monitor'/> <feature policy='disable' name='sha-ni'/> + <feature policy='disable' name='monitor'/> </cpu> diff --git a/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml index 00056c7141..3a6971584e 100644 --- a/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml @@ -34,6 +34,7 @@ <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='erms'/> <feature policy='require' name='mpx'/> diff --git a/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml index 4c867b18d0..049bc7e2e0 100644 --- a/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml @@ -34,6 +34,7 @@ <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='erms'/> <feature policy='require' name='mpx'/> diff --git a/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml index 3a2fd5786a..1c650406c2 100644 --- a/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml @@ -34,6 +34,7 @@ <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='erms'/> <feature policy='require' name='mpx'/> diff --git a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml index e9e0cb9329..a7fde52d64 100644 --- a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml @@ -34,6 +34,7 @@ <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='erms'/> <feature policy='require' name='mpx'/> diff --git a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml index 643cc4a631..cc19a61316 100644 --- a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml @@ -34,6 +34,7 @@ <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='erms'/> <feature policy='require' name='mpx'/> diff --git a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml index bb1dacc14c..64bbef0a42 100644 --- a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml @@ -34,6 +34,7 @@ <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='erms'/> <feature policy='require' name='mpx'/> 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 622acc47a1..43d6d27e98 100644 --- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml @@ -34,6 +34,7 @@ <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='erms'/> <feature policy='require' name='mpx'/> 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 40d691a62d..df562b5383 100644 --- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml @@ -34,6 +34,7 @@ <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='erms'/> <feature policy='require' name='mpx'/> 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 21db6a084a..0069c912dc 100644 --- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml @@ -34,6 +34,7 @@ <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='erms'/> <feature policy='require' name='mpx'/> 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 ad10e7b8fd..1b9f986a95 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -34,6 +34,7 @@ <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='erms'/> <feature policy='require' name='mpx'/> diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args b/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args index 6ee7bed18e..017e7a6c06 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args @@ -13,9 +13,9 @@ QEMU_AUDIO_DRV=none \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ --cpu EPYC,acpi=on,ss=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,pku=on,\ -la57=on,3dnowext=on,3dnow=on,npt=on,vme=off,fma=off,avx=off,f16c=off,\ -rdrand=off,avx2=off,rdseed=off,sha-ni=off,xsavec=off,fxsr_opt=off,\ +-cpu EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,\ +clwb=on,pku=on,la57=on,3dnowext=on,3dnow=on,npt=on,vme=off,fma=off,avx=off,\ +f16c=off,rdrand=off,avx2=off,rdseed=off,sha-ni=off,xsavec=off,fxsr_opt=off,\ misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,nrip-save=off \ -m 214 \ -overcommit mem-lock=off \ -- 2.29.2