diff --git a/tests/Makefile.am b/tests/Makefile.am index cbcfbe23cc..115afa1c1a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -109,7 +109,6 @@ EXTRA_DIST = \ nwfilterxml2xmlout \ oomtrace.pl \ qemuagentdata \ - qemuargv2xmldata \ qemublocktestdata \ qemucapabilitiesdata \ qemucaps2xmloutdata \ @@ -276,7 +275,7 @@ endif WITH_LIBXL if WITH_QEMU test_programs += qemuxml2argvtest qemuxml2xmltest \ - qemuargv2xmltest domainsnapshotxml2xmltest \ + domainsnapshotxml2xmltest \ qemumonitorjsontest qemuhotplugtest \ qemuagenttest qemucapabilitiestest qemucaps2xmltest \ qemumemlocktest \ @@ -585,12 +584,6 @@ qemuxml2xmltest_SOURCES = \ testutils.c testutils.h qemuxml2xmltest_LDADD = $(qemu_LDADDS) -qemuargv2xmltest_SOURCES = \ - qemuargv2xmltest.c testutilsqemu.c testutilsqemu.h \ - testutils.c testutils.h -qemuargv2xmltest_LDADD = libqemutestdriver.la \ - $(LDADDS) - qemumonitorjsontest_SOURCES = \ qemumonitorjsontest.c \ testutils.c testutils.h \ @@ -697,7 +690,7 @@ qemufirmwaretest_SOURCES = \ qemufirmwaretest_LDADD = $(qemu_LDADDS) else ! WITH_QEMU -EXTRA_DIST += qemuxml2argvtest.c qemuxml2xmltest.c qemuargv2xmltest.c \ +EXTRA_DIST += qemuxml2argvtest.c qemuxml2xmltest.c \ domainsnapshotxml2xmltest.c \ testutilsqemu.c testutilsqemu.h \ testutilsqemuschema.c testutilsqemuschema.h \ diff --git a/tests/qemuargv2xmldata/boot-cdrom.args b/tests/qemuargv2xmldata/boot-cdrom.args deleted file mode 100644 index 6a7e0e2867..0000000000 --- a/tests/qemuargv2xmldata/boot-cdrom.args +++ /dev/null @@ -1,22 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot d \ --usb \ --drive file=/dev/cdrom,format=raw,if=ide,media=cdrom,bus=1,unit=0 \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/boot-cdrom.xml b/tests/qemuargv2xmldata/boot-cdrom.xml deleted file mode 100644 index 55f6abc236..0000000000 --- a/tests/qemuargv2xmldata/boot-cdrom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - - -
- - -
- - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/boot-floppy.args b/tests/qemuargv2xmldata/boot-floppy.args deleted file mode 100644 index b5172d08c8..0000000000 --- a/tests/qemuargv2xmldata/boot-floppy.args +++ /dev/null @@ -1,23 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot a \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ --drive file=/tmp/firmware.img,format=raw,if=floppy,unit=0 \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/boot-floppy.xml b/tests/qemuargv2xmldata/boot-floppy.xml deleted file mode 100644 index 7e32ae69a1..0000000000 --- a/tests/qemuargv2xmldata/boot-floppy.xml +++ /dev/null @@ -1,41 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - -
- - -
- - - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/boot-network.args b/tests/qemuargv2xmldata/boot-network.args deleted file mode 100644 index 22607075b4..0000000000 --- a/tests/qemuargv2xmldata/boot-network.args +++ /dev/null @@ -1,22 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot n \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/boot-network.xml b/tests/qemuargv2xmldata/boot-network.xml deleted file mode 100644 index 19e99e2f77..0000000000 --- a/tests/qemuargv2xmldata/boot-network.xml +++ /dev/null @@ -1,34 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - -
- - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/clock-localtime.args b/tests/qemuargv2xmldata/clock-localtime.args deleted file mode 100644 index 2527918e17..0000000000 --- a/tests/qemuargv2xmldata/clock-localtime.args +++ /dev/null @@ -1,23 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --localtime \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/clock-localtime.xml b/tests/qemuargv2xmldata/clock-localtime.xml deleted file mode 100644 index 0d8b61a0cd..0000000000 --- a/tests/qemuargv2xmldata/clock-localtime.xml +++ /dev/null @@ -1,34 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - -
- - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/clock-utc.args b/tests/qemuargv2xmldata/clock-utc.args deleted file mode 100644 index 1fb74e47fa..0000000000 --- a/tests/qemuargv2xmldata/clock-utc.args +++ /dev/null @@ -1,22 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/clock-utc.xml b/tests/qemuargv2xmldata/clock-utc.xml deleted file mode 100644 index c283fd7f00..0000000000 --- a/tests/qemuargv2xmldata/clock-utc.xml +++ /dev/null @@ -1,34 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - -
- - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/console-compat.args b/tests/qemuargv2xmldata/console-compat.args deleted file mode 100644 index eba5b21760..0000000000 --- a/tests/qemuargv2xmldata/console-compat.args +++ /dev/null @@ -1,22 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ --net none \ --serial pty \ --parallel none diff --git a/tests/qemuargv2xmldata/console-compat.xml b/tests/qemuargv2xmldata/console-compat.xml deleted file mode 100644 index cba43ca451..0000000000 --- a/tests/qemuargv2xmldata/console-compat.xml +++ /dev/null @@ -1,42 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - -
- - - -
- - - - - - - - - - - - - - diff --git a/tests/qemuargv2xmldata/disk-cdrom-empty.args b/tests/qemuargv2xmldata/disk-cdrom-empty.args deleted file mode 100644 index 4d518aa4f7..0000000000 --- a/tests/qemuargv2xmldata/disk-cdrom-empty.args +++ /dev/null @@ -1,23 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ --drive if=ide,media=cdrom,bus=1,unit=0 \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/disk-cdrom-empty.xml b/tests/qemuargv2xmldata/disk-cdrom-empty.xml deleted file mode 100644 index 4b2a25e290..0000000000 --- a/tests/qemuargv2xmldata/disk-cdrom-empty.xml +++ /dev/null @@ -1,40 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - -
- - -
- - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/disk-cdrom.args b/tests/qemuargv2xmldata/disk-cdrom.args deleted file mode 100644 index 2e90073081..0000000000 --- a/tests/qemuargv2xmldata/disk-cdrom.args +++ /dev/null @@ -1,23 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ --drive file=/root/boot.iso,format=raw,if=ide,media=cdrom,bus=1,unit=0 \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/disk-cdrom.xml b/tests/qemuargv2xmldata/disk-cdrom.xml deleted file mode 100644 index d35e615683..0000000000 --- a/tests/qemuargv2xmldata/disk-cdrom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - -
- - -
- - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/disk-drive-boot-cdrom.args b/tests/qemuargv2xmldata/disk-drive-boot-cdrom.args deleted file mode 100644 index 2781775981..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-boot-cdrom.args +++ /dev/null @@ -1,23 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot d \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ --drive file=/dev/HostVG/QEMUGuest2,format=raw,if=ide,media=cdrom,bus=1,unit=0 \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-boot-cdrom.xml b/tests/qemuargv2xmldata/disk-drive-boot-cdrom.xml deleted file mode 100644 index cef9ad5a28..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-boot-cdrom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - -
- - -
- - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/disk-drive-boot-disk.args b/tests/qemuargv2xmldata/disk-drive-boot-disk.args deleted file mode 100644 index ade4af275f..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-boot-disk.args +++ /dev/null @@ -1,23 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ --drive file=/dev/HostVG/QEMUGuest2,format=raw,if=ide,media=cdrom,bus=1,unit=0 \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-boot-disk.xml b/tests/qemuargv2xmldata/disk-drive-boot-disk.xml deleted file mode 100644 index 37765ca7b1..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-boot-disk.xml +++ /dev/null @@ -1,41 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - -
- - -
- - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/disk-drive-cache-directsync.args b/tests/qemuargv2xmldata/disk-drive-cache-directsync.args deleted file mode 100644 index 60a899252d..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-cache-directsync.args +++ /dev/null @@ -1,24 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=ide,bus=0,unit=0,\ -cache=directsync \ --drive file=/dev/HostVG/QEMUGuest2,format=raw,if=ide,media=cdrom,bus=1,unit=0 \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-cache-directsync.xml b/tests/qemuargv2xmldata/disk-drive-cache-directsync.xml deleted file mode 100644 index a4513711c0..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-cache-directsync.xml +++ /dev/null @@ -1,41 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - -
- - -
- - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/disk-drive-cache-unsafe.args b/tests/qemuargv2xmldata/disk-drive-cache-unsafe.args deleted file mode 100644 index d72586d854..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-cache-unsafe.args +++ /dev/null @@ -1,24 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=ide,bus=0,unit=0,\ -cache=unsafe \ --drive file=/dev/HostVG/QEMUGuest2,format=raw,if=ide,media=cdrom,bus=1,unit=0 \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-cache-unsafe.xml b/tests/qemuargv2xmldata/disk-drive-cache-unsafe.xml deleted file mode 100644 index 5b0eaf3b69..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-cache-unsafe.xml +++ /dev/null @@ -1,41 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - -
- - -
- - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/disk-drive-cache-v2-none.args b/tests/qemuargv2xmldata/disk-drive-cache-v2-none.args deleted file mode 100644 index 6109c23610..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-cache-v2-none.args +++ /dev/null @@ -1,23 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=ide,bus=0,unit=0,cache=none \ --drive file=/dev/HostVG/QEMUGuest2,format=raw,if=ide,media=cdrom,bus=1,unit=0 \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-cache-v2-none.xml b/tests/qemuargv2xmldata/disk-drive-cache-v2-none.xml deleted file mode 100644 index a1c61a0266..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-cache-v2-none.xml +++ /dev/null @@ -1,41 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - -
- - -
- - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/disk-drive-cache-v2-wb.args b/tests/qemuargv2xmldata/disk-drive-cache-v2-wb.args deleted file mode 100644 index 7d6a15cff6..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-cache-v2-wb.args +++ /dev/null @@ -1,24 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=ide,bus=0,unit=0,\ -cache=writeback \ --drive file=/dev/HostVG/QEMUGuest2,format=raw,if=ide,media=cdrom,bus=1,unit=0 \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-cache-v2-wb.xml b/tests/qemuargv2xmldata/disk-drive-cache-v2-wb.xml deleted file mode 100644 index b1a2b1ade4..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-cache-v2-wb.xml +++ /dev/null @@ -1,41 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - -
- - -
- - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/disk-drive-cache-v2-wt.args b/tests/qemuargv2xmldata/disk-drive-cache-v2-wt.args deleted file mode 100644 index 5ed51f837b..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-cache-v2-wt.args +++ /dev/null @@ -1,24 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=ide,bus=0,unit=0,\ -cache=writethrough \ --drive file=/dev/HostVG/QEMUGuest2,format=raw,if=ide,media=cdrom,bus=1,unit=0 \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-cache-v2-wt.xml b/tests/qemuargv2xmldata/disk-drive-cache-v2-wt.xml deleted file mode 100644 index 444792562c..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-cache-v2-wt.xml +++ /dev/null @@ -1,41 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - -
- - -
- - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/disk-drive-error-policy-enospace.args b/tests/qemuargv2xmldata/disk-drive-error-policy-enospace.args deleted file mode 100644 index 8ea2ab2fbf..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-error-policy-enospace.args +++ /dev/null @@ -1,24 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor control,unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=ide,bus=0,unit=0,cache=none,\ -werror=enospc \ --drive file=/dev/HostVG/QEMUGuest2,format=raw,if=ide,media=cdrom,bus=1,unit=0 \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-error-policy-enospace.xml b/tests/qemuargv2xmldata/disk-drive-error-policy-enospace.xml deleted file mode 100644 index fb896f05e6..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-error-policy-enospace.xml +++ /dev/null @@ -1,41 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - -
- - -
- - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/disk-drive-error-policy-stop.args b/tests/qemuargv2xmldata/disk-drive-error-policy-stop.args deleted file mode 100644 index 20c3422d6d..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-error-policy-stop.args +++ /dev/null @@ -1,24 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor control,unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=ide,bus=0,unit=0,cache=none,\ -werror=stop,rerror=stop \ --drive file=/dev/HostVG/QEMUGuest2,format=raw,if=ide,media=cdrom,bus=1,unit=0 \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-error-policy-stop.xml b/tests/qemuargv2xmldata/disk-drive-error-policy-stop.xml deleted file mode 100644 index ddc806e39f..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-error-policy-stop.xml +++ /dev/null @@ -1,41 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - -
- - -
- - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/disk-drive-error-policy-wreport-rignore.args b/tests/qemuargv2xmldata/disk-drive-error-policy-wreport-rignore.args deleted file mode 100644 index 79e192401f..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-error-policy-wreport-rignore.args +++ /dev/null @@ -1,24 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor control,unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=ide,bus=0,unit=0,cache=none,\ -werror=report,rerror=ignore \ --drive file=/dev/HostVG/QEMUGuest2,format=raw,if=ide,media=cdrom,bus=1,unit=0 \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-error-policy-wreport-rignore.xml b/tests/qemuargv2xmldata/disk-drive-error-policy-wreport-rignore.xml deleted file mode 100644 index 4ac347a21d..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-error-policy-wreport-rignore.xml +++ /dev/null @@ -1,41 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - -
- - -
- - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/disk-drive-fmt-qcow.args b/tests/qemuargv2xmldata/disk-drive-fmt-qcow.args deleted file mode 100644 index 7480d11400..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-fmt-qcow.args +++ /dev/null @@ -1,23 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=ide,bus=0,unit=0 \ --drive file=/dev/HostVG/QEMUGuest2,format=raw,if=ide,media=cdrom,bus=1,unit=0 \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-fmt-qcow.xml b/tests/qemuargv2xmldata/disk-drive-fmt-qcow.xml deleted file mode 100644 index f33a8c5d4d..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-fmt-qcow.xml +++ /dev/null @@ -1,41 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - -
- - -
- - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/disk-drive-network-gluster.args b/tests/qemuargv2xmldata/disk-drive-network-gluster.args deleted file mode 100644 index 8a487622af..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-network-gluster.args +++ /dev/null @@ -1,25 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=gluster://example.org:6000/Volume1/Image,file.debug=4,format=raw,\ -if=virtio \ --drive 'file=gluster+unix:///Volume2/Image?socket=/path/to/sock,file.debug=4,\ -format=raw,if=virtio' \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-network-gluster.xml b/tests/qemuargv2xmldata/disk-drive-network-gluster.xml deleted file mode 100644 index 21e29d4955..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-network-gluster.xml +++ /dev/null @@ -1,41 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - - - -
- - - - - - - -
- - -
- - - - - - - diff --git a/tests/qemuargv2xmldata/disk-drive-network-iscsi-auth.args b/tests/qemuargv2xmldata/disk-drive-network-iscsi-auth.args deleted file mode 100644 index 1530e894f2..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-network-iscsi-auth.args +++ /dev/null @@ -1,25 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ -6000/iqn.1992-01.com.example%3Astorage/1,format=raw,if=virtio \ --drive file=iscsi://example.org:6000/iqn.1992-01.com.example%3Astorage/2,\ -format=raw,if=virtio \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-network-iscsi-auth.xml b/tests/qemuargv2xmldata/disk-drive-network-iscsi-auth.xml deleted file mode 100644 index 1773b460bb..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-network-iscsi-auth.xml +++ /dev/null @@ -1,44 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - - - - - - -
- - - - - - - -
- - -
- - - - - - - diff --git a/tests/qemuargv2xmldata/disk-drive-network-iscsi.args b/tests/qemuargv2xmldata/disk-drive-network-iscsi.args deleted file mode 100644 index 62cc5c0fe7..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-network-iscsi.args +++ /dev/null @@ -1,25 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=iscsi://example.org:6000/iqn.1992-01.com.example,format=raw,\ -if=virtio \ --drive file=iscsi://example.org:6000/iqn.1992-01.com.example/1,format=raw,\ -if=virtio \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-network-iscsi.xml b/tests/qemuargv2xmldata/disk-drive-network-iscsi.xml deleted file mode 100644 index 694412b5c7..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-network-iscsi.xml +++ /dev/null @@ -1,41 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - - - -
- - - - - - - -
- - -
- - - - - - - diff --git a/tests/qemuargv2xmldata/disk-drive-network-nbd-export.args b/tests/qemuargv2xmldata/disk-drive-network-nbd-export.args deleted file mode 100644 index b0fdda2684..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-network-nbd-export.args +++ /dev/null @@ -1,23 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ --drive file=nbd:example.org:6000:exportname=bar,format=raw,if=virtio \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-network-nbd-export.xml b/tests/qemuargv2xmldata/disk-drive-network-nbd-export.xml deleted file mode 100644 index d694a038eb..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-network-nbd-export.xml +++ /dev/null @@ -1,42 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - - -
- - -
- - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6-export.args b/tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6-export.args deleted file mode 100644 index 7a08d909fa..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6-export.args +++ /dev/null @@ -1,23 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ --drive 'file=nbd://[::1]:6000/bar,format=raw,if=virtio' \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6-export.xml b/tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6-export.xml deleted file mode 100644 index c7e5aa209b..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6-export.xml +++ /dev/null @@ -1,42 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - - -
- - -
- - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6.args b/tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6.args deleted file mode 100644 index accac3f55a..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6.args +++ /dev/null @@ -1,23 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ --drive 'file=nbd://[::1]:6000,format=raw,if=virtio' \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6.xml b/tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6.xml deleted file mode 100644 index 0fa308375f..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6.xml +++ /dev/null @@ -1,42 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - - -
- - -
- - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/disk-drive-network-nbd-unix.args b/tests/qemuargv2xmldata/disk-drive-network-nbd-unix.args deleted file mode 100644 index 19c115fc5b..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-network-nbd-unix.args +++ /dev/null @@ -1,23 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ --drive file=nbd:unix:/var/run/nbdsock:exportname=bar,format=raw,if=virtio \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-network-nbd-unix.xml b/tests/qemuargv2xmldata/disk-drive-network-nbd-unix.xml deleted file mode 100644 index edd1b85633..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-network-nbd-unix.xml +++ /dev/null @@ -1,42 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - - -
- - -
- - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/disk-drive-network-nbd.args b/tests/qemuargv2xmldata/disk-drive-network-nbd.args deleted file mode 100644 index 0d8d7d7d5b..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-network-nbd.args +++ /dev/null @@ -1,23 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ --drive file=nbd:example.org:6000,format=raw,if=virtio \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-network-nbd.xml b/tests/qemuargv2xmldata/disk-drive-network-nbd.xml deleted file mode 100644 index fb0c8379fa..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-network-nbd.xml +++ /dev/null @@ -1,42 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - - -
- - -
- - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/disk-drive-network-rbd-auth.args b/tests/qemuargv2xmldata/disk-drive-network-rbd-auth.args deleted file mode 100644 index 6727e85634..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-network-rbd-auth.args +++ /dev/null @@ -1,26 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ --drive 'file=rbd:pool/image:id=myname:\ -key=QVFDVm41aE82SHpGQWhBQXEwTkN2OGp0SmNJY0UrSE9CbE1RMUE=:\ -auth_supported=cephx\;none:mon_host=mon1.example.org\:6321\;mon2.example.org\:\ -6322\;mon3.example.org\:6322,format=raw,if=virtio' \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-network-rbd-auth.xml b/tests/qemuargv2xmldata/disk-drive-network-rbd-auth.xml deleted file mode 100644 index e1326b925c..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-network-rbd-auth.xml +++ /dev/null @@ -1,47 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - - - - - - - -
- - -
- - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/disk-drive-network-rbd-ceph-env.args b/tests/qemuargv2xmldata/disk-drive-network-rbd-ceph-env.args deleted file mode 100644 index ead74e3110..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-network-rbd-ceph-env.args +++ /dev/null @@ -1,25 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -CEPH_ARGS=-m \ -mon1.example.org:6321,mon2.example.org:6322,mon3.example.org:6322 \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ --drive file=rbd:pool/image,format=raw,if=virtio \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-network-rbd-ceph-env.xml b/tests/qemuargv2xmldata/disk-drive-network-rbd-ceph-env.xml deleted file mode 100644 index e77237b311..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-network-rbd-ceph-env.xml +++ /dev/null @@ -1,44 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - - - - -
- - -
- - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/disk-drive-network-rbd-ipv6.args b/tests/qemuargv2xmldata/disk-drive-network-rbd-ipv6.args deleted file mode 100644 index 4172a665fa..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-network-rbd-ipv6.args +++ /dev/null @@ -1,25 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ --drive 'file=rbd:pool/image:auth_supported=none:mon_host=[\:\:1]\:\ -6321\;example.org\:6789\;[ffff\:1234\:567\:abc\:\:0f]\:6322\;[2001\:db8\:\:\ -ff00\:42\:8329]\:6322,format=raw,if=virtio' \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-network-rbd-ipv6.xml b/tests/qemuargv2xmldata/disk-drive-network-rbd-ipv6.xml deleted file mode 100644 index 8597267dc5..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-network-rbd-ipv6.xml +++ /dev/null @@ -1,45 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - - - - - -
- - -
- - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/disk-drive-network-rbd.args b/tests/qemuargv2xmldata/disk-drive-network-rbd.args deleted file mode 100644 index 73ffd6dc85..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-network-rbd.args +++ /dev/null @@ -1,29 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ --drive 'file=rbd:pool/image:auth_supported=none:mon_host=mon1.example.org\:\ -6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=raw,if=virtio' \ --drive file=rbd:pool/image@asdf:auth_supported=none,format=raw,if=virtio \ --drive 'file=rbd:pool/image@foo:auth_supported=none:mon_host=mon1.example.org\:\ -6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=raw,if=virtio' \ --drive file=rbd:pool/image@foo:auth_supported=none:conf=/blah/test.conf,\ -format=raw,if=virtio \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-network-rbd.xml b/tests/qemuargv2xmldata/disk-drive-network-rbd.xml deleted file mode 100644 index ab5d94c404..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-network-rbd.xml +++ /dev/null @@ -1,72 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - - - - -
- - - - - - - -
- - - - - - - - - - -
- - - - - - - - -
- - -
- - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/disk-drive-network-sheepdog.args b/tests/qemuargv2xmldata/disk-drive-network-sheepdog.args deleted file mode 100644 index ee4c6fe78a..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-network-sheepdog.args +++ /dev/null @@ -1,23 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMU,,Guest,,,,1,format=raw,if=ide,bus=0,unit=0 \ --drive file=sheepdog:example.org:6000:image,,with,,commas,format=raw,if=virtio \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-network-sheepdog.xml b/tests/qemuargv2xmldata/disk-drive-network-sheepdog.xml deleted file mode 100644 index 79c7160691..0000000000 --- a/tests/qemuargv2xmldata/disk-drive-network-sheepdog.xml +++ /dev/null @@ -1,42 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - - -
- - -
- - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/disk-floppy.args b/tests/qemuargv2xmldata/disk-floppy.args deleted file mode 100644 index edcba6b644..0000000000 --- a/tests/qemuargv2xmldata/disk-floppy.args +++ /dev/null @@ -1,24 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ --drive file=/dev/fd0,format=raw,if=floppy,unit=0 \ --drive file=/tmp/firmware.img,format=raw,if=floppy,unit=1 \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/disk-floppy.xml b/tests/qemuargv2xmldata/disk-floppy.xml deleted file mode 100644 index 1967e4fcd8..0000000000 --- a/tests/qemuargv2xmldata/disk-floppy.xml +++ /dev/null @@ -1,47 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - -
- - - - - -
- - -
- - - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/disk-many.args b/tests/qemuargv2xmldata/disk-many.args deleted file mode 100644 index fc539b7764..0000000000 --- a/tests/qemuargv2xmldata/disk-many.args +++ /dev/null @@ -1,25 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ --drive file=/dev/HostVG/QEMUGuest2,format=raw,if=ide,bus=0,unit=1 \ --drive file=/tmp/data.img,format=raw,if=ide,bus=1,unit=0 \ --drive file=/tmp/logs.img,format=raw,if=ide,bus=1,unit=1 \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/disk-many.xml b/tests/qemuargv2xmldata/disk-many.xml deleted file mode 100644 index 439864eb59..0000000000 --- a/tests/qemuargv2xmldata/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/qemuargv2xmldata/disk-usb.args b/tests/qemuargv2xmldata/disk-usb.args deleted file mode 100644 index 327c766f66..0000000000 --- a/tests/qemuargv2xmldata/disk-usb.args +++ /dev/null @@ -1,23 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ --usbdevice disk:/tmp/usbdisk.img \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/disk-usb.xml b/tests/qemuargv2xmldata/disk-usb.xml deleted file mode 100644 index a66e3c82c1..0000000000 --- a/tests/qemuargv2xmldata/disk-usb.xml +++ /dev/null @@ -1,39 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - - -
- - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/disk-virtio.args b/tests/qemuargv2xmldata/disk-virtio.args deleted file mode 100644 index b1e080f384..0000000000 --- a/tests/qemuargv2xmldata/disk-virtio.args +++ /dev/null @@ -1,25 +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 \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ --drive file=/dev/HostVG/QEMUGuest2,format=raw,if=ide,media=cdrom,bus=1,unit=0 \ --drive file=/tmp/data.img,format=raw,if=virtio \ --drive file=/tmp/logs.img,format=raw,if=virtio \ --net none \ --serial none \ --parallel none diff --git a/tests/qemuargv2xmldata/disk-virtio.xml b/tests/qemuargv2xmldata/disk-virtio.xml deleted file mode 100644 index 3b8081afff..0000000000 --- a/tests/qemuargv2xmldata/disk-virtio.xml +++ /dev/null @@ -1,53 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - -
- - - - - -
- - - - - -
- - -
- - - -
- - - - - - diff --git a/tests/qemuargv2xmldata/graphics-sdl-fullscreen.args b/tests/qemuargv2xmldata/graphics-sdl-fullscreen.args deleted file mode 100644 index c778329609..0000000000 --- a/tests/qemuargv2xmldata/graphics-sdl-fullscreen.args +++ /dev/null @@ -1,25 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -XAUTHORITY=/root/.Xauthority \ -DISPLAY=:0.1 \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ --net none \ --serial none \ --parallel none \ --full-screen \ --sdl \ --vga cirrus diff --git a/tests/qemuargv2xmldata/graphics-sdl-fullscreen.xml b/tests/qemuargv2xmldata/graphics-sdl-fullscreen.xml deleted file mode 100644 index 7d0d5dbcca..0000000000 --- a/tests/qemuargv2xmldata/graphics-sdl-fullscreen.xml +++ /dev/null @@ -1,39 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - -
- - - -
- - - - -