[PATCH 3/3] qemuxml2xmltest: Modernize all 'audio-' cases

Use DO_TEST_CAPS_LATEST to run with the latest capapbilities. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- ....xml => audio-alsa-best.x86_64-latest.xml} | 5 +- ....xml => audio-alsa-full.x86_64-latest.xml} | 5 +- ...l => audio-alsa-minimal.x86_64-latest.xml} | 5 +- ...=> audio-coreaudio-best.x86_64-latest.xml} | 5 +- ...=> audio-coreaudio-full.x86_64-latest.xml} | 5 +- ...audio-coreaudio-minimal.x86_64-latest.xml} | 5 +- ....xml => audio-file-best.x86_64-latest.xml} | 5 +- ....xml => audio-file-full.x86_64-latest.xml} | 5 +- ...l => audio-file-minimal.x86_64-latest.xml} | 5 +- ....xml => audio-jack-full.x86_64-latest.xml} | 5 +- ....xml => audio-none-best.x86_64-latest.xml} | 5 +- ....xml => audio-none-full.x86_64-latest.xml} | 5 +- ...l => audio-none-minimal.x86_64-latest.xml} | 5 +- ...t.xml => audio-oss-best.x86_64-latest.xml} | 5 +- ...l.xml => audio-oss-full.x86_64-latest.xml} | 5 +- ...ml => audio-oss-minimal.x86_64-latest.xml} | 5 +- ...> audio-pulseaudio-best.x86_64-latest.xml} | 5 +- ...> audio-pulseaudio-full.x86_64-latest.xml} | 5 +- ...udio-pulseaudio-minimal.x86_64-latest.xml} | 5 +- ...t.xml => audio-sdl-best.x86_64-latest.xml} | 5 +- ...l.xml => audio-sdl-full.x86_64-latest.xml} | 5 +- ...ml => audio-sdl-minimal.x86_64-latest.xml} | 5 +- ...xml => audio-spice-best.x86_64-latest.xml} | 5 +- ...xml => audio-spice-full.x86_64-latest.xml} | 5 +- ... => audio-spice-minimal.x86_64-latest.xml} | 5 +- tests/qemuxml2xmltest.c | 56 +++++++++---------- 26 files changed, 125 insertions(+), 56 deletions(-) rename tests/qemuxml2xmloutdata/{audio-alsa-best.xml => audio-alsa-best.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{audio-alsa-full.xml => audio-alsa-full.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{audio-alsa-minimal.xml => audio-alsa-minimal.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{audio-coreaudio-best.xml => audio-coreaudio-best.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{audio-coreaudio-full.xml => audio-coreaudio-full.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{audio-coreaudio-minimal.xml => audio-coreaudio-minimal.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{audio-file-best.xml => audio-file-best.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{audio-file-full.xml => audio-file-full.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{audio-file-minimal.xml => audio-file-minimal.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{audio-jack-full.xml => audio-jack-full.x86_64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{audio-none-best.xml => audio-none-best.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{audio-none-full.xml => audio-none-full.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{audio-none-minimal.xml => audio-none-minimal.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{audio-oss-best.xml => audio-oss-best.x86_64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{audio-oss-full.xml => audio-oss-full.x86_64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{audio-oss-minimal.xml => audio-oss-minimal.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{audio-pulseaudio-best.xml => audio-pulseaudio-best.x86_64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{audio-pulseaudio-full.xml => audio-pulseaudio-full.x86_64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{audio-pulseaudio-minimal.xml => audio-pulseaudio-minimal.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{audio-sdl-best.xml => audio-sdl-best.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{audio-sdl-full.xml => audio-sdl-full.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{audio-sdl-minimal.xml => audio-sdl-minimal.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{audio-spice-best.xml => audio-spice-best.x86_64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{audio-spice-full.xml => audio-spice-full.x86_64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{audio-spice-minimal.xml => audio-spice-minimal.x86_64-latest.xml} (90%) 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 29283ab7d2..36e4b27257 100644 --- 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 4205ecde89..49a659de62 100644 --- 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 57ff9d2bf0..e48452b186 100644 --- 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 d171cc752f..4fc32f5e73 100644 --- 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 b6427a6e9f..b874bbb48e 100644 --- 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 dac55ecbce..f9209782b5 100644 --- 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 9946ad9e3d..c86beb619b 100644 --- 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 1e4c50f44a..5479958a93 100644 --- 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 65f2c56a90..6b6269886d 100644 --- 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 0583a305b1..35308678e3 100644 --- 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 98c3b17a84..77373cfb2b 100644 --- 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 85437c67f2..d1383142a0 100644 --- 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 4666777e56..8589f05399 100644 --- 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 cf0eac2fdf..b0e068c832 100644 --- 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 b9acccff36..c90e710681 100644 --- 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 47da331bab..ce0d2cb8e7 100644 --- 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 1a4609e9ed..76adca9482 100644 --- 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 e15098e1e8..87258c3d69 100644 --- 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 6a947c0239..c53d0dc1f4 100644 --- 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 84f810c61a..79a8538c86 100644 --- 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 c96182e9fb..13c6d7d1e2 100644 --- 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 23793b6155..5bf3196a35 100644 --- 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 80594ebca6..9017277a70 100644 --- 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 c9f00f8c8c..6db1f6889d 100644 --- 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 d5fd97b9ac..e9cba5a772 100644 --- 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 93202e8e18..0f9d642730 100644 --- 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"); -- 2.40.1