[PATCH 04/38] qemuxml2xmltest: Remove versioned tests for qemu < 2.11

Drop all the cases pinned to unsupported versions. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; Reviewed-by: Ján Tomko <jtomko(a)redhat.com&gt; Reviewed-by: Pavel Hrdina <phrdina(a)redhat.com&gt; Reviewed-by: Neal Gompa <ngompa13(a)gmail.com&gt; --- .../disk-cache.x86_64-1.5.3.xml | 61 ------------------- .../disk-cache.x86_64-2.6.0.xml | 61 ------------------- .../disk-cache.x86_64-2.7.0.xml | 61 ------------------- .../intel-iommu.x86_64-2.6.0.xml | 31 ---------- tests/qemuxml2xmltest.c | 4 -- 5 files changed, 218 deletions(-) delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-1.5.3.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml delete mode 100644 tests/qemuxml2xmloutdata/intel-iommu.x86_64-2.6.0.xml diff --git a/tests/qemuxml2xmloutdata/disk-cache.x86_64-1.5.3.xml b/tests/qemuxml2xmloutdata/disk-cache.x86_64-1.5.3.xml deleted file mode 100644 index a57c2cd5d0..0000000000 --- a/tests/qemuxml2xmloutdata/disk-cache.x86_64-1.5.3.xml +++ /dev/null @@ -1,61 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='x86_64' machine='pc-i440fx-1.5'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2' cache='writeback'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2' cache='unsafe'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hdb' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='1'/> - </disk> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2' cache='none'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='sda' bus='scsi'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2' cache='writethrough'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> - </disk> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2' cache='directsync'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='sdb' bus='usb'/> - </disk> - <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'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <controller type='scsi' index='0' model='lsilogic'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </controller> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <audio id='1' type='none'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml b/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml deleted file mode 100644 index e499c7b5a9..0000000000 --- a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml +++ /dev/null @@ -1,61 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='x86_64' machine='pc-i440fx-2.6'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2' cache='writeback'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2' cache='unsafe'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hdb' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='1'/> - </disk> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2' cache='none'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='sda' bus='scsi'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2' cache='writethrough'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </disk> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2' cache='directsync'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='sdb' bus='usb'/> - </disk> - <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'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <controller type='scsi' index='0' model='lsilogic'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> - </controller> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <audio id='1' type='none'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml b/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml deleted file mode 100644 index 3bf5792c60..0000000000 --- a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml +++ /dev/null @@ -1,61 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='x86_64' machine='pc-i440fx-2.7'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2' cache='writeback'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2' cache='unsafe'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hdb' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='1'/> - </disk> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2' cache='none'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='sda' bus='scsi'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2' cache='writethrough'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </disk> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2' cache='directsync'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='sdb' bus='usb'/> - </disk> - <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'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <controller type='scsi' index='0' model='lsilogic'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> - </controller> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <audio id='1' type='none'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/intel-iommu.x86_64-2.6.0.xml b/tests/qemuxml2xmloutdata/intel-iommu.x86_64-2.6.0.xml deleted file mode 100644 index 735f21be97..0000000000 --- a/tests/qemuxml2xmloutdata/intel-iommu.x86_64-2.6.0.xml +++ /dev/null @@ -1,31 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='x86_64' machine='pc-q35-2.6'>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> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <controller type='pci' index='0' model='pcie-root'/> - <controller type='usb' index='0' model='none'/> - <controller type='sata' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> - </controller> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <audio id='1' type='none'/> - <memballoon model='none'/> - <iommu model='intel'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index a5343cd6f8..f0030966a8 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -308,9 +308,6 @@ mymain(void) DO_TEST("disk-boot-cdrom", NONE); DO_TEST("disk-error-policy", NONE); DO_TEST("disk-fmt-qcow", NONE); - DO_TEST_CAPS_VER("disk-cache", "1.5.3"); - DO_TEST_CAPS_VER("disk-cache", "2.6.0"); - DO_TEST_CAPS_VER("disk-cache", "2.7.0"); DO_TEST_CAPS_VER("disk-cache", "2.12.0"); DO_TEST_CAPS_LATEST("disk-cache"); DO_TEST_CAPS_LATEST("disk-metadata-cache"); @@ -1365,7 +1362,6 @@ mymain(void) DO_TEST("video-none-device", QEMU_CAPS_VNC); DO_TEST_CAPS_LATEST("intel-iommu"); - DO_TEST_CAPS_VER("intel-iommu", "2.6.0"); DO_TEST_CAPS_LATEST("intel-iommu-caching-mode"); DO_TEST_CAPS_LATEST("intel-iommu-eim"); DO_TEST_CAPS_LATEST("intel-iommu-device-iotlb"); -- 2.30.2