6:33 a.m.
Everything this XML tests is already explicitly covered in other tests.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvdata/interface-driver.xml | 54 ---------------
.../interface-driver.x86_64-latest.xml | 67 -------------------
tests/qemuxml2xmltest.c | 1 -
3 files changed, 122 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/interface-driver.xml
delete mode 100644 tests/qemuxml2xmloutdata/interface-driver.x86_64-latest.xml
diff --git a/tests/qemuxml2argvdata/interface-driver.xml
b/tests/qemuxml2argvdata/interface-driver.xml
deleted file mode 100644
index 8c8f043a93..0000000000
--- a/tests/qemuxml2argvdata/interface-driver.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<domain type='qemu'>
- <name>test</name>
- <uuid>15d091de-0181-456b-9554-e4382dc1f1ab</uuid>
- <memory unit='KiB'>1048576</memory>
- <currentMemory unit='KiB'>1048576</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type arch='x86_64' machine='pc'>hvm</type>
- <boot dev='cdrom'/>
- <boot dev='hd'/>
- <bootmenu enable='yes'/>
- </os>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <disk type='file' device='disk'>
- <driver name='qemu' type='qcow2' event_idx='on'/>
- <source file='/var/lib/libvirt/images/f14.img'/>
- <target dev='vda' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='qemu' type='raw'/>
- <source file='/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
- <controller type='usb' index='0'/>
- <controller type='virtio-serial' index='0'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
- </controller>
- <controller type='ide' index='0'/>
- <controller type='pci' index='0' model='pci-root'/>
- <interface type='user'>
- <mac address='52:54:00:e5:48:58'/>
- <model type='virtio'/>
- <driver ioeventfd='on' event_idx='on' queues='5'/>
- <link state='up'/>
- </interface>
- <serial type='pty'>
- <target port='0'/>
- </serial>
- <console type='pty'>
- <target type='serial' port='0'/>
- </console>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <memballoon model='virtio'/>
- </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/interface-driver.x86_64-latest.xml
b/tests/qemuxml2xmloutdata/interface-driver.x86_64-latest.xml
deleted file mode 100644
index be40782604..0000000000
--- a/tests/qemuxml2xmloutdata/interface-driver.x86_64-latest.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<domain type='qemu'>
- <name>test</name>
- <uuid>15d091de-0181-456b-9554-e4382dc1f1ab</uuid>
- <memory unit='KiB'>1048576</memory>
- <currentMemory unit='KiB'>1048576</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type arch='x86_64' machine='pc'>hvm</type>
- <boot dev='cdrom'/>
- <boot dev='hd'/>
- <bootmenu enable='yes'/>
- </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>restart</on_crash>
- <devices>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <disk type='file' device='disk'>
- <driver name='qemu' type='qcow2' event_idx='on'/>
- <source file='/var/lib/libvirt/images/f14.img'/>
- <target dev='vda' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='qemu' type='raw'/>
- <source file='/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
- <controller type='usb' index='0' model='piix3-uhci'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
- </controller>
- <controller type='virtio-serial' index='0'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
- </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'/>
- <interface type='user'>
- <mac address='52:54:00:e5:48:58'/>
- <model type='virtio'/>
- <driver ioeventfd='on' event_idx='on' queues='5'/>
- <link state='up'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
- </interface>
- <serial type='pty'>
- <target type='isa-serial' port='0'>
- <model name='isa-serial'/>
- </target>
- </serial>
- <console type='pty'>
- <target type='serial' port='0'/>
- </console>
- <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='0x03' function='0x0'/>
- </memballoon>
- </devices>
-</domain>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index df7c9da240..4e39763dc7 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -477,7 +477,6 @@ mymain(void)
DO_TEST_CAPS_ARCH_LATEST("iothreads-virtio-scsi-ccw", "s390x");
DO_TEST_CAPS_LATEST("lease");
DO_TEST_CAPS_LATEST("event_idx");
- DO_TEST_CAPS_LATEST("interface-driver");
DO_TEST_CAPS_LATEST("net-server");
DO_TEST_CAPS_LATEST("virtio-lun");
--
2.43.0