This element is only allowed for host CPUs.
Signed-off-by: Jiri Denemark <jdene...@redhat.com>
---
src/conf/cpu_conf.c | 2 +-
tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml | 1 -
tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-Core-i5-2500-json.xml | 1 -
tests/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml | 1 -
tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-Core-i5-4670T-json.xml | 1 -
tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-Core-i5-6600-json.xml | 1 -
tests/cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml | 1 -
tests/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml | 1 -
tests/cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-Core-i7-3770-json.xml | 1 -
tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-Core-i7-4600U-json.xml | 1 -
tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml | 1 -
tests/cputestdata/x86_64-cpuid-Core2-E6850-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-Core2-E6850-json.xml | 1 -
tests/cputestdata/x86_64-cpuid-Core2-Q9500-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml | 1 -
tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml | 1 -
tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml | 1 -
tests/cputestdata/x86_64-cpuid-Xeon-5110-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-json.xml | 1 -
tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-json.xml | 1 -
tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml | 1 -
tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml | 1 -
tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml | 1 -
tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml | 1 -
tests/cputestdata/x86_64-cpuid-Xeon-X5460-guest.xml | 1 -
50 files changed, 1 insertion(+), 50 deletions(-)
diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index 1bcceeda4..2724fa30a 100644
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -536,7 +536,7 @@ virCPUDefFormatBufFull(virBufferPtr buf,
/* Format children */
virBufferAdjustIndent(&childrenBuf, indent + 2);
- if (def->arch)
+ if (def->type == VIR_CPU_TYPE_HOST && def->arch)
virBufferAsprintf(&childrenBuf, "<arch>%s</arch>\n",
virArchToString(def->arch));
if (virCPUDefFormatBuf(&childrenBuf, def, updateCPU) < 0)
diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml
b/tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml
index dacf1d0eb..98a95e1c4 100644
--- a/tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Opteron_G5</model>
<vendor>AMD</vendor>
<feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml
b/tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml
index c021fcddf..fa61b7b60 100644
--- a/tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Opteron_G5</model>
<vendor>AMD</vendor>
<feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml
b/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml
index 5e9efc7c0..caa0bfd53 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>core2duo</model>
<vendor>Intel</vendor>
<feature policy='require' name='ds'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml
b/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml
index be11b887d..e8f5c9388 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>core2duo</model>
<vendor>Intel</vendor>
<feature policy='require' name='ds'/>
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 4c249eb0c..22b5cf31f 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>SandyBridge</model>
<vendor>Intel</vendor>
<feature policy='require' name='vme'/>
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 2e2430e78..c9ae65192 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-json.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>SandyBridge</model>
<vendor>Intel</vendor>
<feature policy='require' name='vme'/>
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 4c249eb0c..22b5cf31f 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>SandyBridge</model>
<vendor>Intel</vendor>
<feature policy='require' name='vme'/>
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 2e2430e78..c9ae65192 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>SandyBridge</model>
<vendor>Intel</vendor>
<feature policy='require' name='vme'/>
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 70d13282b..0ccbcd062 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Haswell-noTSX</model>
<vendor>Intel</vendor>
<feature policy='require' name='vme'/>
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 8d3a0b618..489de49fb 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-json.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Haswell-noTSX</model>
<vendor>Intel</vendor>
<feature policy='require' name='vme'/>
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 0ab5a7a7b..c3561d597 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Skylake-Client</model>
<vendor>Intel</vendor>
<feature policy='require' name='ds'/>
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 e768aa674..61a52212a 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-json.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Skylake-Client</model>
<vendor>Intel</vendor>
<feature policy='require' name='ss'/>
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 4c249eb0c..22b5cf31f 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>SandyBridge</model>
<vendor>Intel</vendor>
<feature policy='require' name='vme'/>
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 4e721aba4..25c87e164 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>SandyBridge</model>
<vendor>Intel</vendor>
<feature policy='require' name='vme'/>
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 776001ff4..fa1a43a8a 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>IvyBridge</model>
<vendor>Intel</vendor>
<feature policy='require' name='ds'/>
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 90957e99d..d52f49d30 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>IvyBridge</model>
<vendor>Intel</vendor>
<feature policy='require' name='ds'/>
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 03c22de4b..60086b8b1 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>IvyBridge</model>
<vendor>Intel</vendor>
<feature policy='require' name='ss'/>
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 776001ff4..fa1a43a8a 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>IvyBridge</model>
<vendor>Intel</vendor>
<feature policy='require' name='ds'/>
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 c1544afd3..1dc866dba 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-json.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>IvyBridge</model>
<vendor>Intel</vendor>
<feature policy='require' name='ss'/>
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 b2aac64b2..42e7c9011 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Haswell-noTSX</model>
<vendor>Intel</vendor>
<feature policy='require' name='vme'/>
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 8e4e9d96a..3ca3b0f24 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-json.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Haswell-noTSX</model>
<vendor>Intel</vendor>
<feature policy='require' name='vme'/>
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 cd7b4bb8e..877895cf1 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Broadwell</model>
<vendor>Intel</vendor>
<feature policy='require' name='vme'/>
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 be11fa061..a736cdfb0 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Broadwell</model>
<vendor>Intel</vendor>
<feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core2-E6850-guest.xml
index dfcbe24da..2392de6ce 100644
--- a/tests/cputestdata/x86_64-cpuid-Core2-E6850-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core2-E6850-guest.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Conroe</model>
<vendor>Intel</vendor>
<feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850-json.xml
b/tests/cputestdata/x86_64-cpuid-Core2-E6850-json.xml
index 8950119a1..e4117c293 100644
--- a/tests/cputestdata/x86_64-cpuid-Core2-E6850-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core2-E6850-json.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Conroe</model>
<vendor>Intel</vendor>
<feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-guest.xml
b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-guest.xml
index 37feefa9c..aa151bc54 100644
--- a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-guest.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Penryn</model>
<vendor>Intel</vendor>
<feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml
b/tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml
index 9858ee4e2..6bd032bbc 100644
--- a/tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Opteron_G4</model>
<vendor>AMD</vendor>
<feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml
b/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml
index 828a14271..652f1e433 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Opteron_G3</model>
<vendor>AMD</vendor>
<feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml
b/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml
index 828a14271..652f1e433 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Opteron_G3</model>
<vendor>AMD</vendor>
<feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml
b/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml
index 302d6562c..741757aeb 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Opteron_G3</model>
<vendor>AMD</vendor>
<feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml
b/tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml
index 9858ee4e2..6bd032bbc 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Opteron_G4</model>
<vendor>AMD</vendor>
<feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml
b/tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml
index cc8918661..2ad3c98a5 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Opteron_G4</model>
<vendor>AMD</vendor>
<feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml
b/tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml
index 9858ee4e2..6bd032bbc 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Opteron_G4</model>
<vendor>AMD</vendor>
<feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
index f893f9f23..db5e0ae6a 100644
--- a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>core2duo</model>
<vendor>Intel</vendor>
<feature policy='require' name='ds'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml
b/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml
index 60ba9c1eb..d7a06108b 100644
--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Opteron_G3</model>
<vendor>AMD</vendor>
<feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml
b/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml
index d4605263b..7ce56ac8e 100644
--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Opteron_G3</model>
<vendor>AMD</vendor>
<feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-5110-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-5110-guest.xml
index 28d112b34..d1b442d33 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-5110-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-5110-guest.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Conroe</model>
<vendor>Intel</vendor>
<feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-guest.xml
index 0ab5a7a7b..c3561d597 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-guest.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Skylake-Client</model>
<vendor>Intel</vendor>
<feature policy='require' name='ds'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-json.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-json.xml
index e0e060691..7af75509e 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-json.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Skylake-Client</model>
<vendor>Intel</vendor>
<feature policy='require' name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-guest.xml
index b02d963c1..980af0789 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-guest.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Haswell-noTSX</model>
<vendor>Intel</vendor>
<feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-json.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-json.xml
index ec5f56205..78b8be111 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-json.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Haswell-noTSX</model>
<vendor>Intel</vendor>
<feature policy='require' name='vme'/>
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 b02d963c1..980af0789 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Haswell-noTSX</model>
<vendor>Intel</vendor>
<feature policy='require' name='vme'/>
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 6e4aff07a..2227ed003 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Haswell-noTSX</model>
<vendor>Intel</vendor>
<feature policy='require' name='vme'/>
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 81bf8c8c2..dbf8580a0 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>SandyBridge</model>
<vendor>Intel</vendor>
<feature policy='require' name='vme'/>
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 cb69ff56f..d94a330f3 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>SandyBridge</model>
<vendor>Intel</vendor>
<feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-guest.xml
index c62e36a3a..16d333aa2 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-guest.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Haswell</model>
<vendor>Intel</vendor>
<feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml
index 4037fa60c..9c975c679 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Nehalem</model>
<vendor>Intel</vendor>
<feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml
index 348bef829..038c98e1d 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Nehalem</model>
<vendor>Intel</vendor>
<feature policy='require' name='vme'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-guest.xml
b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-guest.xml
index 9e21934b4..a97efc565 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-guest.xml
@@ -1,5 +1,4 @@
<cpu mode='custom' match='exact'>
- <arch>x86_64</arch>
<model fallback='forbid'>Penryn</model>
<vendor>Intel</vendor>
<feature policy='require' name='vme'/>
--
2.12.0
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
