render / rpms / libvirt

Forked from rpms/libvirt a year ago
Clone
49d448
From 5db9a525e3cec267544580d43554b2cf5779b6b9 Mon Sep 17 00:00:00 2001
49d448
Message-Id: <5db9a525e3cec267544580d43554b2cf5779b6b9@dist-git>
49d448
From: Jiri Denemark <jdenemar@redhat.com>
49d448
Date: Tue, 26 Apr 2022 15:06:30 +0200
49d448
Subject: [PATCH] cpu_x86: Penalize disabled features when computing CPU model
49d448
49d448
For finding the best matching CPU model for a given set of features
49d448
while we don't know the CPU signature (i.e., when computing a baseline
49d448
CPU model) we've been using a "shortest list of features" heuristics.
49d448
This works well if new CPU models are supersets of older models, but
49d448
that's not always the case. As a result it may actually select a new CPU
49d448
model as a baseline while removing some features from it to make it
49d448
compatible with older models. This is in general worse than using an old
49d448
CPU model with a bunch of added features as a guest OS or apps may crash
49d448
when using features that were disabled.
49d448
49d448
On the other hand we don't want to end up with a very old model which
49d448
would guarantee no disabled features as it could stop a guest OS or apps
49d448
from using some features provided by the CPU because they would not
49d448
expect them on such an old CPU.
49d448
49d448
This patch changes the heuristics to something in between. Enabled and
49d448
disabled features are counted separately so that a CPU model requiring
49d448
some features to be disabled looks worse than a model with fewer
49d448
disabled features even if its complete list of features is longer. The
49d448
penalty given for each additional disabled feature gets bigger to make
49d448
longer list of disabled features look even worse.
49d448
49d448
https://bugzilla.redhat.com/show_bug.cgi?id=1851227
49d448
49d448
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
49d448
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
49d448
(cherry picked from commit 48341b025acdd04a66696a709c7b09b3bfd42acf)
49d448
49d448
Conflicts:
49d448
	tests/domaincapsdata/qemu_2.9.0-tcg.x86_64.xml
49d448
        tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
49d448
        tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
49d448
        tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
49d448
            - not supported upstream anymore
49d448
49d448
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
49d448
---
49d448
 src/cpu/cpu_x86.c                             | 44 ++++++++++++++++---
49d448
 .../x86_64-cpuid-Atom-D510-guest.xml          |  5 ++-
49d448
 .../x86_64-cpuid-Atom-N450-guest.xml          |  5 ++-
49d448
 .../x86_64-cpuid-Phenom-B95-json.xml          | 21 +++++----
49d448
 ...id-baseline-Broadwell-IBRS+Cascadelake.xml | 11 +++--
49d448
 ..._64-cpuid-baseline-Cascadelake+Icelake.xml | 13 +++---
49d448
 ...puid-baseline-Cascadelake+Skylake-IBRS.xml |  5 ++-
49d448
 ...6_64-cpuid-baseline-Cooperlake+Icelake.xml | 13 +++---
49d448
 .../x86_64-host+guest,models-result.xml       | 10 +++--
49d448
 .../domaincapsdata/qemu_2.11.0-tcg.x86_64.xml | 34 ++++++++------
49d448
 .../domaincapsdata/qemu_2.12.0-tcg.x86_64.xml | 34 ++++++++------
49d448
 .../domaincapsdata/qemu_2.9.0-tcg.x86_64.xml  | 16 ++++---
49d448
 .../domaincapsdata/qemu_3.0.0-tcg.x86_64.xml  | 35 +++++++++------
49d448
 .../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml  | 35 +++++++++------
49d448
 .../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml  | 36 ++++++++-------
49d448
 .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml  | 37 +++++++++-------
49d448
 .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml  | 37 +++++++++-------
49d448
 .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml  | 36 +++++++++------
49d448
 .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml  | 36 +++++++++------
49d448
 .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml  | 36 +++++++++------
49d448
 .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml  | 36 +++++++++------
49d448
 .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml  | 36 +++++++++------
49d448
 .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml  | 36 +++++++++------
49d448
 tests/qemuxml2argvdata/cpu-fallback.args      |  2 +-
49d448
 .../cpu-host-model-cmt.x86_64-4.0.0.args      |  2 +-
49d448
 .../cpu-host-model-fallback.args              |  2 +-
49d448
 26 files changed, 382 insertions(+), 231 deletions(-)
49d448
49d448
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
49d448
index 81c2441b8b..ebcd96edb1 100644
49d448
--- a/src/cpu/cpu_x86.c
49d448
+++ b/src/cpu/cpu_x86.c
49d448
@@ -1970,23 +1970,57 @@ virCPUx86Compare(virCPUDef *host,
49d448
 }
49d448
 
49d448
 
49d448
+/* Base penalty for disabled features. */
49d448
+#define BASE_PENALTY 2
49d448
+
49d448
 static int
49d448
 virCPUx86CompareCandidateFeatureList(virCPUDef *cpuCurrent,
49d448
                                      virCPUDef *cpuCandidate)
49d448
 {
49d448
     size_t current = cpuCurrent->nfeatures;
49d448
+    size_t enabledCurrent = current;
49d448
+    size_t disabledCurrent = 0;
49d448
     size_t candidate = cpuCandidate->nfeatures;
49d448
+    size_t enabled = candidate;
49d448
+    size_t disabled = 0;
49d448
+
49d448
+    if (cpuCandidate->type != VIR_CPU_TYPE_HOST) {
49d448
+        size_t i;
49d448
+        int penalty = BASE_PENALTY;
49d448
+
49d448
+        for (i = 0; i < enabledCurrent; i++) {
49d448
+            if (cpuCurrent->features[i].policy == VIR_CPU_FEATURE_DISABLE) {
49d448
+                enabledCurrent--;
49d448
+                disabledCurrent += penalty;
49d448
+                penalty++;
49d448
+            }
49d448
+        }
49d448
+        current = enabledCurrent + disabledCurrent;
49d448
+
49d448
+        penalty = BASE_PENALTY;
49d448
+        for (i = 0; i < enabled; i++) {
49d448
+            if (cpuCandidate->features[i].policy == VIR_CPU_FEATURE_DISABLE) {
49d448
+                enabled--;
49d448
+                disabled += penalty;
49d448
+                penalty++;
49d448
+            }
49d448
+        }
49d448
+        candidate = enabled + disabled;
49d448
+    }
49d448
 
49d448
-    if (candidate < current) {
49d448
-        VIR_DEBUG("%s is better than %s: %zu < %zu",
49d448
+    if (candidate < current ||
49d448
+        (candidate == current && disabled < disabledCurrent)) {
49d448
+        VIR_DEBUG("%s is better than %s: %zu (%zu, %zu) < %zu (%zu, %zu)",
49d448
                   cpuCandidate->model, cpuCurrent->model,
49d448
-                  candidate, current);
49d448
+                  candidate, enabled, disabled,
49d448
+                  current, enabledCurrent, disabledCurrent);
49d448
         return 1;
49d448
     }
49d448
 
49d448
-    VIR_DEBUG("%s is not better than %s: %zu >= %zu",
49d448
+    VIR_DEBUG("%s is not better than %s: %zu (%zu, %zu) >= %zu (%zu, %zu)",
49d448
               cpuCandidate->model, cpuCurrent->model,
49d448
-              candidate, current);
49d448
+              candidate, enabled, disabled,
49d448
+              current, enabledCurrent, disabledCurrent);
49d448
     return 0;
49d448
 }
49d448
 
49d448
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml b/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml
49d448
index caa0bfd53b..d2f7a79074 100644
49d448
--- a/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml
49d448
+++ b/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml
49d448
@@ -1,6 +1,7 @@
49d448
 <cpu mode='custom' match='exact'>
49d448
-  <model fallback='forbid'>core2duo</model>
49d448
+  <model fallback='forbid'>n270</model>
49d448
   <vendor>Intel</vendor>
49d448
+  <feature policy='require' name='pse36'/>
49d448
   <feature policy='require' name='ds'/>
49d448
   <feature policy='require' name='acpi'/>
49d448
   <feature policy='require' name='ss'/>
49d448
@@ -14,6 +15,6 @@
49d448
   <feature policy='require' name='xtpr'/>
49d448
   <feature policy='require' name='pdcm'/>
49d448
   <feature policy='require' name='movbe'/>
49d448
+  <feature policy='require' name='lm'/>
49d448
   <feature policy='require' name='lahf_lm'/>
49d448
-  <feature policy='disable' name='syscall'/>
49d448
 </cpu>
49d448
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml b/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml
49d448
index e8f5c93881..779faf6cef 100644
49d448
--- a/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml
49d448
+++ b/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml
49d448
@@ -1,5 +1,5 @@
49d448
 <cpu mode='custom' match='exact'>
49d448
-  <model fallback='forbid'>core2duo</model>
49d448
+  <model fallback='forbid'>n270</model>
49d448
   <vendor>Intel</vendor>
49d448
   <feature policy='require' name='ds'/>
49d448
   <feature policy='require' name='acpi'/>
49d448
@@ -15,6 +15,7 @@
49d448
   <feature policy='require' name='xtpr'/>
49d448
   <feature policy='require' name='pdcm'/>
49d448
   <feature policy='require' name='movbe'/>
49d448
+  <feature policy='require' name='syscall'/>
49d448
+  <feature policy='require' name='lm'/>
49d448
   <feature policy='require' name='lahf_lm'/>
49d448
-  <feature policy='disable' name='pse36'/>
49d448
 </cpu>
49d448
diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml
49d448
index b4198f66a5..7f6289c6d7 100644
49d448
--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml
49d448
+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml
49d448
@@ -1,22 +1,25 @@
49d448
 <cpu mode='custom' match='exact'>
49d448
-  <model fallback='forbid'>Opteron_G3</model>
49d448
+  <model fallback='forbid'>athlon</model>
49d448
   <vendor>AMD</vendor>
49d448
-  <feature policy='require' name='vme'/>
49d448
+  <feature policy='require' name='mca'/>
49d448
+  <feature policy='require' name='clflush'/>
49d448
+  <feature policy='require' name='pni'/>
49d448
+  <feature policy='require' name='cx16'/>
49d448
   <feature policy='require' name='x2apic'/>
49d448
+  <feature policy='require' name='popcnt'/>
49d448
   <feature policy='require' name='hypervisor'/>
49d448
-  <feature policy='require' name='mmxext'/>
49d448
+  <feature policy='require' name='syscall'/>
49d448
   <feature policy='require' name='fxsr_opt'/>
49d448
   <feature policy='require' name='pdpe1gb'/>
49d448
-  <feature policy='require' name='3dnowext'/>
49d448
-  <feature policy='require' name='3dnow'/>
49d448
+  <feature policy='require' name='lm'/>
49d448
+  <feature policy='require' name='lahf_lm'/>
49d448
   <feature policy='require' name='cmp_legacy'/>
49d448
   <feature policy='require' name='cr8legacy'/>
49d448
+  <feature policy='require' name='abm'/>
49d448
+  <feature policy='require' name='sse4a'/>
49d448
+  <feature policy='require' name='misalignsse'/>
49d448
   <feature policy='require' name='3dnowprefetch'/>
49d448
   <feature policy='require' name='osvw'/>
49d448
   <feature policy='require' name='npt'/>
49d448
   <feature policy='require' name='nrip-save'/>
49d448
-  <feature policy='disable' name='nx'/>
49d448
-  <feature policy='disable' name='rdtscp'/>
49d448
-  <feature policy='disable' name='svm'/>
49d448
-  <feature policy='disable' name='monitor'/>
49d448
 </cpu>
49d448
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Broadwell-IBRS+Cascadelake.xml b/tests/cputestdata/x86_64-cpuid-baseline-Broadwell-IBRS+Cascadelake.xml
49d448
index 4e3f253e9b..99bce8db87 100644
49d448
--- a/tests/cputestdata/x86_64-cpuid-baseline-Broadwell-IBRS+Cascadelake.xml
49d448
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Broadwell-IBRS+Cascadelake.xml
49d448
@@ -1,11 +1,14 @@
49d448
 <cpu mode='custom' match='exact'>
49d448
-  <model fallback='allow'>Skylake-Client-IBRS</model>
49d448
+  <model fallback='allow'>Broadwell-IBRS</model>
49d448
   <vendor>Intel</vendor>
49d448
+  <feature policy='require' name='vme'/>
49d448
   <feature policy='require' name='ss'/>
49d448
+  <feature policy='require' name='f16c'/>
49d448
+  <feature policy='require' name='rdrand'/>
49d448
   <feature policy='require' name='hypervisor'/>
49d448
+  <feature policy='require' name='arat'/>
49d448
   <feature policy='require' name='tsc_adjust'/>
49d448
+  <feature policy='require' name='xsaveopt'/>
49d448
   <feature policy='require' name='pdpe1gb'/>
49d448
-  <feature policy='disable' name='mpx'/>
49d448
-  <feature policy='disable' name='xsavec'/>
49d448
-  <feature policy='disable' name='xgetbv1'/>
49d448
+  <feature policy='require' name='abm'/>
49d448
 </cpu>
49d448
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Icelake.xml b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Icelake.xml
49d448
index e372a3e446..071c799ba2 100644
49d448
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Icelake.xml
49d448
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Icelake.xml
49d448
@@ -1,14 +1,15 @@
49d448
 <cpu mode='custom' match='exact'>
49d448
-  <model fallback='allow'>Cooperlake</model>
49d448
+  <model fallback='allow'>Cascadelake-Server</model>
49d448
   <vendor>Intel</vendor>
49d448
   <feature policy='require' name='ss'/>
49d448
   <feature policy='require' name='hypervisor'/>
49d448
   <feature policy='require' name='tsc_adjust'/>
49d448
-  <feature policy='require' name='mpx'/>
49d448
   <feature policy='require' name='umip'/>
49d448
+  <feature policy='require' name='pku'/>
49d448
+  <feature policy='require' name='stibp'/>
49d448
+  <feature policy='require' name='arch-capabilities'/>
49d448
   <feature policy='require' name='xsaves'/>
49d448
-  <feature policy='disable' name='avx512-bf16'/>
49d448
-  <feature policy='disable' name='mds-no'/>
49d448
-  <feature policy='disable' name='pschange-mc-no'/>
49d448
-  <feature policy='disable' name='taa-no'/>
49d448
+  <feature policy='require' name='rdctl-no'/>
49d448
+  <feature policy='require' name='ibrs-all'/>
49d448
+  <feature policy='require' name='skip-l1dfl-vmentry'/>
49d448
 </cpu>
49d448
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake-IBRS.xml b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake-IBRS.xml
49d448
index e559e01583..5e42876b39 100644
49d448
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake-IBRS.xml
49d448
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake-IBRS.xml
49d448
@@ -1,12 +1,13 @@
49d448
 <cpu mode='custom' match='exact'>
49d448
-  <model fallback='allow'>Cascadelake-Server</model>
49d448
+  <model fallback='allow'>Skylake-Server-IBRS</model>
49d448
   <vendor>Intel</vendor>
49d448
   <feature policy='require' name='ss'/>
49d448
   <feature policy='require' name='hypervisor'/>
49d448
   <feature policy='require' name='tsc_adjust'/>
49d448
+  <feature policy='require' name='clflushopt'/>
49d448
   <feature policy='require' name='umip'/>
49d448
   <feature policy='require' name='pku'/>
49d448
+  <feature policy='require' name='ssbd'/>
49d448
   <feature policy='require' name='xsaves'/>
49d448
   <feature policy='require' name='skip-l1dfl-vmentry'/>
49d448
-  <feature policy='disable' name='avx512vnni'/>
49d448
 </cpu>
49d448
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Icelake.xml b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Icelake.xml
49d448
index e372a3e446..071c799ba2 100644
49d448
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Icelake.xml
49d448
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Icelake.xml
49d448
@@ -1,14 +1,15 @@
49d448
 <cpu mode='custom' match='exact'>
49d448
-  <model fallback='allow'>Cooperlake</model>
49d448
+  <model fallback='allow'>Cascadelake-Server</model>
49d448
   <vendor>Intel</vendor>
49d448
   <feature policy='require' name='ss'/>
49d448
   <feature policy='require' name='hypervisor'/>
49d448
   <feature policy='require' name='tsc_adjust'/>
49d448
-  <feature policy='require' name='mpx'/>
49d448
   <feature policy='require' name='umip'/>
49d448
+  <feature policy='require' name='pku'/>
49d448
+  <feature policy='require' name='stibp'/>
49d448
+  <feature policy='require' name='arch-capabilities'/>
49d448
   <feature policy='require' name='xsaves'/>
49d448
-  <feature policy='disable' name='avx512-bf16'/>
49d448
-  <feature policy='disable' name='mds-no'/>
49d448
-  <feature policy='disable' name='pschange-mc-no'/>
49d448
-  <feature policy='disable' name='taa-no'/>
49d448
+  <feature policy='require' name='rdctl-no'/>
49d448
+  <feature policy='require' name='ibrs-all'/>
49d448
+  <feature policy='require' name='skip-l1dfl-vmentry'/>
49d448
 </cpu>
49d448
diff --git a/tests/cputestdata/x86_64-host+guest,models-result.xml b/tests/cputestdata/x86_64-host+guest,models-result.xml
49d448
index 0dd6955898..42664a48b4 100644
49d448
--- a/tests/cputestdata/x86_64-host+guest,models-result.xml
49d448
+++ b/tests/cputestdata/x86_64-host+guest,models-result.xml
49d448
@@ -1,17 +1,19 @@
49d448
 <cpu mode='custom' match='exact'>
49d448
-  <model fallback='allow'>Nehalem</model>
49d448
+  <model fallback='allow'>qemu64</model>
49d448
   <topology sockets='2' dies='1' cores='4' threads='1'/>
49d448
   <feature policy='force' name='pbe'/>
49d448
   <feature policy='force' name='monitor'/>
49d448
+  <feature policy='require' name='ssse3'/>
49d448
   <feature policy='require' name='xtpr'/>
49d448
   <feature policy='require' name='dca'/>
49d448
+  <feature policy='require' name='sse4.1'/>
49d448
   <feature policy='force' name='3dnowext'/>
49d448
-  <feature policy='force' name='svm'/>
49d448
+  <feature policy='require' name='lahf_lm'/>
49d448
   <feature policy='disable' name='sse'/>
49d448
   <feature policy='disable' name='sse4.2'/>
49d448
-  <feature policy='forbid' name='popcnt'/>
49d448
   <feature policy='disable' name='3dnow'/>
49d448
-  <feature policy='require' name='ssse3'/>
49d448
   <feature policy='disable' name='vmx'/>
49d448
   <feature policy='disable' name='ds_cpl'/>
49d448
+  <feature policy='force' name='svm'/>
49d448
+  <feature policy='forbid' name='popcnt'/>
49d448
 </cpu>
49d448
diff --git a/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
49d448
index cccc6830f9..4a92b5bead 100644
49d448
--- a/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
49d448
+++ b/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
49d448
@@ -36,34 +36,42 @@
49d448
       </enum>
49d448
     </mode>
49d448
     <mode name='host-model' supported='yes'>
49d448
-      <model fallback='forbid'>EPYC</model>
49d448
+      <model fallback='forbid'>Opteron_G3</model>
49d448
       <vendor>AMD</vendor>
49d448
       <feature policy='require' name='acpi'/>
49d448
       <feature policy='require' name='ss'/>
49d448
+      <feature policy='require' name='pclmuldq'/>
49d448
       <feature policy='require' name='monitor'/>
49d448
+      <feature policy='require' name='ssse3'/>
49d448
+      <feature policy='require' name='sse4.1'/>
49d448
+      <feature policy='require' name='sse4.2'/>
49d448
+      <feature policy='require' name='movbe'/>
49d448
+      <feature policy='require' name='aes'/>
49d448
+      <feature policy='require' name='xsave'/>
49d448
       <feature policy='require' name='hypervisor'/>
49d448
+      <feature policy='require' name='arat'/>
49d448
+      <feature policy='require' name='fsgsbase'/>
49d448
+      <feature policy='require' name='bmi1'/>
49d448
+      <feature policy='require' name='smep'/>
49d448
+      <feature policy='require' name='bmi2'/>
49d448
       <feature policy='require' name='erms'/>
49d448
       <feature policy='require' name='mpx'/>
49d448
+      <feature policy='require' name='adx'/>
49d448
+      <feature policy='require' name='smap'/>
49d448
       <feature policy='require' name='pcommit'/>
49d448
+      <feature policy='require' name='clflushopt'/>
49d448
       <feature policy='require' name='clwb'/>
49d448
       <feature policy='require' name='pku'/>
49d448
       <feature policy='require' name='ospke'/>
49d448
       <feature policy='require' name='la57'/>
49d448
+      <feature policy='require' name='xsaveopt'/>
49d448
+      <feature policy='require' name='xgetbv1'/>
49d448
+      <feature policy='require' name='mmxext'/>
49d448
+      <feature policy='require' name='pdpe1gb'/>
49d448
       <feature policy='require' name='3dnowext'/>
49d448
       <feature policy='require' name='3dnow'/>
49d448
-      <feature policy='disable' name='vme'/>
49d448
-      <feature policy='disable' name='fma'/>
49d448
-      <feature policy='disable' name='avx'/>
49d448
-      <feature policy='disable' name='f16c'/>
49d448
-      <feature policy='disable' name='rdrand'/>
49d448
-      <feature policy='disable' name='avx2'/>
49d448
-      <feature policy='disable' name='rdseed'/>
49d448
-      <feature policy='disable' name='sha-ni'/>
49d448
-      <feature policy='disable' name='xsavec'/>
49d448
-      <feature policy='disable' name='fxsr_opt'/>
49d448
+      <feature policy='require' name='cr8legacy'/>
49d448
       <feature policy='disable' name='misalignsse'/>
49d448
-      <feature policy='disable' name='3dnowprefetch'/>
49d448
-      <feature policy='disable' name='osvw'/>
49d448
     </mode>
49d448
     <mode name='custom' supported='yes'>
49d448
       <model usable='yes'>qemu64</model>
49d448
diff --git a/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
49d448
index 575506d852..7799a6a7a6 100644
49d448
--- a/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
49d448
+++ b/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
49d448
@@ -36,34 +36,42 @@
49d448
       </enum>
49d448
     </mode>
49d448
     <mode name='host-model' supported='yes'>
49d448
-      <model fallback='forbid'>EPYC</model>
49d448
+      <model fallback='forbid'>Opteron_G3</model>
49d448
       <vendor>AMD</vendor>
49d448
       <feature policy='require' name='acpi'/>
49d448
       <feature policy='require' name='ss'/>
49d448
+      <feature policy='require' name='pclmuldq'/>
49d448
       <feature policy='require' name='monitor'/>
49d448
+      <feature policy='require' name='ssse3'/>
49d448
+      <feature policy='require' name='sse4.1'/>
49d448
+      <feature policy='require' name='sse4.2'/>
49d448
+      <feature policy='require' name='movbe'/>
49d448
+      <feature policy='require' name='aes'/>
49d448
+      <feature policy='require' name='xsave'/>
49d448
       <feature policy='require' name='hypervisor'/>
49d448
+      <feature policy='require' name='arat'/>
49d448
+      <feature policy='require' name='fsgsbase'/>
49d448
+      <feature policy='require' name='bmi1'/>
49d448
+      <feature policy='require' name='smep'/>
49d448
+      <feature policy='require' name='bmi2'/>
49d448
       <feature policy='require' name='erms'/>
49d448
       <feature policy='require' name='mpx'/>
49d448
+      <feature policy='require' name='adx'/>
49d448
+      <feature policy='require' name='smap'/>
49d448
       <feature policy='require' name='pcommit'/>
49d448
+      <feature policy='require' name='clflushopt'/>
49d448
       <feature policy='require' name='clwb'/>
49d448
       <feature policy='require' name='pku'/>
49d448
       <feature policy='require' name='ospke'/>
49d448
       <feature policy='require' name='la57'/>
49d448
+      <feature policy='require' name='xsaveopt'/>
49d448
+      <feature policy='require' name='xgetbv1'/>
49d448
+      <feature policy='require' name='mmxext'/>
49d448
+      <feature policy='require' name='pdpe1gb'/>
49d448
       <feature policy='require' name='3dnowext'/>
49d448
       <feature policy='require' name='3dnow'/>
49d448
-      <feature policy='disable' name='vme'/>
49d448
-      <feature policy='disable' name='fma'/>
49d448
-      <feature policy='disable' name='avx'/>
49d448
-      <feature policy='disable' name='f16c'/>
49d448
-      <feature policy='disable' name='rdrand'/>
49d448
-      <feature policy='disable' name='avx2'/>
49d448
-      <feature policy='disable' name='rdseed'/>
49d448
-      <feature policy='disable' name='sha-ni'/>
49d448
-      <feature policy='disable' name='xsavec'/>
49d448
-      <feature policy='disable' name='fxsr_opt'/>
49d448
+      <feature policy='require' name='cr8legacy'/>
49d448
       <feature policy='disable' name='misalignsse'/>
49d448
-      <feature policy='disable' name='3dnowprefetch'/>
49d448
-      <feature policy='disable' name='osvw'/>
49d448
     </mode>
49d448
     <mode name='custom' supported='yes'>
49d448
       <model usable='yes'>qemu64</model>
49d448
diff --git a/tests/domaincapsdata/qemu_2.9.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_2.9.0-tcg.x86_64.xml
49d448
index b47c426f1b..fe12641fbe 100644
49d448
--- a/tests/domaincapsdata/qemu_2.9.0-tcg.x86_64.xml
49d448
+++ b/tests/domaincapsdata/qemu_2.9.0-tcg.x86_64.xml
49d448
@@ -36,12 +36,19 @@
49d448
       </enum>
49d448
     </mode>
49d448
     <mode name='host-model' supported='yes'>
49d448
-      <model fallback='forbid'>Opteron_G4</model>
49d448
+      <model fallback='forbid'>Opteron_G3</model>
49d448
       <vendor>AMD</vendor>
49d448
       <feature policy='require' name='acpi'/>
49d448
       <feature policy='require' name='ss'/>
49d448
+      <feature policy='require' name='pclmuldq'/>
49d448
       <feature policy='require' name='monitor'/>
49d448
+      <feature policy='require' name='ssse3'/>
49d448
+      <feature policy='require' name='sse4.1'/>
49d448
+      <feature policy='require' name='sse4.2'/>
49d448
       <feature policy='require' name='movbe'/>
49d448
+      <feature policy='require' name='aes'/>
49d448
+      <feature policy='require' name='xsave'/>
49d448
+      <feature policy='require' name='rdrand'/>
49d448
       <feature policy='require' name='hypervisor'/>
49d448
       <feature policy='require' name='arat'/>
49d448
       <feature policy='require' name='fsgsbase'/>
49d448
@@ -61,14 +68,13 @@
49d448
       <feature policy='require' name='xsaveopt'/>
49d448
       <feature policy='require' name='xgetbv1'/>
49d448
       <feature policy='require' name='mmxext'/>
49d448
+      <feature policy='require' name='pdpe1gb'/>
49d448
       <feature policy='require' name='3dnowext'/>
49d448
       <feature policy='require' name='3dnow'/>
49d448
       <feature policy='require' name='cr8legacy'/>
49d448
-      <feature policy='disable' name='avx'/>
49d448
+      <feature policy='require' name='npt'/>
49d448
+      <feature policy='require' name='svme-addr-chk'/>
49d448
       <feature policy='disable' name='misalignsse'/>
49d448
-      <feature policy='disable' name='3dnowprefetch'/>
49d448
-      <feature policy='disable' name='xop'/>
49d448
-      <feature policy='disable' name='fma4'/>
49d448
     </mode>
49d448
     <mode name='custom' supported='yes'>
49d448
       <model usable='yes'>qemu64</model>
49d448
diff --git a/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
49d448
index 301101095c..daccacba0e 100644
49d448
--- a/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
49d448
+++ b/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
49d448
@@ -36,35 +36,42 @@
49d448
       </enum>
49d448
     </mode>
49d448
     <mode name='host-model' supported='yes'>
49d448
-      <model fallback='forbid'>EPYC</model>
49d448
+      <model fallback='forbid'>Opteron_G3</model>
49d448
       <vendor>AMD</vendor>
49d448
       <feature policy='require' name='acpi'/>
49d448
       <feature policy='require' name='ss'/>
49d448
+      <feature policy='require' name='pclmuldq'/>
49d448
       <feature policy='require' name='monitor'/>
49d448
+      <feature policy='require' name='ssse3'/>
49d448
+      <feature policy='require' name='sse4.1'/>
49d448
+      <feature policy='require' name='sse4.2'/>
49d448
+      <feature policy='require' name='movbe'/>
49d448
+      <feature policy='require' name='aes'/>
49d448
+      <feature policy='require' name='xsave'/>
49d448
       <feature policy='require' name='hypervisor'/>
49d448
+      <feature policy='require' name='arat'/>
49d448
+      <feature policy='require' name='fsgsbase'/>
49d448
+      <feature policy='require' name='bmi1'/>
49d448
+      <feature policy='require' name='smep'/>
49d448
+      <feature policy='require' name='bmi2'/>
49d448
       <feature policy='require' name='erms'/>
49d448
       <feature policy='require' name='mpx'/>
49d448
+      <feature policy='require' name='adx'/>
49d448
+      <feature policy='require' name='smap'/>
49d448
       <feature policy='require' name='pcommit'/>
49d448
+      <feature policy='require' name='clflushopt'/>
49d448
       <feature policy='require' name='clwb'/>
49d448
       <feature policy='require' name='pku'/>
49d448
       <feature policy='require' name='la57'/>
49d448
+      <feature policy='require' name='xsaveopt'/>
49d448
+      <feature policy='require' name='xgetbv1'/>
49d448
+      <feature policy='require' name='mmxext'/>
49d448
+      <feature policy='require' name='pdpe1gb'/>
49d448
       <feature policy='require' name='3dnowext'/>
49d448
       <feature policy='require' name='3dnow'/>
49d448
+      <feature policy='require' name='cr8legacy'/>
49d448
       <feature policy='require' name='npt'/>
49d448
-      <feature policy='disable' name='vme'/>
49d448
-      <feature policy='disable' name='fma'/>
49d448
-      <feature policy='disable' name='avx'/>
49d448
-      <feature policy='disable' name='f16c'/>
49d448
-      <feature policy='disable' name='rdrand'/>
49d448
-      <feature policy='disable' name='avx2'/>
49d448
-      <feature policy='disable' name='rdseed'/>
49d448
-      <feature policy='disable' name='sha-ni'/>
49d448
-      <feature policy='disable' name='xsavec'/>
49d448
-      <feature policy='disable' name='fxsr_opt'/>
49d448
       <feature policy='disable' name='misalignsse'/>
49d448
-      <feature policy='disable' name='3dnowprefetch'/>
49d448
-      <feature policy='disable' name='osvw'/>
49d448
-      <feature policy='disable' name='topoext'/>
49d448
     </mode>
49d448
     <mode name='custom' supported='yes'>
49d448
       <model usable='yes'>qemu64</model>
49d448
diff --git a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
49d448
index 1a5bc25b99..2a65cb0ad9 100644
49d448
--- a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
49d448
+++ b/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
49d448
@@ -36,35 +36,42 @@
49d448
       </enum>
49d448
     </mode>
49d448
     <mode name='host-model' supported='yes'>
49d448
-      <model fallback='forbid'>EPYC</model>
49d448
+      <model fallback='forbid'>Opteron_G3</model>
49d448
       <vendor>AMD</vendor>
49d448
       <feature policy='require' name='acpi'/>
49d448
       <feature policy='require' name='ss'/>
49d448
+      <feature policy='require' name='pclmuldq'/>
49d448
       <feature policy='require' name='monitor'/>
49d448
+      <feature policy='require' name='ssse3'/>
49d448
+      <feature policy='require' name='sse4.1'/>
49d448
+      <feature policy='require' name='sse4.2'/>
49d448
+      <feature policy='require' name='movbe'/>
49d448
+      <feature policy='require' name='aes'/>
49d448
+      <feature policy='require' name='xsave'/>
49d448
       <feature policy='require' name='hypervisor'/>
49d448
+      <feature policy='require' name='arat'/>
49d448
+      <feature policy='require' name='fsgsbase'/>
49d448
+      <feature policy='require' name='bmi1'/>
49d448
+      <feature policy='require' name='smep'/>
49d448
+      <feature policy='require' name='bmi2'/>
49d448
       <feature policy='require' name='erms'/>
49d448
       <feature policy='require' name='mpx'/>
49d448
+      <feature policy='require' name='adx'/>
49d448
+      <feature policy='require' name='smap'/>
49d448
       <feature policy='require' name='pcommit'/>
49d448
+      <feature policy='require' name='clflushopt'/>
49d448
       <feature policy='require' name='clwb'/>
49d448
       <feature policy='require' name='pku'/>
49d448
       <feature policy='require' name='la57'/>
49d448
+      <feature policy='require' name='xsaveopt'/>
49d448
+      <feature policy='require' name='xgetbv1'/>
49d448
+      <feature policy='require' name='mmxext'/>
49d448
+      <feature policy='require' name='pdpe1gb'/>
49d448
       <feature policy='require' name='3dnowext'/>
49d448
       <feature policy='require' name='3dnow'/>
49d448
+      <feature policy='require' name='cr8legacy'/>
49d448
       <feature policy='require' name='npt'/>
49d448
-      <feature policy='disable' name='vme'/>
49d448
-      <feature policy='disable' name='fma'/>
49d448
-      <feature policy='disable' name='avx'/>
49d448
-      <feature policy='disable' name='f16c'/>
49d448
-      <feature policy='disable' name='rdrand'/>
49d448
-      <feature policy='disable' name='avx2'/>
49d448
-      <feature policy='disable' name='rdseed'/>
49d448
-      <feature policy='disable' name='sha-ni'/>
49d448
-      <feature policy='disable' name='xsavec'/>
49d448
-      <feature policy='disable' name='fxsr_opt'/>
49d448
       <feature policy='disable' name='misalignsse'/>
49d448
-      <feature policy='disable' name='3dnowprefetch'/>
49d448
-      <feature policy='disable' name='osvw'/>
49d448
-      <feature policy='disable' name='topoext'/>
49d448
     </mode>
49d448
     <mode name='custom' supported='yes'>
49d448
       <model usable='yes'>qemu64</model>
49d448
diff --git a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
49d448
index e744ac27ac..a4dc7bafc9 100644
49d448
--- a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
49d448
+++ b/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
49d448
@@ -36,36 +36,42 @@
49d448
       </enum>
49d448
     </mode>
49d448
     <mode name='host-model' supported='yes'>
49d448
-      <model fallback='forbid'>EPYC</model>
49d448
+      <model fallback='forbid'>Opteron_G3</model>
49d448
       <vendor>AMD</vendor>
49d448
       <feature policy='require' name='acpi'/>
49d448
       <feature policy='require' name='ss'/>
49d448
+      <feature policy='require' name='pclmuldq'/>
49d448
       <feature policy='require' name='monitor'/>
49d448
+      <feature policy='require' name='ssse3'/>
49d448
+      <feature policy='require' name='sse4.1'/>
49d448
+      <feature policy='require' name='sse4.2'/>
49d448
+      <feature policy='require' name='movbe'/>
49d448
+      <feature policy='require' name='aes'/>
49d448
+      <feature policy='require' name='xsave'/>
49d448
       <feature policy='require' name='hypervisor'/>
49d448
+      <feature policy='require' name='arat'/>
49d448
+      <feature policy='require' name='fsgsbase'/>
49d448
+      <feature policy='require' name='bmi1'/>
49d448
+      <feature policy='require' name='smep'/>
49d448
+      <feature policy='require' name='bmi2'/>
49d448
       <feature policy='require' name='erms'/>
49d448
       <feature policy='require' name='mpx'/>
49d448
+      <feature policy='require' name='adx'/>
49d448
+      <feature policy='require' name='smap'/>
49d448
       <feature policy='require' name='pcommit'/>
49d448
+      <feature policy='require' name='clflushopt'/>
49d448
       <feature policy='require' name='clwb'/>
49d448
       <feature policy='require' name='pku'/>
49d448
       <feature policy='require' name='la57'/>
49d448
+      <feature policy='require' name='xsaveopt'/>
49d448
+      <feature policy='require' name='xgetbv1'/>
49d448
+      <feature policy='require' name='mmxext'/>
49d448
+      <feature policy='require' name='pdpe1gb'/>
49d448
       <feature policy='require' name='3dnowext'/>
49d448
       <feature policy='require' name='3dnow'/>
49d448
+      <feature policy='require' name='cr8legacy'/>
49d448
       <feature policy='require' name='npt'/>
49d448
-      <feature policy='disable' name='vme'/>
49d448
-      <feature policy='disable' name='fma'/>
49d448
-      <feature policy='disable' name='avx'/>
49d448
-      <feature policy='disable' name='f16c'/>
49d448
-      <feature policy='disable' name='rdrand'/>
49d448
-      <feature policy='disable' name='avx2'/>
49d448
-      <feature policy='disable' name='rdseed'/>
49d448
-      <feature policy='disable' name='sha-ni'/>
49d448
-      <feature policy='disable' name='xsavec'/>
49d448
-      <feature policy='disable' name='fxsr_opt'/>
49d448
       <feature policy='disable' name='misalignsse'/>
49d448
-      <feature policy='disable' name='3dnowprefetch'/>
49d448
-      <feature policy='disable' name='osvw'/>
49d448
-      <feature policy='disable' name='topoext'/>
49d448
-      <feature policy='disable' name='nrip-save'/>
49d448
     </mode>
49d448
     <mode name='custom' supported='yes'>
49d448
       <model usable='yes'>qemu64</model>
49d448
diff --git a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
49d448
index 80b1ce8ef9..b20c02cb68 100644
49d448
--- a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
49d448
+++ b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
49d448
@@ -36,36 +36,43 @@
49d448
       </enum>
49d448
     </mode>
49d448
     <mode name='host-model' supported='yes'>
49d448
-      <model fallback='forbid'>EPYC-IBPB</model>
49d448
+      <model fallback='forbid'>Opteron_G3</model>
49d448
       <vendor>AMD</vendor>
49d448
       <feature policy='require' name='acpi'/>
49d448
       <feature policy='require' name='ss'/>
49d448
+      <feature policy='require' name='pclmuldq'/>
49d448
       <feature policy='require' name='monitor'/>
49d448
+      <feature policy='require' name='ssse3'/>
49d448
+      <feature policy='require' name='sse4.1'/>
49d448
+      <feature policy='require' name='sse4.2'/>
49d448
+      <feature policy='require' name='movbe'/>
49d448
+      <feature policy='require' name='aes'/>
49d448
+      <feature policy='require' name='xsave'/>
49d448
+      <feature policy='require' name='rdrand'/>
49d448
       <feature policy='require' name='hypervisor'/>
49d448
+      <feature policy='require' name='arat'/>
49d448
+      <feature policy='require' name='fsgsbase'/>
49d448
+      <feature policy='require' name='bmi1'/>
49d448
+      <feature policy='require' name='smep'/>
49d448
+      <feature policy='require' name='bmi2'/>
49d448
       <feature policy='require' name='erms'/>
49d448
       <feature policy='require' name='mpx'/>
49d448
+      <feature policy='require' name='adx'/>
49d448
+      <feature policy='require' name='smap'/>
49d448
       <feature policy='require' name='pcommit'/>
49d448
+      <feature policy='require' name='clflushopt'/>
49d448
       <feature policy='require' name='clwb'/>
49d448
       <feature policy='require' name='pku'/>
49d448
       <feature policy='require' name='la57'/>
49d448
+      <feature policy='require' name='xsaveopt'/>
49d448
+      <feature policy='require' name='xgetbv1'/>
49d448
+      <feature policy='require' name='mmxext'/>
49d448
+      <feature policy='require' name='pdpe1gb'/>
49d448
       <feature policy='require' name='3dnowext'/>
49d448
       <feature policy='require' name='3dnow'/>
49d448
+      <feature policy='require' name='cr8legacy'/>
49d448
       <feature policy='require' name='npt'/>
49d448
-      <feature policy='disable' name='vme'/>
49d448
-      <feature policy='disable' name='fma'/>
49d448
-      <feature policy='disable' name='avx'/>
49d448
-      <feature policy='disable' name='f16c'/>
49d448
-      <feature policy='disable' name='avx2'/>
49d448
-      <feature policy='disable' name='rdseed'/>
49d448
-      <feature policy='disable' name='sha-ni'/>
49d448
-      <feature policy='disable' name='xsavec'/>
49d448
-      <feature policy='disable' name='fxsr_opt'/>
49d448
       <feature policy='disable' name='misalignsse'/>
49d448
-      <feature policy='disable' name='3dnowprefetch'/>
49d448
-      <feature policy='disable' name='osvw'/>
49d448
-      <feature policy='disable' name='topoext'/>
49d448
-      <feature policy='disable' name='ibpb'/>
49d448
-      <feature policy='disable' name='nrip-save'/>
49d448
     </mode>
49d448
     <mode name='custom' supported='yes'>
49d448
       <model usable='yes'>qemu64</model>
49d448
diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
49d448
index 91b3ed6f80..d0ee3f7b7a 100644
49d448
--- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
49d448
+++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
49d448
@@ -36,36 +36,43 @@
49d448
       </enum>
49d448
     </mode>
49d448
     <mode name='host-model' supported='yes'>
49d448
-      <model fallback='forbid'>EPYC-IBPB</model>
49d448
+      <model fallback='forbid'>Opteron_G3</model>
49d448
       <vendor>AMD</vendor>
49d448
       <feature policy='require' name='acpi'/>
49d448
       <feature policy='require' name='ss'/>
49d448
+      <feature policy='require' name='pclmuldq'/>
49d448
       <feature policy='require' name='monitor'/>
49d448
+      <feature policy='require' name='ssse3'/>
49d448
+      <feature policy='require' name='sse4.1'/>
49d448
+      <feature policy='require' name='sse4.2'/>
49d448
+      <feature policy='require' name='movbe'/>
49d448
+      <feature policy='require' name='aes'/>
49d448
+      <feature policy='require' name='xsave'/>
49d448
+      <feature policy='require' name='rdrand'/>
49d448
       <feature policy='require' name='hypervisor'/>
49d448
+      <feature policy='require' name='arat'/>
49d448
+      <feature policy='require' name='fsgsbase'/>
49d448
+      <feature policy='require' name='bmi1'/>
49d448
+      <feature policy='require' name='smep'/>
49d448
+      <feature policy='require' name='bmi2'/>
49d448
       <feature policy='require' name='erms'/>
49d448
       <feature policy='require' name='mpx'/>
49d448
+      <feature policy='require' name='adx'/>
49d448
+      <feature policy='require' name='smap'/>
49d448
       <feature policy='require' name='pcommit'/>
49d448
+      <feature policy='require' name='clflushopt'/>
49d448
       <feature policy='require' name='clwb'/>
49d448
       <feature policy='require' name='pku'/>
49d448
       <feature policy='require' name='la57'/>
49d448
+      <feature policy='require' name='xsaveopt'/>
49d448
+      <feature policy='require' name='xgetbv1'/>
49d448
+      <feature policy='require' name='mmxext'/>
49d448
+      <feature policy='require' name='pdpe1gb'/>
49d448
       <feature policy='require' name='3dnowext'/>
49d448
       <feature policy='require' name='3dnow'/>
49d448
+      <feature policy='require' name='cr8legacy'/>
49d448
       <feature policy='require' name='npt'/>
49d448
-      <feature policy='disable' name='vme'/>
49d448
-      <feature policy='disable' name='fma'/>
49d448
-      <feature policy='disable' name='avx'/>
49d448
-      <feature policy='disable' name='f16c'/>
49d448
-      <feature policy='disable' name='avx2'/>
49d448
-      <feature policy='disable' name='rdseed'/>
49d448
-      <feature policy='disable' name='sha-ni'/>
49d448
-      <feature policy='disable' name='xsavec'/>
49d448
-      <feature policy='disable' name='fxsr_opt'/>
49d448
       <feature policy='disable' name='misalignsse'/>
49d448
-      <feature policy='disable' name='3dnowprefetch'/>
49d448
-      <feature policy='disable' name='osvw'/>
49d448
-      <feature policy='disable' name='topoext'/>
49d448
-      <feature policy='disable' name='ibpb'/>
49d448
-      <feature policy='disable' name='nrip-save'/>
49d448
     </mode>
49d448
     <mode name='custom' supported='yes'>
49d448
       <model usable='yes'>qemu64</model>
49d448
diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
49d448
index b8737613e9..d277c96426 100644
49d448
--- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
49d448
+++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
49d448
@@ -36,35 +36,43 @@
49d448
       </enum>
49d448
     </mode>
49d448
     <mode name='host-model' supported='yes'>
49d448
-      <model fallback='forbid'>EPYC</model>
49d448
+      <model fallback='forbid'>Opteron_G3</model>
49d448
       <vendor>AMD</vendor>
49d448
       <feature policy='require' name='acpi'/>
49d448
       <feature policy='require' name='ss'/>
49d448
+      <feature policy='require' name='pclmuldq'/>
49d448
       <feature policy='require' name='monitor'/>
49d448
+      <feature policy='require' name='ssse3'/>
49d448
+      <feature policy='require' name='sse4.1'/>
49d448
+      <feature policy='require' name='sse4.2'/>
49d448
+      <feature policy='require' name='movbe'/>
49d448
+      <feature policy='require' name='aes'/>
49d448
+      <feature policy='require' name='xsave'/>
49d448
+      <feature policy='require' name='rdrand'/>
49d448
       <feature policy='require' name='hypervisor'/>
49d448
+      <feature policy='require' name='arat'/>
49d448
+      <feature policy='require' name='fsgsbase'/>
49d448
+      <feature policy='require' name='bmi1'/>
49d448
+      <feature policy='require' name='smep'/>
49d448
+      <feature policy='require' name='bmi2'/>
49d448
       <feature policy='require' name='erms'/>
49d448
       <feature policy='require' name='mpx'/>
49d448
+      <feature policy='require' name='adx'/>
49d448
+      <feature policy='require' name='smap'/>
49d448
       <feature policy='require' name='pcommit'/>
49d448
+      <feature policy='require' name='clflushopt'/>
49d448
       <feature policy='require' name='clwb'/>
49d448
       <feature policy='require' name='pku'/>
49d448
       <feature policy='require' name='la57'/>
49d448
+      <feature policy='require' name='xsaveopt'/>
49d448
+      <feature policy='require' name='xgetbv1'/>
49d448
+      <feature policy='require' name='mmxext'/>
49d448
+      <feature policy='require' name='pdpe1gb'/>
49d448
       <feature policy='require' name='3dnowext'/>
49d448
       <feature policy='require' name='3dnow'/>
49d448
+      <feature policy='require' name='cr8legacy'/>
49d448
       <feature policy='require' name='npt'/>
49d448
-      <feature policy='disable' name='vme'/>
49d448
-      <feature policy='disable' name='fma'/>
49d448
-      <feature policy='disable' name='avx'/>
49d448
-      <feature policy='disable' name='f16c'/>
49d448
-      <feature policy='disable' name='avx2'/>
49d448
-      <feature policy='disable' name='rdseed'/>
49d448
-      <feature policy='disable' name='sha-ni'/>
49d448
-      <feature policy='disable' name='xsavec'/>
49d448
-      <feature policy='disable' name='fxsr_opt'/>
49d448
       <feature policy='disable' name='misalignsse'/>
49d448
-      <feature policy='disable' name='3dnowprefetch'/>
49d448
-      <feature policy='disable' name='osvw'/>
49d448
-      <feature policy='disable' name='topoext'/>
49d448
-      <feature policy='disable' name='nrip-save'/>
49d448
     </mode>
49d448
     <mode name='custom' supported='yes'>
49d448
       <model usable='yes'>qemu64</model>
49d448
diff --git a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
49d448
index 034036ca96..4f1ffbb2ba 100644
49d448
--- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
49d448
+++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
49d448
@@ -36,35 +36,43 @@
49d448
       </enum>
49d448
     </mode>
49d448
     <mode name='host-model' supported='yes'>
49d448
-      <model fallback='forbid'>EPYC</model>
49d448
+      <model fallback='forbid'>Opteron_G3</model>
49d448
       <vendor>AMD</vendor>
49d448
       <feature policy='require' name='acpi'/>
49d448
       <feature policy='require' name='ss'/>
49d448
+      <feature policy='require' name='pclmuldq'/>
49d448
       <feature policy='require' name='monitor'/>
49d448
+      <feature policy='require' name='ssse3'/>
49d448
+      <feature policy='require' name='sse4.1'/>
49d448
+      <feature policy='require' name='sse4.2'/>
49d448
+      <feature policy='require' name='movbe'/>
49d448
+      <feature policy='require' name='aes'/>
49d448
+      <feature policy='require' name='xsave'/>
49d448
+      <feature policy='require' name='rdrand'/>
49d448
       <feature policy='require' name='hypervisor'/>
49d448
+      <feature policy='require' name='arat'/>
49d448
+      <feature policy='require' name='fsgsbase'/>
49d448
+      <feature policy='require' name='bmi1'/>
49d448
+      <feature policy='require' name='smep'/>
49d448
+      <feature policy='require' name='bmi2'/>
49d448
       <feature policy='require' name='erms'/>
49d448
       <feature policy='require' name='mpx'/>
49d448
+      <feature policy='require' name='adx'/>
49d448
+      <feature policy='require' name='smap'/>
49d448
       <feature policy='require' name='pcommit'/>
49d448
+      <feature policy='require' name='clflushopt'/>
49d448
       <feature policy='require' name='clwb'/>
49d448
       <feature policy='require' name='pku'/>
49d448
       <feature policy='require' name='la57'/>
49d448
+      <feature policy='require' name='xsaveopt'/>
49d448
+      <feature policy='require' name='xgetbv1'/>
49d448
+      <feature policy='require' name='mmxext'/>
49d448
+      <feature policy='require' name='pdpe1gb'/>
49d448
       <feature policy='require' name='3dnowext'/>
49d448
       <feature policy='require' name='3dnow'/>
49d448
+      <feature policy='require' name='cr8legacy'/>
49d448
       <feature policy='require' name='npt'/>
49d448
-      <feature policy='disable' name='vme'/>
49d448
-      <feature policy='disable' name='fma'/>
49d448
-      <feature policy='disable' name='avx'/>
49d448
-      <feature policy='disable' name='f16c'/>
49d448
-      <feature policy='disable' name='avx2'/>
49d448
-      <feature policy='disable' name='rdseed'/>
49d448
-      <feature policy='disable' name='sha-ni'/>
49d448
-      <feature policy='disable' name='xsavec'/>
49d448
-      <feature policy='disable' name='fxsr_opt'/>
49d448
       <feature policy='disable' name='misalignsse'/>
49d448
-      <feature policy='disable' name='3dnowprefetch'/>
49d448
-      <feature policy='disable' name='osvw'/>
49d448
-      <feature policy='disable' name='topoext'/>
49d448
-      <feature policy='disable' name='nrip-save'/>
49d448
     </mode>
49d448
     <mode name='custom' supported='yes'>
49d448
       <model usable='yes'>qemu64</model>
49d448
diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
49d448
index d3a4b01234..6cff0f815e 100644
49d448
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
49d448
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
49d448
@@ -36,35 +36,43 @@
49d448
       </enum>
49d448
     </mode>
49d448
     <mode name='host-model' supported='yes'>
49d448
-      <model fallback='forbid'>EPYC</model>
49d448
+      <model fallback='forbid'>Opteron_G3</model>
49d448
       <vendor>AMD</vendor>
49d448
       <feature policy='require' name='acpi'/>
49d448
       <feature policy='require' name='ss'/>
49d448
+      <feature policy='require' name='pclmuldq'/>
49d448
       <feature policy='require' name='monitor'/>
49d448
+      <feature policy='require' name='ssse3'/>
49d448
+      <feature policy='require' name='sse4.1'/>
49d448
+      <feature policy='require' name='sse4.2'/>
49d448
+      <feature policy='require' name='movbe'/>
49d448
+      <feature policy='require' name='aes'/>
49d448
+      <feature policy='require' name='xsave'/>
49d448
+      <feature policy='require' name='rdrand'/>
49d448
       <feature policy='require' name='hypervisor'/>
49d448
+      <feature policy='require' name='arat'/>
49d448
+      <feature policy='require' name='fsgsbase'/>
49d448
+      <feature policy='require' name='bmi1'/>
49d448
+      <feature policy='require' name='smep'/>
49d448
+      <feature policy='require' name='bmi2'/>
49d448
       <feature policy='require' name='erms'/>
49d448
       <feature policy='require' name='mpx'/>
49d448
+      <feature policy='require' name='adx'/>
49d448
+      <feature policy='require' name='smap'/>
49d448
       <feature policy='require' name='pcommit'/>
49d448
+      <feature policy='require' name='clflushopt'/>
49d448
       <feature policy='require' name='clwb'/>
49d448
       <feature policy='require' name='pku'/>
49d448
       <feature policy='require' name='la57'/>
49d448
+      <feature policy='require' name='xsaveopt'/>
49d448
+      <feature policy='require' name='xgetbv1'/>
49d448
+      <feature policy='require' name='mmxext'/>
49d448
+      <feature policy='require' name='pdpe1gb'/>
49d448
       <feature policy='require' name='3dnowext'/>
49d448
       <feature policy='require' name='3dnow'/>
49d448
+      <feature policy='require' name='cr8legacy'/>
49d448
       <feature policy='require' name='npt'/>
49d448
-      <feature policy='disable' name='vme'/>
49d448
-      <feature policy='disable' name='fma'/>
49d448
-      <feature policy='disable' name='avx'/>
49d448
-      <feature policy='disable' name='f16c'/>
49d448
-      <feature policy='disable' name='avx2'/>
49d448
-      <feature policy='disable' name='rdseed'/>
49d448
-      <feature policy='disable' name='sha-ni'/>
49d448
-      <feature policy='disable' name='xsavec'/>
49d448
-      <feature policy='disable' name='fxsr_opt'/>
49d448
       <feature policy='disable' name='misalignsse'/>
49d448
-      <feature policy='disable' name='3dnowprefetch'/>
49d448
-      <feature policy='disable' name='osvw'/>
49d448
-      <feature policy='disable' name='topoext'/>
49d448
-      <feature policy='disable' name='nrip-save'/>
49d448
     </mode>
49d448
     <mode name='custom' supported='yes'>
49d448
       <model usable='yes'>qemu64</model>
49d448
diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
49d448
index 6b85c9c45a..65f4459bcb 100644
49d448
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
49d448
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
49d448
@@ -36,35 +36,43 @@
49d448
       </enum>
49d448
     </mode>
49d448
     <mode name='host-model' supported='yes'>
49d448
-      <model fallback='forbid'>EPYC</model>
49d448
+      <model fallback='forbid'>Opteron_G3</model>
49d448
       <vendor>AMD</vendor>
49d448
       <feature policy='require' name='acpi'/>
49d448
       <feature policy='require' name='ss'/>
49d448
+      <feature policy='require' name='pclmuldq'/>
49d448
       <feature policy='require' name='monitor'/>
49d448
+      <feature policy='require' name='ssse3'/>
49d448
+      <feature policy='require' name='sse4.1'/>
49d448
+      <feature policy='require' name='sse4.2'/>
49d448
+      <feature policy='require' name='movbe'/>
49d448
+      <feature policy='require' name='aes'/>
49d448
+      <feature policy='require' name='xsave'/>
49d448
+      <feature policy='require' name='rdrand'/>
49d448
       <feature policy='require' name='hypervisor'/>
49d448
+      <feature policy='require' name='arat'/>
49d448
+      <feature policy='require' name='fsgsbase'/>
49d448
+      <feature policy='require' name='bmi1'/>
49d448
+      <feature policy='require' name='smep'/>
49d448
+      <feature policy='require' name='bmi2'/>
49d448
       <feature policy='require' name='erms'/>
49d448
       <feature policy='require' name='mpx'/>
49d448
+      <feature policy='require' name='adx'/>
49d448
+      <feature policy='require' name='smap'/>
49d448
       <feature policy='require' name='pcommit'/>
49d448
+      <feature policy='require' name='clflushopt'/>
49d448
       <feature policy='require' name='clwb'/>
49d448
       <feature policy='require' name='pku'/>
49d448
       <feature policy='require' name='la57'/>
49d448
+      <feature policy='require' name='xsaveopt'/>
49d448
+      <feature policy='require' name='xgetbv1'/>
49d448
+      <feature policy='require' name='mmxext'/>
49d448
+      <feature policy='require' name='pdpe1gb'/>
49d448
       <feature policy='require' name='3dnowext'/>
49d448
       <feature policy='require' name='3dnow'/>
49d448
+      <feature policy='require' name='cr8legacy'/>
49d448
       <feature policy='require' name='npt'/>
49d448
-      <feature policy='disable' name='vme'/>
49d448
-      <feature policy='disable' name='fma'/>
49d448
-      <feature policy='disable' name='avx'/>
49d448
-      <feature policy='disable' name='f16c'/>
49d448
-      <feature policy='disable' name='avx2'/>
49d448
-      <feature policy='disable' name='rdseed'/>
49d448
-      <feature policy='disable' name='sha-ni'/>
49d448
-      <feature policy='disable' name='xsavec'/>
49d448
-      <feature policy='disable' name='fxsr_opt'/>
49d448
       <feature policy='disable' name='misalignsse'/>
49d448
-      <feature policy='disable' name='3dnowprefetch'/>
49d448
-      <feature policy='disable' name='osvw'/>
49d448
-      <feature policy='disable' name='topoext'/>
49d448
-      <feature policy='disable' name='nrip-save'/>
49d448
     </mode>
49d448
     <mode name='custom' supported='yes'>
49d448
       <model usable='yes'>qemu64</model>
49d448
diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
49d448
index 2c761fc1af..40bc875e3c 100644
49d448
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
49d448
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
49d448
@@ -36,35 +36,43 @@
49d448
       </enum>
49d448
     </mode>
49d448
     <mode name='host-model' supported='yes'>
49d448
-      <model fallback='forbid'>EPYC</model>
49d448
+      <model fallback='forbid'>Opteron_G3</model>
49d448
       <vendor>AMD</vendor>
49d448
       <feature policy='require' name='acpi'/>
49d448
       <feature policy='require' name='ss'/>
49d448
+      <feature policy='require' name='pclmuldq'/>
49d448
       <feature policy='require' name='monitor'/>
49d448
+      <feature policy='require' name='ssse3'/>
49d448
+      <feature policy='require' name='sse4.1'/>
49d448
+      <feature policy='require' name='sse4.2'/>
49d448
+      <feature policy='require' name='movbe'/>
49d448
+      <feature policy='require' name='aes'/>
49d448
+      <feature policy='require' name='xsave'/>
49d448
+      <feature policy='require' name='rdrand'/>
49d448
       <feature policy='require' name='hypervisor'/>
49d448
+      <feature policy='require' name='arat'/>
49d448
+      <feature policy='require' name='fsgsbase'/>
49d448
+      <feature policy='require' name='bmi1'/>
49d448
+      <feature policy='require' name='smep'/>
49d448
+      <feature policy='require' name='bmi2'/>
49d448
       <feature policy='require' name='erms'/>
49d448
       <feature policy='require' name='mpx'/>
49d448
+      <feature policy='require' name='adx'/>
49d448
+      <feature policy='require' name='smap'/>
49d448
       <feature policy='require' name='pcommit'/>
49d448
+      <feature policy='require' name='clflushopt'/>
49d448
       <feature policy='require' name='clwb'/>
49d448
       <feature policy='require' name='pku'/>
49d448
       <feature policy='require' name='la57'/>
49d448
+      <feature policy='require' name='xsaveopt'/>
49d448
+      <feature policy='require' name='xgetbv1'/>
49d448
+      <feature policy='require' name='mmxext'/>
49d448
+      <feature policy='require' name='pdpe1gb'/>
49d448
       <feature policy='require' name='3dnowext'/>
49d448
       <feature policy='require' name='3dnow'/>
49d448
+      <feature policy='require' name='cr8legacy'/>
49d448
       <feature policy='require' name='npt'/>
49d448
-      <feature policy='disable' name='vme'/>
49d448
-      <feature policy='disable' name='fma'/>
49d448
-      <feature policy='disable' name='avx'/>
49d448
-      <feature policy='disable' name='f16c'/>
49d448
-      <feature policy='disable' name='avx2'/>
49d448
-      <feature policy='disable' name='rdseed'/>
49d448
-      <feature policy='disable' name='sha-ni'/>
49d448
-      <feature policy='disable' name='xsavec'/>
49d448
-      <feature policy='disable' name='fxsr_opt'/>
49d448
       <feature policy='disable' name='misalignsse'/>
49d448
-      <feature policy='disable' name='3dnowprefetch'/>
49d448
-      <feature policy='disable' name='osvw'/>
49d448
-      <feature policy='disable' name='topoext'/>
49d448
-      <feature policy='disable' name='nrip-save'/>
49d448
     </mode>
49d448
     <mode name='custom' supported='yes'>
49d448
       <model usable='yes'>qemu64</model>
49d448
diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
49d448
index 8db840faac..a439dda190 100644
49d448
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
49d448
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
49d448
@@ -36,36 +36,44 @@
49d448
       </enum>
49d448
     </mode>
49d448
     <mode name='host-model' supported='yes'>
49d448
-      <model fallback='forbid'>EPYC</model>
49d448
+      <model fallback='forbid'>Opteron_G3</model>
49d448
       <vendor>AMD</vendor>
49d448
       <feature policy='require' name='acpi'/>
49d448
       <feature policy='require' name='ss'/>
49d448
+      <feature policy='require' name='pclmuldq'/>
49d448
       <feature policy='require' name='monitor'/>
49d448
+      <feature policy='require' name='ssse3'/>
49d448
+      <feature policy='require' name='sse4.1'/>
49d448
+      <feature policy='require' name='sse4.2'/>
49d448
+      <feature policy='require' name='movbe'/>
49d448
+      <feature policy='require' name='aes'/>
49d448
+      <feature policy='require' name='xsave'/>
49d448
+      <feature policy='require' name='rdrand'/>
49d448
       <feature policy='require' name='hypervisor'/>
49d448
+      <feature policy='require' name='arat'/>
49d448
+      <feature policy='require' name='fsgsbase'/>
49d448
+      <feature policy='require' name='bmi1'/>
49d448
+      <feature policy='require' name='smep'/>
49d448
+      <feature policy='require' name='bmi2'/>
49d448
       <feature policy='require' name='erms'/>
49d448
       <feature policy='require' name='mpx'/>
49d448
+      <feature policy='require' name='adx'/>
49d448
+      <feature policy='require' name='smap'/>
49d448
       <feature policy='require' name='pcommit'/>
49d448
+      <feature policy='require' name='clflushopt'/>
49d448
       <feature policy='require' name='clwb'/>
49d448
       <feature policy='require' name='pku'/>
49d448
       <feature policy='require' name='la57'/>
49d448
+      <feature policy='require' name='xsaveopt'/>
49d448
+      <feature policy='require' name='xgetbv1'/>
49d448
+      <feature policy='require' name='mmxext'/>
49d448
+      <feature policy='require' name='pdpe1gb'/>
49d448
       <feature policy='require' name='3dnowext'/>
49d448
       <feature policy='require' name='3dnow'/>
49d448
+      <feature policy='require' name='cr8legacy'/>
49d448
       <feature policy='require' name='npt'/>
49d448
       <feature policy='require' name='svme-addr-chk'/>
49d448
-      <feature policy='disable' name='vme'/>
49d448
-      <feature policy='disable' name='fma'/>
49d448
-      <feature policy='disable' name='avx'/>
49d448
-      <feature policy='disable' name='f16c'/>
49d448
-      <feature policy='disable' name='avx2'/>
49d448
-      <feature policy='disable' name='rdseed'/>
49d448
-      <feature policy='disable' name='sha-ni'/>
49d448
-      <feature policy='disable' name='xsavec'/>
49d448
-      <feature policy='disable' name='fxsr_opt'/>
49d448
       <feature policy='disable' name='misalignsse'/>
49d448
-      <feature policy='disable' name='3dnowprefetch'/>
49d448
-      <feature policy='disable' name='osvw'/>
49d448
-      <feature policy='disable' name='topoext'/>
49d448
-      <feature policy='disable' name='nrip-save'/>
49d448
     </mode>
49d448
     <mode name='custom' supported='yes'>
49d448
       <model usable='yes'>qemu64</model>
49d448
diff --git a/tests/qemuxml2argvdata/cpu-fallback.args b/tests/qemuxml2argvdata/cpu-fallback.args
49d448
index 1b1769d420..53667dfa3a 100644
49d448
--- a/tests/qemuxml2argvdata/cpu-fallback.args
49d448
+++ b/tests/qemuxml2argvdata/cpu-fallback.args
49d448
@@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \
49d448
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
49d448
 -machine pc,usb=off,dump-guest-core=off \
49d448
 -accel kvm \
49d448
--cpu Penryn,sse4.1=off,sse4.2=off,popcnt=off,aes=off \
49d448
+-cpu Conroe,cx16=on,sse4.1=off,sse4.2=off,popcnt=off,aes=off \
49d448
 -m 214 \
49d448
 -realtime mlock=off \
49d448
 -smp 6,sockets=6,cores=1,threads=1 \
49d448
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
49d448
index 3ff226a289..0de09e1d88 100644
49d448
--- a/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args
49d448
+++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args
49d448
@@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \
49d448
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
49d448
 -machine pc-i440fx-4.0,usb=off,dump-guest-core=off \
49d448
 -accel tcg \
49d448
--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 \
49d448
+-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,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 \
49d448
 -m 214 \
49d448
 -overcommit mem-lock=off \
49d448
 -smp 6,sockets=6,cores=1,threads=1 \
49d448
diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.args b/tests/qemuxml2argvdata/cpu-host-model-fallback.args
49d448
index e90b781da4..763e630120 100644
49d448
--- a/tests/qemuxml2argvdata/cpu-host-model-fallback.args
49d448
+++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.args
49d448
@@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \
49d448
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
49d448
 -machine pc,usb=off,dump-guest-core=off \
49d448
 -accel tcg \
49d448
--cpu Penryn,vme=on,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,monitor=on,ds-cpl=on,vmx=on,est=on,tm2=on,xtpr=on,sse4.1=off,cx16=on,lahf-lm=on \
49d448
+-cpu Conroe,vme=on,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,monitor=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on \
49d448
 -m 214 \
49d448
 -realtime mlock=off \
49d448
 -smp 6,sockets=6,cores=1,threads=1 \
49d448
-- 
49d448
2.35.1
49d448