[PATCH 19/36] qemuxml2xmltest: Remove 'disk-backing-chain' case and output files

The test is superseded by 'disk-backing-chains-(no)index' cases. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- .../qemuxml2argvdata/disk-backing-chains.xml | 98 ---------------- .../disk-backing-chains-active.xml | 110 ------------------ .../disk-backing-chains-inactive.xml | 110 ------------------ tests/qemuxml2xmltest.c | 1 - 4 files changed, 319 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-backing-chains.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-backing-chains-active.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml diff --git a/tests/qemuxml2argvdata/disk-backing-chains.xml b/tests/qemuxml2argvdata/disk-backing-chains.xml deleted file mode 100644 index 7fe84da3f0..0000000000 --- a/tests/qemuxml2argvdata/disk-backing-chains.xml +++ /dev/null @@ -1,98 +0,0 @@ -<domain type='qemu' id='1'> - <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='i686' machine='pc'>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-i386</emulator> - <disk type='network' device='disk'> - <driver name='qemu' type='qcow2'/> - <source protocol='gluster' name='Volume2/Image'> - <host transport='unix' socket='/path/to/sock'/> - </source> - <backingStore type='file' index='1'> - <format type='qcow2'/> - <source file='/tmp/missing-backing-store.qcow'/> - </backingStore> - <target dev='vda' bus='virtio'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='qcow2'/> - <source protocol='nbd' name='bar'> - <host transport='unix' socket='/var/run/nbdsock'/> - </source> - <backingStore type='block' index='1'> - <format type='qcow2'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <backingStore type='file' index='2'> - <format type='qcow2'/> - <source file='/tmp/image2.qcow'/> - <backingStore type='file' index='3'> - <format type='qcow2'/> - <source file='/tmp/image3.qcow'> - <seclabel model='selinux' relabel='yes'> - <label>system_u:system_r:public_content_t:s0</label> - </seclabel> - </source> - <backingStore type='file' index='4'> - <format type='qcow2'/> - <source file='/tmp/image4.qcow'/> - <backingStore type='file' index='5'> - <source file='/tmp/image5.qcow'/> - <format type='qcow2'/> - <backingStore type='file' index='6'> - <format type='raw'/> - <source file='/tmp/Fedora-17-x86_64-Live-KDE.iso'/> - <backingStore/> - </backingStore> - </backingStore> - </backingStore> - </backingStore> - </backingStore> - </backingStore> - <target dev='vdb' bus='virtio'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='raw'/> - <backingStore/> - <source protocol='gluster' name='Volume1/Image'> - <host name='example.org' port='6000'/> - </source> - <target dev='vdc' bus='virtio'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='qcow2'/> - <auth username='myname'> - <secret type='ceph' usage='mycluster_myname'/> - </auth> - <source protocol='rbd' name='pool/image'> - <host name='mon1.example.org' port='6321'/> - <host name='mon2.example.org' port='6322'/> - <host name='mon3.example.org' port='6322'/> - </source> - <backingStore type='file' index='1'> - <source file='/tmp/image.qcow'/> - <backingStore/> - <format type='qcow2'/> - </backingStore> - <target dev='vdd' bus='virtio'/> - </disk> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2'/> - <source dev='/dev/HostVG/QEMUGuest11'/> - <target dev='vde' bus='virtio'/> - </disk> - <controller type='usb' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-active.xml b/tests/qemuxml2xmloutdata/disk-backing-chains-active.xml deleted file mode 100644 index 5901aef3d3..0000000000 --- a/tests/qemuxml2xmloutdata/disk-backing-chains-active.xml +++ /dev/null @@ -1,110 +0,0 @@ -<domain type='qemu' id='1'> - <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='i686' machine='pc'>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-i386</emulator> - <disk type='network' device='disk'> - <driver name='qemu' type='qcow2'/> - <source protocol='gluster' name='Volume2/Image'> - <host transport='unix' socket='/path/to/sock'/> - </source> - <backingStore type='file' index='1'> - <format type='qcow2'/> - <source file='/tmp/missing-backing-store.qcow'/> - </backingStore> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='qcow2'/> - <source protocol='nbd' name='bar'> - <host transport='unix' socket='/var/run/nbdsock'/> - </source> - <backingStore type='block' index='1'> - <format type='qcow2'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <backingStore type='file' index='2'> - <format type='qcow2'/> - <source file='/tmp/image2.qcow'/> - <backingStore type='file' index='3'> - <format type='qcow2'/> - <source file='/tmp/image3.qcow'> - <seclabel model='selinux' relabel='yes'> - <label>system_u:system_r:public_content_t:s0</label> - </seclabel> - </source> - <backingStore type='file' index='4'> - <format type='qcow2'/> - <source file='/tmp/image4.qcow'/> - <backingStore type='file' index='5'> - <format type='qcow2'/> - <source file='/tmp/image5.qcow'/> - <backingStore type='file' index='6'> - <format type='raw'/> - <source file='/tmp/Fedora-17-x86_64-Live-KDE.iso'/> - <backingStore/> - </backingStore> - </backingStore> - </backingStore> - </backingStore> - </backingStore> - </backingStore> - <target dev='vdb' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='raw'/> - <source protocol='gluster' name='Volume1/Image'> - <host name='example.org' port='6000'/> - </source> - <backingStore/> - <target dev='vdc' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='qcow2'/> - <auth username='myname'> - <secret type='ceph' usage='mycluster_myname'/> - </auth> - <source protocol='rbd' name='pool/image'> - <host name='mon1.example.org' port='6321'/> - <host name='mon2.example.org' port='6322'/> - <host name='mon3.example.org' port='6322'/> - </source> - <backingStore type='file' index='1'> - <format type='qcow2'/> - <source file='/tmp/image.qcow'/> - <backingStore/> - </backingStore> - <target dev='vdd' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> - </disk> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2'/> - <source dev='/dev/HostVG/QEMUGuest11'/> - <target dev='vde' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <audio id='1' type='none'/> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> - </memballoon> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml b/tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml deleted file mode 100644 index 1d9adc85ba..0000000000 --- a/tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml +++ /dev/null @@ -1,110 +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='i686' machine='pc'>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-i386</emulator> - <disk type='network' device='disk'> - <driver name='qemu' type='qcow2'/> - <source protocol='gluster' name='Volume2/Image'> - <host transport='unix' socket='/path/to/sock'/> - </source> - <backingStore type='file'> - <format type='qcow2'/> - <source file='/tmp/missing-backing-store.qcow'/> - </backingStore> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='qcow2'/> - <source protocol='nbd' name='bar'> - <host transport='unix' socket='/var/run/nbdsock'/> - </source> - <backingStore type='block'> - <format type='qcow2'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <backingStore type='file'> - <format type='qcow2'/> - <source file='/tmp/image2.qcow'/> - <backingStore type='file'> - <format type='qcow2'/> - <source file='/tmp/image3.qcow'> - <seclabel model='selinux' relabel='yes'> - <label>system_u:system_r:public_content_t:s0</label> - </seclabel> - </source> - <backingStore type='file'> - <format type='qcow2'/> - <source file='/tmp/image4.qcow'/> - <backingStore type='file'> - <format type='qcow2'/> - <source file='/tmp/image5.qcow'/> - <backingStore type='file'> - <format type='raw'/> - <source file='/tmp/Fedora-17-x86_64-Live-KDE.iso'/> - <backingStore/> - </backingStore> - </backingStore> - </backingStore> - </backingStore> - </backingStore> - </backingStore> - <target dev='vdb' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='raw'/> - <source protocol='gluster' name='Volume1/Image'> - <host name='example.org' port='6000'/> - </source> - <backingStore/> - <target dev='vdc' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='qcow2'/> - <auth username='myname'> - <secret type='ceph' usage='mycluster_myname'/> - </auth> - <source protocol='rbd' name='pool/image'> - <host name='mon1.example.org' port='6321'/> - <host name='mon2.example.org' port='6322'/> - <host name='mon3.example.org' port='6322'/> - </source> - <backingStore type='file'> - <format type='qcow2'/> - <source file='/tmp/image.qcow'/> - <backingStore/> - </backingStore> - <target dev='vdd' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> - </disk> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2'/> - <source dev='/dev/HostVG/QEMUGuest11'/> - <target dev='vde' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <audio id='1' type='none'/> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> - </memballoon> - </devices> -</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 0e729ca905..8d885d6d9f 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -906,7 +906,6 @@ mymain(void) DO_TEST("panic-no-address", QEMU_CAPS_DEVICE_PANIC); DO_TEST_CAPS_ARCH_LATEST("panic-pseries", "ppc64"); - DO_TEST_NOCAPS("disk-backing-chains"); DO_TEST_NOCAPS("disk-backing-chains-index"); DO_TEST_NOCAPS("disk-backing-chains-noindex"); -- 2.38.1