Do not format <arch> in guest CPU XML

This element is only allowed for host CPUs.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index 1bcceeda4268b3f7ac7f81f2b68088f42c432e0e..2724fa30a979927cef304793615bb0b91b630d3f 100644 (file)
--- 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 dacf1d0ebcf66e4cd50a6c3a8bfab332c10ff3c6..98a95e1c41bfa913066f137d44532cd32c9bdec0 100644 (file)
--- 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 c021fcddf037ca5db0d63bebe26bf1ec58eef1ed..fa61b7b60bdff27a4daebc7f29dbe9861251c7e1 100644 (file)
--- 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 5e9efc7c0b56ecd7951537119ac29553a7128091..caa0bfd53bbe16b091fc8d1f375da818d29e295e 100644 (file)
--- 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 be11b887dac2447dbdb78d83d92a53f869b05fc3..e8f5c938813f79559925bc6a06b6d94b666242fd 100644 (file)
--- 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 4c249eb0c970e95133f117482ec861ccb701249a..22b5cf31fd50d3f1ea4f867b59fd7bbba74601ae 100644 (file)
--- 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 2e2430e781d1e6f505a4a594cc12f1263b081889..c9ae6519222751ceca26fa27892d3f4cab4d7f0e 100644 (file)
--- 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 4c249eb0c970e95133f117482ec861ccb701249a..22b5cf31fd50d3f1ea4f867b59fd7bbba74601ae 100644 (file)
--- 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 2e2430e781d1e6f505a4a594cc12f1263b081889..c9ae6519222751ceca26fa27892d3f4cab4d7f0e 100644 (file)
--- 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 70d13282b3b6472bb3b69ed32be42133ac69794c..0ccbcd0629ec8258ad5cd19e9581b7e9a50b8cea 100644 (file)
--- 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 8d3a0b6181c5e3cbef3983ba585cfcfcaa851514..489de49fb0aa75bdbe7d6256d31ac67c5dc536fc 100644 (file)
--- 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 0ab5a7a7b1978df58a51f260bdd388962b126355..c3561d597162535ace5f900056a848b711f42dac 100644 (file)
--- 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 e768aa674fca8fa248afad588777656e812122f8..61a52212a62a7535a188897ba5d637f161de1482 100644 (file)
--- 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 4c249eb0c970e95133f117482ec861ccb701249a..22b5cf31fd50d3f1ea4f867b59fd7bbba74601ae 100644 (file)
--- 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 4e721aba4959a7f5a07b3a08099aec6f86f0819e..25c87e164ef1b4e40e0f5753dfde9fe66f724cdd 100644 (file)
--- 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 776001ff4aeff1ab1b61d304b17771f2cdf486ab..fa1a43a8a48a01d41285c9310e1b731d7d60caa7 100644 (file)
--- 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 90957e99d24664a0ac65813bac0364bd025147be..d52f49d30ab4ca57745e687bf69a8cfcae417899 100644 (file)
--- 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 03c22de4b943d9702e7455909fcf3397bc04f184..60086b8b14b3465752aff213a1dc1f27aa6357ec 100644 (file)
--- 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 776001ff4aeff1ab1b61d304b17771f2cdf486ab..fa1a43a8a48a01d41285c9310e1b731d7d60caa7 100644 (file)
--- 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 c1544afd37a1e00ef094788fa716c17946b8b892..1dc866dba11c022cdd970b0e22ff0c293b07e72b 100644 (file)
--- 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 b2aac64b287cd4b22654b54c87d4af69b21a3c30..42e7c90112dca162495ea4822b4f4a38cbb096d7 100644 (file)
--- 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 8e4e9d96a4b46b7b41548bcfe1a97eadf25bc570..3ca3b0f2436ffdcc0d46d7c8013ba3e8b50b1cad 100644 (file)
--- 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 cd7b4bb8e2fdd45e8543dfc9f39b8311f96fe9d6..877895cf15dca2ac82d283193485508e3400ba15 100644 (file)
--- 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 be11fa06162ebdcae5fd71323f0ca2ff9b10e369..a736cdfb04f22ca85ab04b90fcfc40972b1165b8 100644 (file)
--- 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 dfcbe24dad3fd1dbbcfc3fc1783351bd90cd048d..2392de6ce4bb65dd55c72a8e098105c1c8e9294d 100644 (file)
--- 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 8950119a11baa72cd91cda9d77096f3d552d7d0b..e4117c293f292a0063c072fb01115b1207f45716 100644 (file)
--- 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 37feefa9c257c0aa6759684a64b84b64bc022fd1..aa151bc545d1112ba0b8b4afd5166e8666a8039e 100644 (file)
--- 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 9858ee4e2509459bd0618f18558e366efae1ddba..6bd032bbcb2ae673017e4a648fe2fccd61a0987c 100644 (file)
--- 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 828a14271196305be1b236d8ee12aa9cd9e93b72..652f1e433397f11e2778cf24ecf06cc37262a686 100644 (file)
--- 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 828a14271196305be1b236d8ee12aa9cd9e93b72..652f1e433397f11e2778cf24ecf06cc37262a686 100644 (file)
--- 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 302d6562c8c1659f15bc5b41b09de01146509307..741757aeb2e4e3b9c974c2355c6a9d7422755373 100644 (file)
--- 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 9858ee4e2509459bd0618f18558e366efae1ddba..6bd032bbcb2ae673017e4a648fe2fccd61a0987c 100644 (file)
--- 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 cc89186611fcd78debec07dbb957015583770cf7..2ad3c98a5add6118e8df6e9cdfff8f33b4f80f8a 100644 (file)
--- 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 9858ee4e2509459bd0618f18558e366efae1ddba..6bd032bbcb2ae673017e4a648fe2fccd61a0987c 100644 (file)
--- 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 f893f9f23249a78961c423a09add4dc258b09044..db5e0ae6af161e6c89e64ec99104d77b646acd3c 100644 (file)
--- 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 60ba9c1ebd25cb70dcf28f9f6d4e456df7c164c7..d7a06108bca48c621192d64ff0f6c92e022f0120 100644 (file)
--- 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 d4605263b858119ae0dd74926f1d368e7b369a94..7ce56ac8e78855b58bb450d06e848e7c586ecebf 100644 (file)
--- 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 28d112b341e977dcd74e85e521736c9a63c83158..d1b442d33f62ca65ff29f2be3df597baf0b8c783 100644 (file)
--- 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 0ab5a7a7b1978df58a51f260bdd388962b126355..c3561d597162535ace5f900056a848b711f42dac 100644 (file)
--- 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 e0e060691d971655ed82867842da9be758259929..7af75509e675fa9f0704a8cd3f53186ea557e3b3 100644 (file)
--- 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 b02d963c156b4c1381971345dddcdd22b2f8f7a9..980af0789065f60ee462f73f6c065c60e26d0d91 100644 (file)
--- 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 ec5f56205c609c7e3c1d155410908515f3dde71c..78b8be1118281aada0ff31fe88651d6303c1d1ce 100644 (file)
--- 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 b02d963c156b4c1381971345dddcdd22b2f8f7a9..980af0789065f60ee462f73f6c065c60e26d0d91 100644 (file)
--- 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 6e4aff07ad096ebd78212d0a1a0ad4f9711bb94a..2227ed0031418c6e64e318fd1a22dd311f21e8b8 100644 (file)
--- 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 81bf8c8c275635bdef5510f621c1c4259a993f82..dbf8580a0e22df64843b23145f0f38fbd313006d 100644 (file)
--- 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 cb69ff56f34a97147ccbf22a366b8b43b867401a..d94a330f37284f56692b86806ef6c9d1a43f905e 100644 (file)
--- 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 c62e36a3a877a74abb9bd9b69fb7cdddad857a13..16d333aa266de0ab17afc3c4a5ae9c95f8438267 100644 (file)
--- 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 4037fa60cfd03f0a902259509cdbb661eebc827d..9c975c679229575067528bdba2c37596e8eaf181 100644 (file)
--- 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 348bef8293c8be329f69a466ccc90e5d6aec7fd2..038c98e1d11240eb3a69214d3205c70d85c2f48c 100644 (file)
--- 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 9e21934b4d457f6d83dcd2aeb93d18e7574213da..a97efc5657f83fe2eb30171c4a3945cabf618be1 100644 (file)
--- 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'/>