From 528e70a29af2cba1ea80e5ffc16a15db54ebcb8b Mon Sep 17 00:00:00 2001
From: Jiri Denemark <jdenemar@redhat.com>
Date: Mon, 29 Jun 2015 13:19:21 +0200
Subject: [PATCH] qemuxml2argv: Remove Haswell CPU from unrelated tests

Proper Haswell CPU model handling is tested in several
qemuxml2argv-cpu-* which are run in a special environment. Let's remove
the CPU model from other tests to make them less fragile.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 .../qemuxml2argv-hugepages-numa.args          |  1 -
 .../qemuxml2argv-hugepages-numa.xml           |  3 +--
 .../qemuxml2argv-interface-server.xml         | 25 +------------------
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args
index b69794235f..37511b109b 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args
@@ -2,7 +2,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \
 /usr/bin/qemu-system-x86_64 \
 -S \
 -M pc-i440fx-2.3 \
--cpu Haswell \
 -m size=1048576k,slots=16,maxmem=1099511627776k \
 -smp 2 \
 -object memory-backend-file,id=ram-node0,prealloc=yes,\
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.xml b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.xml
index 8c1f19ce3a..8cda5c6e65 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.xml
@@ -17,8 +17,7 @@
     <apic/>
     <pae/>
   </features>
-  <cpu mode='custom' match='exact'>
-    <model fallback='allow'>Haswell</model>
+  <cpu>
     <numa>
       <cell id='0' cpus='0-1' memory='1048576' unit='KiB'/>
     </numa>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-interface-server.xml b/tests/qemuxml2argvdata/qemuxml2argv-interface-server.xml
index 9edf773766..a92aff4218 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-interface-server.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-interface-server.xml
@@ -19,30 +19,7 @@
     <apic/>
     <pae/>
   </features>
-  <cpu mode='custom' match='exact'>
-    <model fallback='allow'>Haswell</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='tm2'/>
-    <feature policy='require' name='est'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='osxsave'/>
-    <feature policy='require' name='smx'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='ds'/>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='dtes64'/>
-    <feature policy='require' name='abm'/>
-    <feature policy='require' name='ht'/>
-    <feature policy='require' name='acpi'/>
-    <feature policy='require' name='pbe'/>
-    <feature policy='require' name='tm'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ds_cpl'/>
-    <feature policy='require' name='rdrand'/>
-    <feature policy='require' name='f16c'/>
-    <feature policy='require' name='xtpr'/>
-    <feature policy='require' name='monitor'/>
+  <cpu>
     <numa>
       <cell id='0' cpus='0' memory='1048576' unit='KiB'/>
       <cell id='1' cpus='1' memory='1048576' unit='KiB'/>