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
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/qemuargv2xmldata/graphics-sdl.args b/tests/qemuargv2xmldata/graphics-sdl.args
deleted file mode 100644
index 35ed8c6ef0..0000000000
--- a/tests/qemuargv2xmldata/graphics-sdl.args
+++ /dev/null
@@ -1,24 +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 \
--sdl \
--vga std
diff --git a/tests/qemuargv2xmldata/graphics-sdl.xml b/tests/qemuargv2xmldata/graphics-sdl.xml
deleted file mode 100644
index 4e89683c69..0000000000
--- a/tests/qemuargv2xmldata/graphics-sdl.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/graphics-vnc-policy.args b/tests/qemuargv2xmldata/graphics-vnc-policy.args
deleted file mode 100644
index 5c22589f61..0000000000
--- a/tests/qemuargv2xmldata/graphics-vnc-policy.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 \
--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 \
--vnc '[::]:59630,share=allow-exclusive' \
--vga cirrus
diff --git a/tests/qemuargv2xmldata/graphics-vnc-policy.xml b/tests/qemuargv2xmldata/graphics-vnc-policy.xml
deleted file mode 100644
index ca9e6a65af..0000000000
--- a/tests/qemuargv2xmldata/graphics-vnc-policy.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/graphics-vnc-sasl.args b/tests/qemuargv2xmldata/graphics-vnc-sasl.args
deleted file mode 100644
index a3141bd81b..0000000000
--- a/tests/qemuargv2xmldata/graphics-vnc-sasl.args
+++ /dev/null
@@ -1,24 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/home/test \
-USER=test \
-LOGNAME=test \
-SASL_CONF_PATH=/root/.sasl2 \
-QEMU_AUDIO_DRV=none \
-/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 \
--vnc 127.0.0.1:3,sasl \
--vga cirrus
diff --git a/tests/qemuargv2xmldata/graphics-vnc-sasl.xml b/tests/qemuargv2xmldata/graphics-vnc-sasl.xml
deleted file mode 100644
index 003bd6a0b2..0000000000
--- a/tests/qemuargv2xmldata/graphics-vnc-sasl.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/graphics-vnc-socket.args b/tests/qemuargv2xmldata/graphics-vnc-socket.args
deleted file mode 100644
index fb4ee2c03c..0000000000
--- a/tests/qemuargv2xmldata/graphics-vnc-socket.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 \
--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 \
--vnc unix:/tmp/foo.socket \
--vga cirrus
diff --git a/tests/qemuargv2xmldata/graphics-vnc-socket.xml b/tests/qemuargv2xmldata/graphics-vnc-socket.xml
deleted file mode 100644
index d71907f2a6..0000000000
--- a/tests/qemuargv2xmldata/graphics-vnc-socket.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/graphics-vnc-tls.args b/tests/qemuargv2xmldata/graphics-vnc-tls.args
deleted file mode 100644
index 33e20cc6fc..0000000000
--- a/tests/qemuargv2xmldata/graphics-vnc-tls.args
+++ /dev/null
@@ -1,24 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/home/test \
-USER=test \
-LOGNAME=test \
-SASL_CONF_PATH=/root/.sasl2 \
-QEMU_AUDIO_DRV=none \
-/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 \
--vnc 127.0.0.1:3,tls,x509verify=/etc/pki/libvirt-vnc,sasl \
--vga cirrus
diff --git a/tests/qemuargv2xmldata/graphics-vnc-tls.xml b/tests/qemuargv2xmldata/graphics-vnc-tls.xml
deleted file mode 100644
index 003bd6a0b2..0000000000
--- a/tests/qemuargv2xmldata/graphics-vnc-tls.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/graphics-vnc-websocket.args b/tests/qemuargv2xmldata/graphics-vnc-websocket.args
deleted file mode 100644
index 56563926bf..0000000000
--- a/tests/qemuargv2xmldata/graphics-vnc-websocket.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 \
--monitor unix:/tmp/test-monitor,server,nowait \
--no-acpi \
--boot c \
--usb \
--net none \
--serial none \
--parallel none \
--vnc 127.0.0.1:0,websocket=5700 \
--vga cirrus
diff --git a/tests/qemuargv2xmldata/graphics-vnc-websocket.xml b/tests/qemuargv2xmldata/graphics-vnc-websocket.xml
deleted file mode 100644
index c21ccbc113..0000000000
--- a/tests/qemuargv2xmldata/graphics-vnc-websocket.xml
+++ /dev/null
@@ -1,32 +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-vnc.args b/tests/qemuargv2xmldata/graphics-vnc.args
deleted file mode 100644
index 780d4dcfea..0000000000
--- a/tests/qemuargv2xmldata/graphics-vnc.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 \
--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 \
--vnc '[2001:1:2:3:4:5:1234:1234]:3' \
--vga cirrus
diff --git a/tests/qemuargv2xmldata/graphics-vnc.xml b/tests/qemuargv2xmldata/graphics-vnc.xml
deleted file mode 100644
index 7e815a6aed..0000000000
--- a/tests/qemuargv2xmldata/graphics-vnc.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/hostdev-pci-address.args b/tests/qemuargv2xmldata/hostdev-pci-address.args
deleted file mode 100644
index 4d24ce3b75..0000000000
--- a/tests/qemuargv2xmldata/hostdev-pci-address.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 QEMUGuest2 \
--S \
--M pc \
--m 214 \
--smp 1 \
--uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
--nographic \
--monitor unix:/tmp/test-monitor,server,nowait \
--no-acpi \
--boot c \
--usb \
--drive file=/dev/HostVG/QEMUGuest2,format=raw,if=ide,bus=0,unit=0 \
--net none \
--serial none \
--parallel none \
--pcidevice host=06:12.5
diff --git a/tests/qemuargv2xmldata/hostdev-pci-address.xml b/tests/qemuargv2xmldata/hostdev-pci-address.xml
deleted file mode 100644
index d6b9ce1d25..0000000000
--- a/tests/qemuargv2xmldata/hostdev-pci-address.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
- QEMUGuest2
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 219136
- 219136
- 1
-
- hvm
-
-
-
- destroy
- restart
- destroy
-
- /usr/bin/qemu-system-i686
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/qemuargv2xmldata/hostdev-usb-address.args b/tests/qemuargv2xmldata/hostdev-usb-address.args
deleted file mode 100644
index 31baa50130..0000000000
--- a/tests/qemuargv2xmldata/hostdev-usb-address.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 \
--net none \
--serial none \
--parallel none \
--usbdevice host:14.6
diff --git a/tests/qemuargv2xmldata/hostdev-usb-address.xml b/tests/qemuargv2xmldata/hostdev-usb-address.xml
deleted file mode 100644
index 14514c9e7a..0000000000
--- a/tests/qemuargv2xmldata/hostdev-usb-address.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/hyperv-panic.args b/tests/qemuargv2xmldata/hyperv-panic.args
deleted file mode 100644
index aebba47a63..0000000000
--- a/tests/qemuargv2xmldata/hyperv-panic.args
+++ /dev/null
@@ -1,21 +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 \
--cpu qemu32,hv_crash \
--m 214 \
--smp 6 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
--monitor unix:/tmp/test-monitor,server,nowait \
--boot n \
--usb \
--net none \
--serial none \
--parallel none
diff --git a/tests/qemuargv2xmldata/hyperv-panic.xml b/tests/qemuargv2xmldata/hyperv-panic.xml
deleted file mode 100644
index 41315b49f2..0000000000
--- a/tests/qemuargv2xmldata/hyperv-panic.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 219136
- 219136
- 6
-
- hvm
-
-
-
-
-
-
- destroy
- restart
- destroy
-
- /usr/bin/qemu-system-i686
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/qemuargv2xmldata/hyperv.args b/tests/qemuargv2xmldata/hyperv.args
deleted file mode 100644
index bb175a6dc6..0000000000
--- a/tests/qemuargv2xmldata/hyperv.args
+++ /dev/null
@@ -1,21 +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 \
--cpu qemu32,hv_relaxed,hv_vapic,hv_spinlocks=0x2fff \
--m 214 \
--smp 6 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
--monitor unix:/tmp/test-monitor,server,nowait \
--boot n \
--usb \
--net none \
--serial none \
--parallel none
diff --git a/tests/qemuargv2xmldata/hyperv.xml b/tests/qemuargv2xmldata/hyperv.xml
deleted file mode 100644
index 3a7e381f36..0000000000
--- a/tests/qemuargv2xmldata/hyperv.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 219136
- 219136
- 6
-
- hvm
-
-
-
-
-
-
-
-
-
-
-
- destroy
- restart
- destroy
-
- /usr/bin/qemu-system-i686
-
-
-
-
-
-
-
-
-
diff --git a/tests/qemuargv2xmldata/input-usbmouse.args b/tests/qemuargv2xmldata/input-usbmouse.args
deleted file mode 100644
index 3f332cc7ac..0000000000
--- a/tests/qemuargv2xmldata/input-usbmouse.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 \
--net none \
--serial none \
--parallel none \
--usbdevice mouse
diff --git a/tests/qemuargv2xmldata/input-usbmouse.xml b/tests/qemuargv2xmldata/input-usbmouse.xml
deleted file mode 100644
index 8c44bd12c2..0000000000
--- a/tests/qemuargv2xmldata/input-usbmouse.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/input-usbtablet.args b/tests/qemuargv2xmldata/input-usbtablet.args
deleted file mode 100644
index 90e667be54..0000000000
--- a/tests/qemuargv2xmldata/input-usbtablet.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 \
--net none \
--serial none \
--parallel none \
--usbdevice tablet
diff --git a/tests/qemuargv2xmldata/input-usbtablet.xml b/tests/qemuargv2xmldata/input-usbtablet.xml
deleted file mode 100644
index 0bdb42a815..0000000000
--- a/tests/qemuargv2xmldata/input-usbtablet.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/kvm-features.args b/tests/qemuargv2xmldata/kvm-features.args
deleted file mode 100644
index 2e9ad729e9..0000000000
--- a/tests/qemuargv2xmldata/kvm-features.args
+++ /dev/null
@@ -1,21 +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 \
--cpu qemu32,kvm=off \
--m 214 \
--smp 6 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
--monitor unix:/tmp/test-monitor,server,nowait \
--boot n \
--usb \
--net none \
--serial none \
--parallel none
diff --git a/tests/qemuargv2xmldata/kvm-features.xml b/tests/qemuargv2xmldata/kvm-features.xml
deleted file mode 100644
index 8af14fc7ee..0000000000
--- a/tests/qemuargv2xmldata/kvm-features.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 219136
- 219136
- 6
-
- hvm
-
-
-
-
-
-
-
-
-
- destroy
- restart
- destroy
-
- /usr/bin/qemu-system-i686
-
-
-
-
-
-
-
-
-
diff --git a/tests/qemuargv2xmldata/kvmclock.args b/tests/qemuargv2xmldata/kvmclock.args
deleted file mode 100644
index 17e6d07b06..0000000000
--- a/tests/qemuargv2xmldata/kvmclock.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,accel=kvm \
--cpu qemu32,-kvmclock \
--m 214 \
--smp 6 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
--monitor unix:/tmp/test-monitor,server,nowait \
--no-acpi \
--boot n \
--usb \
--net none \
--serial none \
--parallel none
diff --git a/tests/qemuargv2xmldata/kvmclock.xml b/tests/qemuargv2xmldata/kvmclock.xml
deleted file mode 100644
index e960a2fb2b..0000000000
--- a/tests/qemuargv2xmldata/kvmclock.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 219136
- 219136
- 6
-
- hvm
-
-
-
-
-
-
-
-
- destroy
- restart
- destroy
-
- /usr/bin/qemu-system-i686
-
-
-
-
-
-
-
-
-
diff --git a/tests/qemuargv2xmldata/machine-aeskeywrap-off-argv.args b/tests/qemuargv2xmldata/machine-aeskeywrap-off-argv.args
deleted file mode 100644
index ed883520ee..0000000000
--- a/tests/qemuargv2xmldata/machine-aeskeywrap-off-argv.args
+++ /dev/null
@@ -1,18 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/home/test \
-USER=test \
-LOGNAME=test \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-s390x \
--name QEMUGuest1 \
--S \
--machine s390-ccw-virtio,accel=tcg,aes-key-wrap=off \
--m 214 \
--smp 1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
--nodefaults \
--monitor unix:/tmp/test-monitor,server,nowait \
--no-acpi \
--boot c
diff --git a/tests/qemuargv2xmldata/machine-aeskeywrap-off-argv.xml b/tests/qemuargv2xmldata/machine-aeskeywrap-off-argv.xml
deleted file mode 100644
index 7c100a7449..0000000000
--- a/tests/qemuargv2xmldata/machine-aeskeywrap-off-argv.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 219136
- 219136
- 1
-
- hvm
-
-
-
- destroy
- restart
- destroy
-
- /usr/bin/qemu-system-s390x
-
-
-
-
-
-
-
diff --git a/tests/qemuargv2xmldata/machine-aeskeywrap-on-argv.args b/tests/qemuargv2xmldata/machine-aeskeywrap-on-argv.args
deleted file mode 100644
index 99f58f0a87..0000000000
--- a/tests/qemuargv2xmldata/machine-aeskeywrap-on-argv.args
+++ /dev/null
@@ -1,18 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/home/test \
-USER=test \
-LOGNAME=test \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-s390x \
--name QEMUGuest1 \
--S \
--machine s390-ccw-virtio,accel=tcg,aes-key-wrap=on \
--m 214 \
--smp 1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
--nodefaults \
--monitor unix:/tmp/test-monitor,server,nowait \
--no-acpi \
--boot c
diff --git a/tests/qemuargv2xmldata/machine-aeskeywrap-on-argv.xml b/tests/qemuargv2xmldata/machine-aeskeywrap-on-argv.xml
deleted file mode 100644
index 94bb6b2559..0000000000
--- a/tests/qemuargv2xmldata/machine-aeskeywrap-on-argv.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 219136
- 219136
- 1
-
- hvm
-
-
-
- destroy
- restart
- destroy
-
- /usr/bin/qemu-system-s390x
-
-
-
-
-
-
-
diff --git a/tests/qemuargv2xmldata/machine-core-off.args b/tests/qemuargv2xmldata/machine-core-off.args
deleted file mode 100644
index 44b3b3205c..0000000000
--- a/tests/qemuargv2xmldata/machine-core-off.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 \
--machine pc,accel=tcg,dump-guest-core=off \
--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/machine-core-off.xml b/tests/qemuargv2xmldata/machine-core-off.xml
deleted file mode 100644
index 766b10ff77..0000000000
--- a/tests/qemuargv2xmldata/machine-core-off.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/machine-core-on.args b/tests/qemuargv2xmldata/machine-core-on.args
deleted file mode 100644
index 313c42d408..0000000000
--- a/tests/qemuargv2xmldata/machine-core-on.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 \
--machine pc,accel=tcg,dump-guest-core=on \
--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/machine-core-on.xml b/tests/qemuargv2xmldata/machine-core-on.xml
deleted file mode 100644
index d4f45b5f0f..0000000000
--- a/tests/qemuargv2xmldata/machine-core-on.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/machine-deakeywrap-off-argv.args b/tests/qemuargv2xmldata/machine-deakeywrap-off-argv.args
deleted file mode 100644
index 2ffd45e351..0000000000
--- a/tests/qemuargv2xmldata/machine-deakeywrap-off-argv.args
+++ /dev/null
@@ -1,18 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/home/test \
-USER=test \
-LOGNAME=test \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-s390x \
--name QEMUGuest1 \
--S \
--machine s390-ccw-virtio,accel=tcg,dea-key-wrap=off \
--m 214 \
--smp 1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
--nodefaults \
--monitor unix:/tmp/test-monitor,server,nowait \
--no-acpi \
--boot c
diff --git a/tests/qemuargv2xmldata/machine-deakeywrap-off-argv.xml b/tests/qemuargv2xmldata/machine-deakeywrap-off-argv.xml
deleted file mode 100644
index a707ce310b..0000000000
--- a/tests/qemuargv2xmldata/machine-deakeywrap-off-argv.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 219136
- 219136
- 1
-
- hvm
-
-
-
- destroy
- restart
- destroy
-
- /usr/bin/qemu-system-s390x
-
-
-
-
-
-
-
diff --git a/tests/qemuargv2xmldata/machine-deakeywrap-on-argv.args b/tests/qemuargv2xmldata/machine-deakeywrap-on-argv.args
deleted file mode 100644
index c0102ed36f..0000000000
--- a/tests/qemuargv2xmldata/machine-deakeywrap-on-argv.args
+++ /dev/null
@@ -1,18 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/home/test \
-USER=test \
-LOGNAME=test \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-s390x \
--name QEMUGuest1 \
--S \
--machine s390-ccw-virtio,accel=tcg,dea-key-wrap=on \
--m 214 \
--smp 1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
--nodefaults \
--monitor unix:/tmp/test-monitor,server,nowait \
--no-acpi \
--boot c
diff --git a/tests/qemuargv2xmldata/machine-deakeywrap-on-argv.xml b/tests/qemuargv2xmldata/machine-deakeywrap-on-argv.xml
deleted file mode 100644
index 41c464a4ad..0000000000
--- a/tests/qemuargv2xmldata/machine-deakeywrap-on-argv.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 219136
- 219136
- 1
-
- hvm
-
-
-
- destroy
- restart
- destroy
-
- /usr/bin/qemu-system-s390x
-
-
-
-
-
-
-
diff --git a/tests/qemuargv2xmldata/machine-keywrap-none-argv.args b/tests/qemuargv2xmldata/machine-keywrap-none-argv.args
deleted file mode 100644
index 0bf57fc6d3..0000000000
--- a/tests/qemuargv2xmldata/machine-keywrap-none-argv.args
+++ /dev/null
@@ -1,18 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/home/test \
-USER=test \
-LOGNAME=test \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-s390x \
--name QEMUGuest1 \
--S \
--machine s390-ccw-virtio,accel=tcg \
--m 214 \
--smp 1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
--nodefaults \
--monitor unix:/tmp/test-monitor,server,nowait \
--no-acpi \
--boot c
diff --git a/tests/qemuargv2xmldata/machine-keywrap-none-argv.xml b/tests/qemuargv2xmldata/machine-keywrap-none-argv.xml
deleted file mode 100644
index 0b0ce70be5..0000000000
--- a/tests/qemuargv2xmldata/machine-keywrap-none-argv.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 219136
- 219136
- 1
-
- hvm
-
-
-
- destroy
- restart
- destroy
-
- /usr/bin/qemu-system-s390x
-
-
-
-
diff --git a/tests/qemuargv2xmldata/mem-scale-maxmemory.args b/tests/qemuargv2xmldata/mem-scale-maxmemory.args
deleted file mode 100644
index 44f8590c9b..0000000000
--- a/tests/qemuargv2xmldata/mem-scale-maxmemory.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 size=8G,slots=16,maxmem=16G \
--smp 1,maxcpus=2,sockets=2,cores=1,threads=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/mem-scale-maxmemory.xml b/tests/qemuargv2xmldata/mem-scale-maxmemory.xml
deleted file mode 100644
index 44431d8f5a..0000000000
--- a/tests/qemuargv2xmldata/mem-scale-maxmemory.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 16777216
- 8388608
- 8388608
- 2
-
- hvm
-
-
-
-
-
-
- destroy
- restart
- destroy
-
- /usr/bin/qemu-system-i686
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/qemuargv2xmldata/mem-scale.args b/tests/qemuargv2xmldata/mem-scale.args
deleted file mode 100644
index f405215766..0000000000
--- a/tests/qemuargv2xmldata/mem-scale.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 2G \
--smp 1,maxcpus=2,sockets=2,cores=1,threads=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/mem-scale.xml b/tests/qemuargv2xmldata/mem-scale.xml
deleted file mode 100644
index d84104937b..0000000000
--- a/tests/qemuargv2xmldata/mem-scale.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 2097152
- 2097152
- 2
-
- hvm
-
-
-
-
-
-
- destroy
- restart
- destroy
-
- /usr/bin/qemu-system-i686
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/qemuargv2xmldata/migrate.args b/tests/qemuargv2xmldata/migrate.args
deleted file mode 100644
index d9dc1f62ea..0000000000
--- a/tests/qemuargv2xmldata/migrate.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 \
--net none \
--serial none \
--parallel none \
--incoming tcp:10.0.0.1:5000
diff --git a/tests/qemuargv2xmldata/migrate.xml b/tests/qemuargv2xmldata/migrate.xml
deleted file mode 100644
index c283fd7f00..0000000000
--- a/tests/qemuargv2xmldata/migrate.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/misc-acpi.args b/tests/qemuargv2xmldata/misc-acpi.args
deleted file mode 100644
index a18f9c8a81..0000000000
--- a/tests/qemuargv2xmldata/misc-acpi.args
+++ /dev/null
@@ -1,21 +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 \
--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/misc-acpi.xml b/tests/qemuargv2xmldata/misc-acpi.xml
deleted file mode 100644
index aa4a9c0cef..0000000000
--- a/tests/qemuargv2xmldata/misc-acpi.xml
+++ /dev/null
@@ -1,37 +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/misc-disable-s3.args b/tests/qemuargv2xmldata/misc-disable-s3.args
deleted file mode 100644
index aca607bcb1..0000000000
--- a/tests/qemuargv2xmldata/misc-disable-s3.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 8caaa98c-e7bf-5845-126a-1fc316bd1089 \
--nographic \
--monitor unix:/tmp/test-monitor,server,nowait \
--no-acpi \
--global PIIX4_PM.disable_s3=1 \
--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/misc-disable-s3.xml b/tests/qemuargv2xmldata/misc-disable-s3.xml
deleted file mode 100644
index 3c1d123992..0000000000
--- a/tests/qemuargv2xmldata/misc-disable-s3.xml
+++ /dev/null
@@ -1,37 +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/misc-disable-suspends.args b/tests/qemuargv2xmldata/misc-disable-suspends.args
deleted file mode 100644
index 9c466be7fc..0000000000
--- a/tests/qemuargv2xmldata/misc-disable-suspends.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 8caaa98c-e7bf-5845-126a-1fc316bd1089 \
--nographic \
--monitor unix:/tmp/test-monitor,server,nowait \
--no-acpi \
--global PIIX4_PM.disable_s3=1 \
--global PIIX4_PM.disable_s4=1 \
--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/misc-disable-suspends.xml b/tests/qemuargv2xmldata/misc-disable-suspends.xml
deleted file mode 100644
index 4c64b520bc..0000000000
--- a/tests/qemuargv2xmldata/misc-disable-suspends.xml
+++ /dev/null
@@ -1,38 +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/misc-enable-s4.args b/tests/qemuargv2xmldata/misc-enable-s4.args
deleted file mode 100644
index 6f62b15905..0000000000
--- a/tests/qemuargv2xmldata/misc-enable-s4.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 8caaa98c-e7bf-5845-126a-1fc316bd1089 \
--nographic \
--monitor unix:/tmp/test-monitor,server,nowait \
--no-acpi \
--global PIIX4_PM.disable_s4=0 \
--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/misc-enable-s4.xml b/tests/qemuargv2xmldata/misc-enable-s4.xml
deleted file mode 100644
index 6b0801944c..0000000000
--- a/tests/qemuargv2xmldata/misc-enable-s4.xml
+++ /dev/null
@@ -1,37 +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/misc-no-reboot.args b/tests/qemuargv2xmldata/misc-no-reboot.args
deleted file mode 100644
index cef4808969..0000000000
--- a/tests/qemuargv2xmldata/misc-no-reboot.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-reboot \
--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/misc-no-reboot.xml b/tests/qemuargv2xmldata/misc-no-reboot.xml
deleted file mode 100644
index 43d0399382..0000000000
--- a/tests/qemuargv2xmldata/misc-no-reboot.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 219136
- 219136
- 1
-
- hvm
-
-
-
- destroy
- destroy
- destroy
-
- /usr/bin/qemu-system-i686
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/qemuargv2xmldata/misc-uuid.args b/tests/qemuargv2xmldata/misc-uuid.args
deleted file mode 100644
index a18f9c8a81..0000000000
--- a/tests/qemuargv2xmldata/misc-uuid.args
+++ /dev/null
@@ -1,21 +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 \
--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/misc-uuid.xml b/tests/qemuargv2xmldata/misc-uuid.xml
deleted file mode 100644
index aa4a9c0cef..0000000000
--- a/tests/qemuargv2xmldata/misc-uuid.xml
+++ /dev/null
@@ -1,37 +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/net-eth-ifname.args b/tests/qemuargv2xmldata/net-eth-ifname.args
deleted file mode 100644
index 4d74ae400e..0000000000
--- a/tests/qemuargv2xmldata/net-eth-ifname.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 \
--net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139,name=net0 \
--net tap,ifname=nic02,script=/etc/qemu-ifup,vlan=0,name=hostnet0 \
--serial none \
--parallel none
diff --git a/tests/qemuargv2xmldata/net-eth-ifname.xml b/tests/qemuargv2xmldata/net-eth-ifname.xml
deleted file mode 100644
index fa9a892dbc..0000000000
--- a/tests/qemuargv2xmldata/net-eth-ifname.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/net-eth.args b/tests/qemuargv2xmldata/net-eth.args
deleted file mode 100644
index 89eb4c13d4..0000000000
--- a/tests/qemuargv2xmldata/net-eth.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 \
--net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139,name=net0 \
--net tap,script=/etc/qemu-ifup,vlan=0,name=hostnet0 \
--serial none \
--parallel none
diff --git a/tests/qemuargv2xmldata/net-eth.xml b/tests/qemuargv2xmldata/net-eth.xml
deleted file mode 100644
index 57c4be83f1..0000000000
--- a/tests/qemuargv2xmldata/net-eth.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/net-user.args b/tests/qemuargv2xmldata/net-user.args
deleted file mode 100644
index 965c1bc94a..0000000000
--- a/tests/qemuargv2xmldata/net-user.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 \
--net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139,name=net0 \
--net user,vlan=0,name=hostnet0 \
--serial none \
--parallel none
diff --git a/tests/qemuargv2xmldata/net-user.xml b/tests/qemuargv2xmldata/net-user.xml
deleted file mode 100644
index 039c1ed9b3..0000000000
--- a/tests/qemuargv2xmldata/net-user.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/net-virtio.args b/tests/qemuargv2xmldata/net-virtio.args
deleted file mode 100644
index 4c161b5214..0000000000
--- a/tests/qemuargv2xmldata/net-virtio.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 \
--net nic,macaddr=00:11:22:33:44:55,vlan=0,model=virtio,name=net0 \
--net user,vlan=0,name=hostnet0 \
--serial none \
--parallel none
diff --git a/tests/qemuargv2xmldata/net-virtio.xml b/tests/qemuargv2xmldata/net-virtio.xml
deleted file mode 100644
index b7510a2df4..0000000000
--- a/tests/qemuargv2xmldata/net-virtio.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/nographics-vga-display.args b/tests/qemuargv2xmldata/nographics-vga-display.args
deleted file mode 100644
index 8ea25b7778..0000000000
--- a/tests/qemuargv2xmldata/nographics-vga-display.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 \
--display none \
--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 \
--vga none
diff --git a/tests/qemuargv2xmldata/nographics-vga-display.xml b/tests/qemuargv2xmldata/nographics-vga-display.xml
deleted file mode 100644
index c283fd7f00..0000000000
--- a/tests/qemuargv2xmldata/nographics-vga-display.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/nographics-vga.args b/tests/qemuargv2xmldata/nographics-vga.args
deleted file mode 100644
index f770067f68..0000000000
--- a/tests/qemuargv2xmldata/nographics-vga.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 \
--net none \
--serial none \
--parallel none \
--vga none
diff --git a/tests/qemuargv2xmldata/nographics-vga.xml b/tests/qemuargv2xmldata/nographics-vga.xml
deleted file mode 100644
index c283fd7f00..0000000000
--- a/tests/qemuargv2xmldata/nographics-vga.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/nomachine-ppc64.args b/tests/qemuargv2xmldata/nomachine-ppc64.args
deleted file mode 100644
index ac618775e2..0000000000
--- a/tests/qemuargv2xmldata/nomachine-ppc64.args
+++ /dev/null
@@ -1,11 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/home/test \
-USER=test \
-LOGNAME=test \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-ppc64 \
--name QEMUGuest1 \
--m 512 \
--hda /dev/HostVG/QEMUGuest1 \
--cdrom /root/boot.iso
diff --git a/tests/qemuargv2xmldata/nomachine-ppc64.xml b/tests/qemuargv2xmldata/nomachine-ppc64.xml
deleted file mode 100644
index 18b0c5c20a..0000000000
--- a/tests/qemuargv2xmldata/nomachine-ppc64.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 524288
- 524288
- 1
-
- hvm
-
-
-
- destroy
- restart
- destroy
-
- /usr/bin/qemu-system-ppc64
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/qemuargv2xmldata/nomachine-x86_64.args b/tests/qemuargv2xmldata/nomachine-x86_64.args
deleted file mode 100644
index 22bc4fb1cc..0000000000
--- a/tests/qemuargv2xmldata/nomachine-x86_64.args
+++ /dev/null
@@ -1,11 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/home/test \
-USER=test \
-LOGNAME=test \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name QEMUGuest1 \
--m 512 \
--hda /dev/HostVG/QEMUGuest1 \
--cdrom /root/boot.iso
diff --git a/tests/qemuargv2xmldata/nomachine-x86_64.xml b/tests/qemuargv2xmldata/nomachine-x86_64.xml
deleted file mode 100644
index 6863c8f5f4..0000000000
--- a/tests/qemuargv2xmldata/nomachine-x86_64.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 524288
- 524288
- 1
-
- hvm
-
-
-
-
-
-
- destroy
- restart
- destroy
-
- /usr/bin/qemu-system-x86_64
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/qemuargv2xmldata/nosharepages.args b/tests/qemuargv2xmldata/nosharepages.args
deleted file mode 100644
index db804431e5..0000000000
--- a/tests/qemuargv2xmldata/nosharepages.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 \
--machine pc,accel=tcg,mem-merge=off \
--m 215 \
--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/nosharepages.xml b/tests/qemuargv2xmldata/nosharepages.xml
deleted file mode 100644
index 81b4a039b2..0000000000
--- a/tests/qemuargv2xmldata/nosharepages.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 220160
- 220160
-
-
-
- 1
-
- hvm
-
-
-
- destroy
- restart
- destroy
-
- /usr/bin/qemu-system-i686
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/qemuargv2xmldata/parallel-tcp.args b/tests/qemuargv2xmldata/parallel-tcp.args
deleted file mode 100644
index 153d575be0..0000000000
--- a/tests/qemuargv2xmldata/parallel-tcp.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 tcp:127.0.0.1:9999,server,nowait
diff --git a/tests/qemuargv2xmldata/parallel-tcp.xml b/tests/qemuargv2xmldata/parallel-tcp.xml
deleted file mode 100644
index 82c1f9a5d8..0000000000
--- a/tests/qemuargv2xmldata/parallel-tcp.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/pseries-disk.args b/tests/qemuargv2xmldata/pseries-disk.args
deleted file mode 100644
index 2dd5f1c09f..0000000000
--- a/tests/qemuargv2xmldata/pseries-disk.args
+++ /dev/null
@@ -1,18 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/home/test \
-USER=test \
-LOGNAME=test \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-ppc64 \
--name QEMUGuest1 \
--S \
--M pseries \
--m 512 \
--smp 1 \
--no-acpi \
--boot c \
--usb \
--boot c \
--hda /dev/HostVG/QEMUGuest1 \
--cdrom /root/boot.iso
diff --git a/tests/qemuargv2xmldata/pseries-disk.xml b/tests/qemuargv2xmldata/pseries-disk.xml
deleted file mode 100644
index 18b0c5c20a..0000000000
--- a/tests/qemuargv2xmldata/pseries-disk.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 524288
- 524288
- 1
-
- hvm
-
-
-
- destroy
- restart
- destroy
-
- /usr/bin/qemu-system-ppc64
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/qemuargv2xmldata/pseries-nvram.args b/tests/qemuargv2xmldata/pseries-nvram.args
deleted file mode 100644
index 1878d9a896..0000000000
--- a/tests/qemuargv2xmldata/pseries-nvram.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-ppc64 \
--name QEMUGuest1 \
--S \
--M pseries \
--m 512 \
--smp 1 \
--uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
--nographic \
--monitor unix:/tmp/test-monitor,server,nowait \
--no-acpi \
--boot c \
--usb \
--net none \
--serial none \
--parallel none \
--global spapr-nvram.reg=0x4000
diff --git a/tests/qemuargv2xmldata/pseries-nvram.xml b/tests/qemuargv2xmldata/pseries-nvram.xml
deleted file mode 100644
index 500227afc0..0000000000
--- a/tests/qemuargv2xmldata/pseries-nvram.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 524288
- 524288
- 1
-
- hvm
-
-
-
- destroy
- restart
- destroy
-
- /usr/bin/qemu-system-ppc64
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/qemuargv2xmldata/qemu-ns-no-env.args b/tests/qemuargv2xmldata/qemu-ns-no-env.args
deleted file mode 100644
index 4da7e40b08..0000000000
--- a/tests/qemuargv2xmldata/qemu-ns-no-env.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 \
--net none \
--serial none \
--parallel none \
--unknown parameter
diff --git a/tests/qemuargv2xmldata/qemu-ns-no-env.xml b/tests/qemuargv2xmldata/qemu-ns-no-env.xml
deleted file mode 100644
index cc5bd18800..0000000000
--- a/tests/qemuargv2xmldata/qemu-ns-no-env.xml
+++ /dev/null
@@ -1,38 +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/reboot-timeout-disabled.args b/tests/qemuargv2xmldata/reboot-timeout-disabled.args
deleted file mode 100644
index 52437e3d60..0000000000
--- a/tests/qemuargv2xmldata/reboot-timeout-disabled.args
+++ /dev/null
@@ -1,21 +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 6 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
--monitor unix:/tmp/test-monitor,server,nowait \
--no-acpi \
--boot order=n,reboot-timeout=-1 \
--usb \
--net none \
--serial none \
--parallel none
diff --git a/tests/qemuargv2xmldata/reboot-timeout-disabled.xml b/tests/qemuargv2xmldata/reboot-timeout-disabled.xml
deleted file mode 100644
index ccc90e9fce..0000000000
--- a/tests/qemuargv2xmldata/reboot-timeout-disabled.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 219136
- 219136
- 6
-
- hvm
-
-
-
-
- destroy
- restart
- destroy
-
- /usr/bin/qemu-system-i686
-
-
-
-
-
-
-
-
-
diff --git a/tests/qemuargv2xmldata/reboot-timeout-enabled.args b/tests/qemuargv2xmldata/reboot-timeout-enabled.args
deleted file mode 100644
index 159a2bda43..0000000000
--- a/tests/qemuargv2xmldata/reboot-timeout-enabled.args
+++ /dev/null
@@ -1,21 +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 6 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
--monitor unix:/tmp/test-monitor,server,nowait \
--no-acpi \
--boot order=n,reboot-timeout=128 \
--usb \
--net none \
--serial none \
--parallel none
diff --git a/tests/qemuargv2xmldata/reboot-timeout-enabled.xml b/tests/qemuargv2xmldata/reboot-timeout-enabled.xml
deleted file mode 100644
index 215b9a7bb4..0000000000
--- a/tests/qemuargv2xmldata/reboot-timeout-enabled.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 219136
- 219136
- 6
-
- hvm
-
-
-
-
- destroy
- restart
- destroy
-
- /usr/bin/qemu-system-i686
-
-
-
-
-
-
-
-
-
diff --git a/tests/qemuargv2xmldata/restore-v2.args b/tests/qemuargv2xmldata/restore-v2.args
deleted file mode 100644
index 947117728b..0000000000
--- a/tests/qemuargv2xmldata/restore-v2.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 \
--net none \
--serial none \
--parallel none \
--incoming exec:cat
diff --git a/tests/qemuargv2xmldata/restore-v2.xml b/tests/qemuargv2xmldata/restore-v2.xml
deleted file mode 100644
index c283fd7f00..0000000000
--- a/tests/qemuargv2xmldata/restore-v2.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/serial-dev.args b/tests/qemuargv2xmldata/serial-dev.args
deleted file mode 100644
index 3182ce0bf3..0000000000
--- a/tests/qemuargv2xmldata/serial-dev.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 /dev/ttyS2 \
--parallel none
diff --git a/tests/qemuargv2xmldata/serial-dev.xml b/tests/qemuargv2xmldata/serial-dev.xml
deleted file mode 100644
index e9998d5542..0000000000
--- a/tests/qemuargv2xmldata/serial-dev.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/serial-file.args b/tests/qemuargv2xmldata/serial-file.args
deleted file mode 100644
index afb1e0ca49..0000000000
--- a/tests/qemuargv2xmldata/serial-file.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 file:/tmp/serial.log \
--parallel none
diff --git a/tests/qemuargv2xmldata/serial-file.xml b/tests/qemuargv2xmldata/serial-file.xml
deleted file mode 100644
index 0e9dfe5789..0000000000
--- a/tests/qemuargv2xmldata/serial-file.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/serial-many.args b/tests/qemuargv2xmldata/serial-many.args
deleted file mode 100644
index 27fe413e99..0000000000
--- a/tests/qemuargv2xmldata/serial-many.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 \
--net none \
--serial pty \
--serial file:/tmp/serial.log \
--parallel none
diff --git a/tests/qemuargv2xmldata/serial-many.xml b/tests/qemuargv2xmldata/serial-many.xml
deleted file mode 100644
index 05374b38da..0000000000
--- a/tests/qemuargv2xmldata/serial-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/qemuargv2xmldata/serial-pty.args b/tests/qemuargv2xmldata/serial-pty.args
deleted file mode 100644
index eba5b21760..0000000000
--- a/tests/qemuargv2xmldata/serial-pty.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/serial-pty.xml b/tests/qemuargv2xmldata/serial-pty.xml
deleted file mode 100644
index cba43ca451..0000000000
--- a/tests/qemuargv2xmldata/serial-pty.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/serial-tcp-telnet.args b/tests/qemuargv2xmldata/serial-tcp-telnet.args
deleted file mode 100644
index 5d0d2a1bca..0000000000
--- a/tests/qemuargv2xmldata/serial-tcp-telnet.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 telnet:127.0.0.1:9999,server,nowait \
--parallel none
diff --git a/tests/qemuargv2xmldata/serial-tcp-telnet.xml b/tests/qemuargv2xmldata/serial-tcp-telnet.xml
deleted file mode 100644
index 1ac12440e2..0000000000
--- a/tests/qemuargv2xmldata/serial-tcp-telnet.xml
+++ /dev/null
@@ -1,46 +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/serial-tcp.args b/tests/qemuargv2xmldata/serial-tcp.args
deleted file mode 100644
index 7428c86347..0000000000
--- a/tests/qemuargv2xmldata/serial-tcp.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 tcp:127.0.0.1:9999 \
--parallel none
diff --git a/tests/qemuargv2xmldata/serial-tcp.xml b/tests/qemuargv2xmldata/serial-tcp.xml
deleted file mode 100644
index c10cee903b..0000000000
--- a/tests/qemuargv2xmldata/serial-tcp.xml
+++ /dev/null
@@ -1,46 +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/serial-udp.args b/tests/qemuargv2xmldata/serial-udp.args
deleted file mode 100644
index c6d9e1b8a5..0000000000
--- a/tests/qemuargv2xmldata/serial-udp.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 \
--net none \
--serial udp:127.0.0.1:9998@127.0.0.1:9999 \
--serial udp::9999@:0 \
--parallel none
diff --git a/tests/qemuargv2xmldata/serial-udp.xml b/tests/qemuargv2xmldata/serial-udp.xml
deleted file mode 100644
index fd56dda84c..0000000000
--- a/tests/qemuargv2xmldata/serial-udp.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/serial-unix.args b/tests/qemuargv2xmldata/serial-unix.args
deleted file mode 100644
index 592673c0f1..0000000000
--- a/tests/qemuargv2xmldata/serial-unix.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 unix:/tmp/serial.sock \
--parallel none
diff --git a/tests/qemuargv2xmldata/serial-unix.xml b/tests/qemuargv2xmldata/serial-unix.xml
deleted file mode 100644
index 70b192f671..0000000000
--- a/tests/qemuargv2xmldata/serial-unix.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/serial-vc.args b/tests/qemuargv2xmldata/serial-vc.args
deleted file mode 100644
index dab722502b..0000000000
--- a/tests/qemuargv2xmldata/serial-vc.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 vc \
--parallel none
diff --git a/tests/qemuargv2xmldata/serial-vc.xml b/tests/qemuargv2xmldata/serial-vc.xml
deleted file mode 100644
index 630844ea0f..0000000000
--- a/tests/qemuargv2xmldata/serial-vc.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/smp.args b/tests/qemuargv2xmldata/smp.args
deleted file mode 100644
index 9fa9c5e88d..0000000000
--- a/tests/qemuargv2xmldata/smp.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,maxcpus=2,sockets=2,cores=1,threads=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/smp.xml b/tests/qemuargv2xmldata/smp.xml
deleted file mode 100644
index a987437921..0000000000
--- a/tests/qemuargv2xmldata/smp.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 219136
- 219136
- 2
-
- hvm
-
-
-
-
-
-
- destroy
- restart
- destroy
-
- /usr/bin/qemu-system-i686
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/qemuargv2xmldata/sound.args b/tests/qemuargv2xmldata/sound.args
deleted file mode 100644
index 778114d307..0000000000
--- a/tests/qemuargv2xmldata/sound.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 \
--net none \
--serial none \
--parallel none \
--soundhw pcspk,es1370,sb16,ac97
diff --git a/tests/qemuargv2xmldata/sound.xml b/tests/qemuargv2xmldata/sound.xml
deleted file mode 100644
index 1f852b0cc5..0000000000
--- a/tests/qemuargv2xmldata/sound.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/watchdog.args b/tests/qemuargv2xmldata/watchdog.args
deleted file mode 100644
index 0fe69c454c..0000000000
--- a/tests/qemuargv2xmldata/watchdog.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 \
--net none \
--serial none \
--parallel none \
--watchdog ib700 \
--watchdog-action poweroff
diff --git a/tests/qemuargv2xmldata/watchdog.xml b/tests/qemuargv2xmldata/watchdog.xml
deleted file mode 100644
index c29c3e1c54..0000000000
--- a/tests/qemuargv2xmldata/watchdog.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/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c
deleted file mode 100644
index 06e32898a2..0000000000
--- a/tests/qemuargv2xmltest.c
+++ /dev/null
@@ -1,323 +0,0 @@
-#include
-
-#include
-
-#include
-#include
-
-#include "testutils.h"
-
-#ifdef WITH_QEMU
-
-# include "internal.h"
-# include "qemu/qemu_parse_command.h"
-# include "testutilsqemu.h"
-# include "virstring.h"
-
-# define VIR_FROM_THIS VIR_FROM_NONE
-
-static virQEMUDriver driver;
-
-static int testSanitizeDef(virDomainDefPtr vmdef)
-{
- size_t i = 0;
- int ret = -1;
-
- /* Remove UUID randomness */
- if (virUUIDParse("c7a5fdbd-edaf-9455-926a-d65c16db1809", vmdef->uuid) < 0)
- goto fail;
-
- /* qemuargv2xml doesn't know what to set for a secret usage/uuid,
- * so hardcode usage='qemuargv2xml_usage' to appead the schema checker */
- for (i = 0; i < vmdef->ndisks; i++) {
- virDomainDiskDefPtr disk = vmdef->disks[i];
-
- if (disk->src->auth) {
- disk->src->auth->seclookupdef.type = VIR_SECRET_LOOKUP_TYPE_USAGE;
- if (VIR_STRDUP(disk->src->auth->seclookupdef.u.usage,
- "qemuargv2xml_usage") < 0)
- goto fail;
- }
- }
-
- ret = 0;
- fail:
- return ret;
-}
-
-typedef enum {
- FLAG_EXPECT_WARNING = 1 << 0,
-} virQemuXML2ArgvTestFlags;
-
-static int testCompareXMLToArgvFiles(const char *xmlfile,
- const char *cmdfile,
- virQemuXML2ArgvTestFlags flags)
-{
- char *actualxml = NULL;
- char *cmd = NULL;
- char *log = NULL;
- int ret = -1;
- virDomainDefPtr vmdef = NULL;
-
- if (virTestLoadFile(cmdfile, &cmd) < 0)
- goto fail;
-
- if (!(vmdef = qemuParseCommandLineString(driver.qemuCapsCache,
- driver.caps, driver.xmlopt,
- cmd, NULL, NULL, NULL)))
- goto fail;
-
- if (!virTestOOMActive()) {
- if ((log = virTestLogContentAndReset()) == NULL)
- goto fail;
- if (flags & FLAG_EXPECT_WARNING) {
- if (*log) {
- VIR_TEST_DEBUG("Got expected warning from "
- "qemuParseCommandLineString:\n%s",
- log);
- } else {
- VIR_TEST_DEBUG("qemuParseCommandLineString "
- "should have logged a warning\n");
- goto fail;
- }
- } else { /* didn't expect a warning */
- if (*log) {
- VIR_TEST_DEBUG("Got unexpected warning from "
- "qemuParseCommandLineString:\n%s",
- log);
- goto fail;
- }
- }
- }
-
- if (testSanitizeDef(vmdef) < 0)
- goto fail;
-
- if (!virDomainDefCheckABIStability(vmdef, vmdef, driver.xmlopt)) {
- VIR_TEST_DEBUG("ABI stability check failed on %s", xmlfile);
- goto fail;
- }
-
- if (!(actualxml = virDomainDefFormat(vmdef, driver.caps, 0)))
- goto fail;
-
- if (virTestCompareToFile(actualxml, xmlfile) < 0)
- goto fail;
-
- ret = 0;
-
- fail:
- VIR_FREE(actualxml);
- VIR_FREE(cmd);
- VIR_FREE(log);
- virDomainDefFree(vmdef);
- return ret;
-}
-
-
-struct testInfo {
- const char *name;
- unsigned int flags;
-};
-
-static int
-testCompareXMLToArgvHelper(const void *data)
-{
- int result = -1;
- const struct testInfo *info = data;
- char *xml = NULL;
- char *args = NULL;
-
- if (virAsprintf(&xml, "%s/qemuargv2xmldata/%s.xml",
- abs_srcdir, info->name) < 0 ||
- virAsprintf(&args, "%s/qemuargv2xmldata/%s.args",
- abs_srcdir, info->name) < 0)
- goto cleanup;
-
- result = testCompareXMLToArgvFiles(xml, args, info->flags);
-
- cleanup:
- VIR_FREE(xml);
- VIR_FREE(args);
- return result;
-}
-
-
-
-static int
-mymain(void)
-{
- int ret = 0;
-
- if (qemuTestDriverInit(&driver) < 0)
- return EXIT_FAILURE;
-
-# define LOAD_CAPS(arch) \
- do { \
- virQEMUCapsPtr qemuCaps; \
- qemuCaps = qemuTestParseCapabilitiesArch(VIR_ARCH_X86_64, \
- TEST_QEMU_CAPS_PATH "/caps_2.12.0." arch ".xml"); \
- if (virFileCacheInsertData(driver.qemuCapsCache, \
- "/usr/bin/qemu-system-" arch, \
- qemuCaps) < 0) \
- return EXIT_FAILURE; \
- } while (0)
-
- LOAD_CAPS("x86_64");
- LOAD_CAPS("aarch64");
- LOAD_CAPS("ppc64");
-
-# define DO_TEST_FULL(name, flags) \
- do { \
- const struct testInfo info = { name, (flags) }; \
- if (virTestRun("QEMU ARGV-2-XML " name, \
- testCompareXMLToArgvHelper, &info) < 0) \
- ret = -1; \
- } while (0)
-
-# define DO_TEST(name) \
- DO_TEST_FULL(name, 0)
-
- setenv("PATH", "/bin", 1);
- setenv("USER", "test", 1);
- setenv("LOGNAME", "test", 1);
- setenv("HOME", "/home/test", 1);
- unsetenv("TMPDIR");
- unsetenv("LD_PRELOAD");
- unsetenv("LD_LIBRARY_PATH");
-
- /* Can't roundtrip vcpu cpuset attribute */
- /*DO_TEST("minimal", QEMU_CAPS_NAME);*/
- DO_TEST("machine-core-on");
- DO_TEST("machine-core-off");
- DO_TEST("boot-cdrom");
- DO_TEST("boot-network");
- DO_TEST("boot-floppy");
- DO_TEST("kvmclock");
- /* This needs ./qemu.sh which doesn't work here. */
- /*DO_TEST("cpu-kvmclock");*/
-
- DO_TEST("reboot-timeout-enabled");
- DO_TEST("reboot-timeout-disabled");
-
- DO_TEST("clock-utc");
- DO_TEST("clock-localtime");
- DO_TEST("disk-cdrom");
- DO_TEST("disk-cdrom-empty");
- DO_TEST("disk-floppy");
- DO_TEST("disk-many");
- DO_TEST("disk-virtio");
- DO_TEST("disk-drive-boot-disk");
- DO_TEST("disk-drive-boot-cdrom");
- DO_TEST("disk-drive-fmt-qcow");
- DO_TEST("disk-drive-error-policy-stop");
- DO_TEST("disk-drive-error-policy-enospace");
- DO_TEST("disk-drive-error-policy-wreport-rignore");
- DO_TEST("disk-drive-cache-v2-wt");
- DO_TEST("disk-drive-cache-v2-wb");
- DO_TEST("disk-drive-cache-v2-none");
- DO_TEST("disk-drive-cache-directsync");
- DO_TEST("disk-drive-cache-unsafe");
- DO_TEST("disk-drive-network-nbd");
- DO_TEST("disk-drive-network-nbd-export");
- DO_TEST("disk-drive-network-nbd-ipv6");
- DO_TEST("disk-drive-network-nbd-ipv6-export");
- DO_TEST("disk-drive-network-nbd-unix");
- DO_TEST("disk-drive-network-iscsi");
- DO_TEST("disk-drive-network-iscsi-auth");
- DO_TEST("disk-drive-network-gluster");
- DO_TEST("disk-drive-network-rbd");
- DO_TEST("disk-drive-network-rbd-auth");
- DO_TEST("disk-drive-network-rbd-ipv6");
- /* older format using CEPH_ARGS env var */
- DO_TEST("disk-drive-network-rbd-ceph-env");
- DO_TEST("disk-drive-network-sheepdog");
- DO_TEST("disk-usb");
- DO_TEST("graphics-vnc");
- DO_TEST("graphics-vnc-socket");
- DO_TEST("graphics-vnc-websocket");
- DO_TEST("graphics-vnc-policy");
-
- DO_TEST("graphics-vnc-sasl");
- DO_TEST("graphics-vnc-tls");
-
- DO_TEST("graphics-sdl");
- DO_TEST("graphics-sdl-fullscreen");
- DO_TEST("nographics-vga");
- DO_TEST("nographics-vga-display");
- DO_TEST("input-usbmouse");
- DO_TEST("input-usbtablet");
- DO_TEST("misc-acpi");
- DO_TEST("misc-disable-s3");
- DO_TEST("misc-disable-suspends");
- DO_TEST("misc-enable-s4");
- DO_TEST("misc-no-reboot");
- DO_TEST("misc-uuid");
- DO_TEST("net-user");
- DO_TEST("net-virtio");
- DO_TEST("net-eth");
- DO_TEST("net-eth-ifname");
-
- DO_TEST("serial-vc");
- DO_TEST("serial-pty");
- DO_TEST("serial-dev");
- DO_TEST("serial-file");
- DO_TEST("serial-unix");
- DO_TEST("serial-tcp");
- DO_TEST("serial-udp");
- DO_TEST("serial-tcp-telnet");
- DO_TEST("serial-many");
- DO_TEST("parallel-tcp");
- DO_TEST("console-compat");
- DO_TEST("sound");
- DO_TEST("watchdog");
-
- DO_TEST("hostdev-usb-address");
-
- DO_TEST("hostdev-pci-address");
-
- DO_TEST("mem-scale");
- DO_TEST("mem-scale-maxmemory");
- DO_TEST("smp");
-
- DO_TEST("hyperv");
- DO_TEST("hyperv-panic");
-
- DO_TEST("kvm-features");
-
- DO_TEST("pseries-nvram");
- DO_TEST("pseries-disk");
-
- DO_TEST("nosharepages");
-
- DO_TEST("restore-v2");
- DO_TEST("migrate");
-
- DO_TEST_FULL("qemu-ns-no-env", FLAG_EXPECT_WARNING);
-
- DO_TEST("machine-aeskeywrap-on-argv");
- DO_TEST("machine-aeskeywrap-off-argv");
- DO_TEST("machine-deakeywrap-on-argv");
- DO_TEST("machine-deakeywrap-off-argv");
- DO_TEST("machine-keywrap-none-argv");
-
- DO_TEST("nomachine-x86_64");
- DO_TEST("nomachine-ppc64");
-
- qemuTestDriverFree(&driver);
-
- return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
-}
-
-VIR_TEST_MAIN_PRELOAD(mymain,
- abs_builddir "/.libs/qemucpumock.so")
-
-#else
-
-int
-main(void)
-{
- return EXIT_AM_SKIP;
-}
-
-#endif /* WITH_QEMU */
diff --git a/tests/virschematest.c b/tests/virschematest.c
index 13c30acc30..ff25f7781e 100644
--- a/tests/virschematest.c
+++ b/tests/virschematest.c
@@ -215,7 +215,7 @@ mymain(void)
} while (0)
DO_TEST_DIR("capability.rng", "capabilityschemadata", "vircaps2xmldata");
- DO_TEST_DIR("domain.rng", "domainschemadata", "qemuargv2xmldata",
+ DO_TEST_DIR("domain.rng", "domainschemadata",
"qemuxml2argvdata", "sexpr2xmldata", "xmconfigdata",
"xml2sexprdata", "qemuxml2xmloutdata", "lxcxml2xmldata",
"lxcxml2xmloutdata", "bhyvexml2argvdata", "genericxml2xmlindata",