We have several cases when a VM has multiple disks in the test files so
having another one without any interresting configuration is not
necessary.
Signed-off-by: Peter Krempa
---
tests/qemuxml2argvdata/disk-many.args | 32 -
tests/qemuxml2argvdata/disk-many.xml | 48 ---
tests/qemuxml2argvtest.c | 1 -
tests/qemuxml2xmloutdata/disk-many.xml | 52 --
tests/qemuxml2xmltest.c| 1 -
5 files changed, 134 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/disk-many.args
delete mode 100644 tests/qemuxml2argvdata/disk-many.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-many.xml
diff --git a/tests/qemuxml2argvdata/disk-many.args
b/tests/qemuxml2argvdata/disk-many.args
deleted file mode 100644
index 97baddd67e..00
--- a/tests/qemuxml2argvdata/disk-many.args
+++ /dev/null
@@ -1,32 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/home/test \
-USER=test \
-LOGNAME=test \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
--name QEMUGuest1 \
--S \
--machine pc,accel=tcg,usb=off,dump-guest-core=off \
--m 214 \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot c \
--usb \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
--device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
--drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-1 \
--device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
--drive file=/tmp/data.img,format=raw,if=none,id=drive-ide0-1-0 \
--device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
--drive file=/tmp/logs.img,format=raw,if=none,id=drive-ide0-1-1 \
--device ide-drive,bus=ide.1,unit=1,drive=drive-ide0-1-1,id=ide0-1-1
diff --git a/tests/qemuxml2argvdata/disk-many.xml
b/tests/qemuxml2argvdata/disk-many.xml
deleted file mode 100644
index fb915ac489..00
--- a/tests/qemuxml2argvdata/disk-many.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 219136
- 219136
- 1
-
-hvm
-
-
-
- destroy
- restart
- destroy
-
-/usr/bin/qemu-system-i686
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 2db4d350a5..3554b63428 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1002,7 +1002,6 @@ mymain(void)
DO_TEST("disk-floppy-tray", NONE);
DO_TEST("disk-virtio-s390",
QEMU_CAPS_VIRTIO_S390);
-DO_TEST("disk-many", NONE);
DO_TEST("disk-virtio", QEMU_CAPS_DRIVE_BOOT);
DO_TEST("disk-virtio-ccw",
QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
diff --git a/tests/qemuxml2xmloutdata/disk-many.xml
b/tests/qemuxml2xmloutdata/disk-many.xml
deleted file mode 100644
index b7a971e51d..00
--- a/tests/qemuxml2xmloutdata/disk-many.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 219136
- 219136
- 1
-
-hvm
-
-
-
- destroy
- restart
- destroy
-
-/usr/bin/qemu-system-i686
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index a333d448c3..795ddc7003 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -348,7 +348,6 @@ mymain(void)
DO_TEST("disk-aio", NONE);
DO_TEST("disk-cdrom", NONE);
DO_TEST("disk-floppy", NONE);
-DO_TEST("disk-many", NONE);
DO_TEST("disk-usb-device", NONE);
DO_TEST("disk-virtio", NONE);
DO_TEST("floppy-drive-fat", NONE);
--
2.16.2
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
