qemuxml2xmltest: Modernize all 'audio-' cases

Use DO_TEST_CAPS_LATEST to run with the latest capapbilities.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/tests/qemuxml2xmloutdata/audio-alsa-best.xml b/tests/qemuxml2xmloutdata/audio-alsa-best.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-alsa-best.xml
rename to tests/qemuxml2xmloutdata/audio-alsa-best.x86_64-latest.xml
index 29283ab7d2b83d08b6a66d97e21be85581aff815..36e4b27257a3edeef973a762d15fb05437493027 100644 (file)
--- a/tests/qemuxml2xmloutdata/audio-alsa-best.xml
+++ b/tests/qemuxml2xmloutdata/audio-alsa-best.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>

diff --git a/tests/qemuxml2xmloutdata/audio-alsa-full.xml b/tests/qemuxml2xmloutdata/audio-alsa-full.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-alsa-full.xml
rename to tests/qemuxml2xmloutdata/audio-alsa-full.x86_64-latest.xml
index 4205ecde8936b4546ef4863b62e0c1dcfeb8a61a..49a659de62ad807b90731b84c48780f5fc0ebf7d 100644 (file)
--- a/tests/qemuxml2xmloutdata/audio-alsa-full.xml
+++ b/tests/qemuxml2xmloutdata/audio-alsa-full.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>

diff --git a/tests/qemuxml2xmloutdata/audio-alsa-minimal.xml b/tests/qemuxml2xmloutdata/audio-alsa-minimal.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/audio-alsa-minimal.xml
rename to tests/qemuxml2xmloutdata/audio-alsa-minimal.x86_64-latest.xml
index 57ff9d2bf046c8aefec1a5de4c7dd4a74d931542..e48452b186c38535b122142f2562b6c7935baf07 100644 (file)
--- a/tests/qemuxml2xmloutdata/audio-alsa-minimal.xml
+++ b/tests/qemuxml2xmloutdata/audio-alsa-minimal.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>

diff --git a/tests/qemuxml2xmloutdata/audio-coreaudio-best.xml b/tests/qemuxml2xmloutdata/audio-coreaudio-best.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-coreaudio-best.xml
rename to tests/qemuxml2xmloutdata/audio-coreaudio-best.x86_64-latest.xml
index d171cc752f5a36945a2d66697ba3c88cd5fd8da4..4fc32f5e736e703a6b91555e82a20b57e1ad58e4 100644 (file)
--- a/tests/qemuxml2xmloutdata/audio-coreaudio-best.xml
+++ b/tests/qemuxml2xmloutdata/audio-coreaudio-best.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>

diff --git a/tests/qemuxml2xmloutdata/audio-coreaudio-full.xml b/tests/qemuxml2xmloutdata/audio-coreaudio-full.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-coreaudio-full.xml
rename to tests/qemuxml2xmloutdata/audio-coreaudio-full.x86_64-latest.xml
index b6427a6e9ff240ef23c74d67931cabe448668742..b874bbb48e47e4b2a941da7260c2bda80ef0dd78 100644 (file)
--- a/tests/qemuxml2xmloutdata/audio-coreaudio-full.xml
+++ b/tests/qemuxml2xmloutdata/audio-coreaudio-full.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>

diff --git a/tests/qemuxml2xmloutdata/audio-coreaudio-minimal.xml b/tests/qemuxml2xmloutdata/audio-coreaudio-minimal.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/audio-coreaudio-minimal.xml
rename to tests/qemuxml2xmloutdata/audio-coreaudio-minimal.x86_64-latest.xml
index dac55ecbce8cd457302635e1a40c95dd83641b3b..f9209782b5c4bb360b72ae7dcf819d7683ad11f5 100644 (file)
--- a/tests/qemuxml2xmloutdata/audio-coreaudio-minimal.xml
+++ b/tests/qemuxml2xmloutdata/audio-coreaudio-minimal.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>

diff --git a/tests/qemuxml2xmloutdata/audio-file-best.xml b/tests/qemuxml2xmloutdata/audio-file-best.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-file-best.xml
rename to tests/qemuxml2xmloutdata/audio-file-best.x86_64-latest.xml
index 9946ad9e3d253781bfd2f9a60eb721257303c154..c86beb619b601e028ee9975cd6725a19155a0af7 100644 (file)
--- a/tests/qemuxml2xmloutdata/audio-file-best.xml
+++ b/tests/qemuxml2xmloutdata/audio-file-best.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>

diff --git a/tests/qemuxml2xmloutdata/audio-file-full.xml b/tests/qemuxml2xmloutdata/audio-file-full.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-file-full.xml
rename to tests/qemuxml2xmloutdata/audio-file-full.x86_64-latest.xml
index 1e4c50f44a88eac4a97f66638a72fd6e27d015aa..5479958a93a914fd55cb8fe648ff33b8797d9b3c 100644 (file)
--- a/tests/qemuxml2xmloutdata/audio-file-full.xml
+++ b/tests/qemuxml2xmloutdata/audio-file-full.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>

diff --git a/tests/qemuxml2xmloutdata/audio-file-minimal.xml b/tests/qemuxml2xmloutdata/audio-file-minimal.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/audio-file-minimal.xml
rename to tests/qemuxml2xmloutdata/audio-file-minimal.x86_64-latest.xml
index 65f2c56a903b284c8953c81d676a3adcedb554fd..6b6269886db2e2e5c1653853c6a94a5bf9fceca7 100644 (file)
--- a/tests/qemuxml2xmloutdata/audio-file-minimal.xml
+++ b/tests/qemuxml2xmloutdata/audio-file-minimal.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>

diff --git a/tests/qemuxml2xmloutdata/audio-jack-full.xml b/tests/qemuxml2xmloutdata/audio-jack-full.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/audio-jack-full.xml
rename to tests/qemuxml2xmloutdata/audio-jack-full.x86_64-latest.xml
index 0583a305b137874b565a3b0ee08e973fc767c74b..35308678e328f95533a156de0af499e1318abc9e 100644 (file)
--- a/tests/qemuxml2xmloutdata/audio-jack-full.xml
+++ b/tests/qemuxml2xmloutdata/audio-jack-full.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>

diff --git a/tests/qemuxml2xmloutdata/audio-none-best.xml b/tests/qemuxml2xmloutdata/audio-none-best.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-none-best.xml
rename to tests/qemuxml2xmloutdata/audio-none-best.x86_64-latest.xml
index 98c3b17a84a7626850c2fc5b89f070627c79080e..77373cfb2b5a1b7e9c3d1b067eb8c715d35d218c 100644 (file)
--- a/tests/qemuxml2xmloutdata/audio-none-best.xml
+++ b/tests/qemuxml2xmloutdata/audio-none-best.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>

diff --git a/tests/qemuxml2xmloutdata/audio-none-full.xml b/tests/qemuxml2xmloutdata/audio-none-full.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-none-full.xml
rename to tests/qemuxml2xmloutdata/audio-none-full.x86_64-latest.xml
index 85437c67f2f083b19b3a9a6d33143f47d3e57fb0..d1383142a0599dcb3f5724a3177924ca0419e5f9 100644 (file)
--- a/tests/qemuxml2xmloutdata/audio-none-full.xml
+++ b/tests/qemuxml2xmloutdata/audio-none-full.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>

diff --git a/tests/qemuxml2xmloutdata/audio-none-minimal.xml b/tests/qemuxml2xmloutdata/audio-none-minimal.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/audio-none-minimal.xml
rename to tests/qemuxml2xmloutdata/audio-none-minimal.x86_64-latest.xml
index 4666777e56c8a750c7962dcfc60b172b16dd9852..8589f05399a76fb73177177cde28eb8b1d66e480 100644 (file)
--- a/tests/qemuxml2xmloutdata/audio-none-minimal.xml
+++ b/tests/qemuxml2xmloutdata/audio-none-minimal.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>

diff --git a/tests/qemuxml2xmloutdata/audio-oss-best.xml b/tests/qemuxml2xmloutdata/audio-oss-best.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/audio-oss-best.xml
rename to tests/qemuxml2xmloutdata/audio-oss-best.x86_64-latest.xml
index cf0eac2fdf556a4ac565d8ab1b1fe1ba533aaee1..b0e068c832d797b4c228d60409b7296062de6dbb 100644 (file)
--- a/tests/qemuxml2xmloutdata/audio-oss-best.xml
+++ b/tests/qemuxml2xmloutdata/audio-oss-best.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>

diff --git a/tests/qemuxml2xmloutdata/audio-oss-full.xml b/tests/qemuxml2xmloutdata/audio-oss-full.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/audio-oss-full.xml
rename to tests/qemuxml2xmloutdata/audio-oss-full.x86_64-latest.xml
index b9acccff366e12c3a7c1957afc96cd69e87e4195..c90e710681eb60d5eb171c71cf53fc3c16103459 100644 (file)
--- a/tests/qemuxml2xmloutdata/audio-oss-full.xml
+++ b/tests/qemuxml2xmloutdata/audio-oss-full.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>

diff --git a/tests/qemuxml2xmloutdata/audio-oss-minimal.xml b/tests/qemuxml2xmloutdata/audio-oss-minimal.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/audio-oss-minimal.xml
rename to tests/qemuxml2xmloutdata/audio-oss-minimal.x86_64-latest.xml
index 47da331bab88193deb26f5be9c53b70155681a63..ce0d2cb8e77b6c3f52e668bca1cd4b4da457022b 100644 (file)
--- a/tests/qemuxml2xmloutdata/audio-oss-minimal.xml
+++ b/tests/qemuxml2xmloutdata/audio-oss-minimal.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>

diff --git a/tests/qemuxml2xmloutdata/audio-pulseaudio-best.xml b/tests/qemuxml2xmloutdata/audio-pulseaudio-best.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/audio-pulseaudio-best.xml
rename to tests/qemuxml2xmloutdata/audio-pulseaudio-best.x86_64-latest.xml
index 1a4609e9ed09d52bc61ac0777f0f440fdecca52b..76adca94820926ff2cfbfc968981d054f47ba748 100644 (file)
--- a/tests/qemuxml2xmloutdata/audio-pulseaudio-best.xml
+++ b/tests/qemuxml2xmloutdata/audio-pulseaudio-best.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>

diff --git a/tests/qemuxml2xmloutdata/audio-pulseaudio-full.xml b/tests/qemuxml2xmloutdata/audio-pulseaudio-full.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/audio-pulseaudio-full.xml
rename to tests/qemuxml2xmloutdata/audio-pulseaudio-full.x86_64-latest.xml
index e15098e1e894f5e0931012afed8cd97638fb2f53..87258c3d69fb448d72cbb3c96506f64045a6f8ec 100644 (file)
--- a/tests/qemuxml2xmloutdata/audio-pulseaudio-full.xml
+++ b/tests/qemuxml2xmloutdata/audio-pulseaudio-full.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>

diff --git a/tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.xml b/tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.xml
rename to tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.x86_64-latest.xml
index 6a947c02392702c45d59f50201078586373c319c..c53d0dc1f474cd0f5a34473dd862a86af79b5aa4 100644 (file)
--- a/tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.xml
+++ b/tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>

diff --git a/tests/qemuxml2xmloutdata/audio-sdl-best.xml b/tests/qemuxml2xmloutdata/audio-sdl-best.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-sdl-best.xml
rename to tests/qemuxml2xmloutdata/audio-sdl-best.x86_64-latest.xml
index 84f810c61addf4b5376b68689a5902498da3e58d..79a8538c86b8230187596fccec4270aad6435446 100644 (file)
--- a/tests/qemuxml2xmloutdata/audio-sdl-best.xml
+++ b/tests/qemuxml2xmloutdata/audio-sdl-best.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>

diff --git a/tests/qemuxml2xmloutdata/audio-sdl-full.xml b/tests/qemuxml2xmloutdata/audio-sdl-full.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-sdl-full.xml
rename to tests/qemuxml2xmloutdata/audio-sdl-full.x86_64-latest.xml
index c96182e9fb4b7999f8e4660826814f26c51d1cdb..13c6d7d1e2479a36904610227d17a5294b11c6b1 100644 (file)
--- a/tests/qemuxml2xmloutdata/audio-sdl-full.xml
+++ b/tests/qemuxml2xmloutdata/audio-sdl-full.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>

diff --git a/tests/qemuxml2xmloutdata/audio-sdl-minimal.xml b/tests/qemuxml2xmloutdata/audio-sdl-minimal.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/audio-sdl-minimal.xml
rename to tests/qemuxml2xmloutdata/audio-sdl-minimal.x86_64-latest.xml
index 23793b615594ad6c1f31b91195bd747fe0d8a4e8..5bf3196a35697c36fd0f4a9d74b407f8b872b6cd 100644 (file)
--- a/tests/qemuxml2xmloutdata/audio-sdl-minimal.xml
+++ b/tests/qemuxml2xmloutdata/audio-sdl-minimal.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>

diff --git a/tests/qemuxml2xmloutdata/audio-spice-best.xml b/tests/qemuxml2xmloutdata/audio-spice-best.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/audio-spice-best.xml
rename to tests/qemuxml2xmloutdata/audio-spice-best.x86_64-latest.xml
index 80594ebca65c08e13e538ee0110e28a83f06ddd4..9017277a70b1b91efe8ed79de143a5576e94b2e1 100644 (file)
--- a/tests/qemuxml2xmloutdata/audio-spice-best.xml
+++ b/tests/qemuxml2xmloutdata/audio-spice-best.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>

diff --git a/tests/qemuxml2xmloutdata/audio-spice-full.xml b/tests/qemuxml2xmloutdata/audio-spice-full.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/audio-spice-full.xml
rename to tests/qemuxml2xmloutdata/audio-spice-full.x86_64-latest.xml
index c9f00f8c8c32015b41d0888655ba6eeb47ffbcab..6db1f6889d571660ba015a362b33111ee46dba33 100644 (file)
--- a/tests/qemuxml2xmloutdata/audio-spice-full.xml
+++ b/tests/qemuxml2xmloutdata/audio-spice-full.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>

diff --git a/tests/qemuxml2xmloutdata/audio-spice-minimal.xml b/tests/qemuxml2xmloutdata/audio-spice-minimal.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-spice-minimal.xml
rename to tests/qemuxml2xmloutdata/audio-spice-minimal.x86_64-latest.xml
index d5fd97b9ac4b64493e81462cd2c42d185cd5bb19..e9cba5a772ef5a040100bdd32d45a0089322232f 100644 (file)
--- a/tests/qemuxml2xmloutdata/audio-spice-minimal.xml
+++ b/tests/qemuxml2xmloutdata/audio-spice-minimal.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>

diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 93202e8e18d34edbe4aac55bb4c69cfee25922d1..0f9d6427307cdb86fbce77ec6181abdb9f4c524b 100644 (file)
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1170,41 +1170,35 @@ mymain(void)
     DO_TEST_NOCAPS("downscript");
 
     /* Simplest possible <audio>, all supported with ENV */
-    DO_TEST_NOCAPS("audio-none-minimal");
-    DO_TEST_NOCAPS("audio-alsa-minimal");
-    DO_TEST_NOCAPS("audio-coreaudio-minimal");
-    DO_TEST_NOCAPS("audio-oss-minimal");
-    DO_TEST_NOCAPS("audio-pulseaudio-minimal");
-    DO_TEST_NOCAPS("audio-sdl-minimal");
-    DO_TEST("audio-spice-minimal",
-            QEMU_CAPS_SPICE,
-            QEMU_CAPS_DEVICE_CIRRUS_VGA);
-    DO_TEST_NOCAPS("audio-file-minimal");
+    DO_TEST_CAPS_LATEST("audio-none-minimal");
+    DO_TEST_CAPS_LATEST("audio-alsa-minimal");
+    DO_TEST_CAPS_LATEST("audio-coreaudio-minimal");
+    DO_TEST_CAPS_LATEST("audio-oss-minimal");
+    DO_TEST_CAPS_LATEST("audio-pulseaudio-minimal");
+    DO_TEST_CAPS_LATEST("audio-sdl-minimal");
+    DO_TEST_CAPS_LATEST("audio-spice-minimal");
+    DO_TEST_CAPS_LATEST("audio-file-minimal");
 
     /* Best <audio> still compat with old ENV */
-    DO_TEST_NOCAPS("audio-none-best");
-    DO_TEST_NOCAPS("audio-alsa-best");
-    DO_TEST_NOCAPS("audio-coreaudio-best");
-    DO_TEST_NOCAPS("audio-oss-best");
-    DO_TEST_NOCAPS("audio-pulseaudio-best");
-    DO_TEST_NOCAPS("audio-sdl-best");
-    DO_TEST("audio-spice-best",
-            QEMU_CAPS_SPICE,
-            QEMU_CAPS_DEVICE_CIRRUS_VGA);
-    DO_TEST_NOCAPS("audio-file-best");
+    DO_TEST_CAPS_LATEST("audio-none-best");
+    DO_TEST_CAPS_LATEST("audio-alsa-best");
+    DO_TEST_CAPS_LATEST("audio-coreaudio-best");
+    DO_TEST_CAPS_LATEST("audio-oss-best");
+    DO_TEST_CAPS_LATEST("audio-pulseaudio-best");
+    DO_TEST_CAPS_LATEST("audio-sdl-best");
+    DO_TEST_CAPS_LATEST("audio-spice-best");
+    DO_TEST_CAPS_LATEST("audio-file-best");
 
     /* Full <audio> only compat with new QEMU -audiodev args */
-    DO_TEST_NOCAPS("audio-none-full");
-    DO_TEST_NOCAPS("audio-alsa-full");
-    DO_TEST_NOCAPS("audio-coreaudio-full");
-    DO_TEST_NOCAPS("audio-jack-full");
-    DO_TEST_NOCAPS("audio-oss-full");
-    DO_TEST_NOCAPS("audio-pulseaudio-full");
-    DO_TEST_NOCAPS("audio-sdl-full");
-    DO_TEST("audio-spice-full",
-            QEMU_CAPS_SPICE,
-            QEMU_CAPS_DEVICE_CIRRUS_VGA);
-    DO_TEST_NOCAPS("audio-file-full");
+    DO_TEST_CAPS_LATEST("audio-none-full");
+    DO_TEST_CAPS_LATEST("audio-alsa-full");
+    DO_TEST_CAPS_LATEST("audio-coreaudio-full");
+    DO_TEST_CAPS_LATEST("audio-jack-full");
+    DO_TEST_CAPS_LATEST("audio-oss-full");
+    DO_TEST_CAPS_LATEST("audio-pulseaudio-full");
+    DO_TEST_CAPS_LATEST("audio-sdl-full");
+    DO_TEST_CAPS_LATEST("audio-spice-full");
+    DO_TEST_CAPS_LATEST("audio-file-full");
 
     DO_TEST_CAPS_LATEST("audio-many-backends");