[PATCH 03/19] qemuxml2xmltest: Remove unnecessary versioned invocation of 'disk-cache'
The 'disk-cache' output file is identical in the interesting parts
(everything besides CPU config) to the '-latest' version, so the
versioned invocation can be dropped.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../disk-cache.x86_64-2.12.0.xml | 61 -------------------
tests/qemuxml2xmltest.c | 1 -
2 files changed, 62 deletions(-)
delete mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml
diff --git a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml
b/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml
deleted file mode 100644
index 15a6665145..0000000000
--- a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.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.12'>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/disk/by-path/ip-192.168.44.1:3260-iscsi-iqn.2011-02.lan.hdserver:hydrar-desktop.win7vm-lun-0'/>
- <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/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 007c9edacd..052950b86f 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -333,7 +333,6 @@ mymain(void)
DO_TEST_NOCAPS("disk-error-policy");
DO_TEST_CAPS_LATEST("disk-transient");
DO_TEST_NOCAPS("disk-fmt-qcow");
- DO_TEST_CAPS_VER("disk-cache", "2.12.0");
DO_TEST_CAPS_LATEST("disk-cache");
DO_TEST_CAPS_LATEST("disk-metadata-cache");
DO_TEST_NOCAPS("disk-network-nbd");
--
2.34.1