Version-lock the test to qemu-5.0.0 as it's the latest qemu that supports 'vxhs' and thus the test can't use 'latest'. Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx> --- ...vxhs.xml => disk-network-tlsx509-vxhs.x86_64-5.0.0.xml} | 7 +++++-- ...network-vxhs.xml => disk-network-vxhs.x86_64-5.0.0.xml} | 7 +++++-- tests/qemuxml2xmltest.c | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) rename tests/qemuxml2xmloutdata/{disk-network-tlsx509-vxhs.xml => disk-network-tlsx509-vxhs.x86_64-5.0.0.xml} (90%) rename tests/qemuxml2xmloutdata/{disk-network-vxhs.xml => disk-network-vxhs.x86_64-5.0.0.xml} (84%) diff --git a/tests/qemuxml2xmloutdata/disk-network-tlsx509-vxhs.xml b/tests/qemuxml2xmloutdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.xml similarity index 90% rename from tests/qemuxml2xmloutdata/disk-network-tlsx509-vxhs.xml rename to tests/qemuxml2xmloutdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.xml index c2e3370bd3..ef020d7de5 100644 --- a/tests/qemuxml2xmloutdata/disk-network-tlsx509-vxhs.xml +++ b/tests/qemuxml2xmloutdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.xml @@ -5,9 +5,12 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='x86_64' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc-i440fx-5.0'>hvm</type> <boot dev='hd'/> </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> @@ -41,7 +44,7 @@ <serial>eb90327c-8302-4725-9e1b-4e85ed4dc252</serial> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </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='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2xmloutdata/disk-network-vxhs.xml b/tests/qemuxml2xmloutdata/disk-network-vxhs.x86_64-5.0.0.xml similarity index 84% rename from tests/qemuxml2xmloutdata/disk-network-vxhs.xml rename to tests/qemuxml2xmloutdata/disk-network-vxhs.x86_64-5.0.0.xml index fe93a953d2..15293600ee 100644 --- a/tests/qemuxml2xmloutdata/disk-network-vxhs.xml +++ b/tests/qemuxml2xmloutdata/disk-network-vxhs.x86_64-5.0.0.xml @@ -5,9 +5,12 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='i686' machine='pc-i440fx-5.0'>hvm</type> <boot dev='hd'/> </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> @@ -23,7 +26,7 @@ <serial>eb90327c-8302-4725-9e1b-4e85ed4dc251</serial> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </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='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 10ea638366..2beb5b3ce9 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -312,11 +312,11 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-network-rbd-encryption-luks-any"); DO_TEST_NOCAPS("disk-network-source-auth"); DO_TEST_NOCAPS("disk-network-sheepdog"); - DO_TEST_NOCAPS("disk-network-vxhs"); + DO_TEST_CAPS_VER("disk-network-vxhs", "5.0.0"); DO_TEST_CAPS_LATEST("disk-network-nfs"); DO_TEST_NOCAPS("disk-network-tlsx509-nbd"); DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd-hostname"); - DO_TEST_NOCAPS("disk-network-tlsx509-vxhs"); + DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "5.0.0"); DO_TEST_CAPS_LATEST("disk-nvme"); DO_TEST_CAPS_LATEST("disk-vhostuser"); DO_TEST_CAPS_LATEST("disk-sata-device"); -- 2.41.0