diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c
index 4cc3749dab..0fc9fcb474 100644
--- a/tests/qemuargv2xmltest.c
+++ b/tests/qemuargv2xmltest.c
@@ -95,7 +95,6 @@ static int testCompareXMLToArgvFiles(const char *xml,
struct testInfo {
const char *name;
unsigned long long extraFlags;
- const char *migrateFrom;
};
static int
@@ -137,16 +136,16 @@ mymain(void)
if (!(driver.xmlopt = virQEMUDriverCreateXMLConf(&driver)))
return EXIT_FAILURE;
-# define DO_TEST_FULL(name, extraFlags, migrateFrom) \
+# define DO_TEST_FULL(name, extraFlags) \
do { \
- const struct testInfo info = { name, extraFlags, migrateFrom }; \
+ const struct testInfo info = { name, extraFlags }; \
if (virtTestRun("QEMU ARGV-2-XML " name, \
testCompareXMLToArgvHelper, &info) < 0) \
ret = -1; \
} while (0)
# define DO_TEST(name) \
- DO_TEST_FULL(name, 0, NULL)
+ DO_TEST_FULL(name, 0)
setenv("PATH", "/bin", 1);
setenv("USER", "test", 1);
@@ -264,12 +263,11 @@ mymain(void)
DO_TEST("nosharepages");
- DO_TEST_FULL("restore-v1", 0, "stdio");
- DO_TEST_FULL("restore-v2", 0, "stdio");
- DO_TEST_FULL("restore-v2", 0, "exec:cat");
- DO_TEST_FULL("migrate", 0, "tcp:10.0.0.1:5000");
+ DO_TEST("restore-v1");
+ DO_TEST("restore-v2");
+ DO_TEST("migrate");
- DO_TEST_FULL("qemu-ns-no-env", 1, NULL);
+ DO_TEST_FULL("qemu-ns-no-env", 1);
virObjectUnref(driver.config);
virObjectUnref(driver.caps);
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml
deleted file mode 100644
index 2c5a81a0a4..0000000000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 219100
- 219100
- 1
-
- hvm
-
-
-
- destroy
- restart
- destroy
-
- /usr/bin/qemu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-static-vcpu-no-numatune.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-static-vcpu-no-numatune.xml
deleted file mode 100644
index 71c1497aa9..0000000000
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-static-vcpu-no-numatune.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 219136
- 219136
- 2
-
- hvm
-
-
-
-
-
-
- destroy
- restart
- destroy
-
- /usr/bin/qemu
-
-
-
-
-
-
-
-
-
-