Do not format <arch> in guest CPU XML

This element is only allowed for host CPUs.

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

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)

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>