diff --git a/tests/qemuxml2argvdata/hugepages-default-2M.xml b/tests/qemuxml2argvdata/hugepages-default-2M.xml
index 296933c6f2..49d1f45c0d 100644
--- a/tests/qemuxml2argvdata/hugepages-default-2M.xml
+++ b/tests/qemuxml2argvdata/hugepages-default-2M.xml
@@ -13,13 +13,16 @@
hvm
+
+ qemu64
+
destroy
restart
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2argvdata/hugepages-default-system-size.xml b/tests/qemuxml2argvdata/hugepages-default-system-size.xml
index f9c99da400..7cb8078844 100644
--- a/tests/qemuxml2argvdata/hugepages-default-system-size.xml
+++ b/tests/qemuxml2argvdata/hugepages-default-system-size.xml
@@ -13,13 +13,16 @@
hvm
+
+ qemu64
+
destroy
restart
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2argvdata/hugepages-default.xml b/tests/qemuxml2argvdata/hugepages-default.xml
index de1006b7d7..9e4568bcf3 100644
--- a/tests/qemuxml2argvdata/hugepages-default.xml
+++ b/tests/qemuxml2argvdata/hugepages-default.xml
@@ -11,17 +11,27 @@
hvm
+
+ qemu64
+
destroy
restart
destroy
/usr/bin/qemu-system-x86_64
-
-
+
+
+
+
+
+
-
+
+
+
+
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.xml b/tests/qemuxml2argvdata/hugepages-memaccess.xml
index 9d63ac4a3d..56973edb70 100644
--- a/tests/qemuxml2argvdata/hugepages-memaccess.xml
+++ b/tests/qemuxml2argvdata/hugepages-memaccess.xml
@@ -20,7 +20,8 @@
hvm
-
+
+ qemu64
|
|
@@ -40,7 +41,7 @@
-
+
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.xml b/tests/qemuxml2argvdata/hugepages-memaccess2.xml
index 119662b773..043650db6c 100644
--- a/tests/qemuxml2argvdata/hugepages-memaccess2.xml
+++ b/tests/qemuxml2argvdata/hugepages-memaccess2.xml
@@ -20,7 +20,8 @@
hvm
-
+
+ qemu64
|
|
@@ -40,7 +41,7 @@
-
+
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.xml b/tests/qemuxml2argvdata/hugepages-memaccess3.xml
index 54b27e971d..399e58acc2 100644
--- a/tests/qemuxml2argvdata/hugepages-memaccess3.xml
+++ b/tests/qemuxml2argvdata/hugepages-memaccess3.xml
@@ -10,17 +10,25 @@
4
hvm
+
+
+ qemu64
+
+
destroy
restart
destroy
/usr/bin/qemu-system-x86_64
-
+
+
+
+
diff --git a/tests/qemuxml2argvdata/hugepages-nodeset.xml b/tests/qemuxml2argvdata/hugepages-nodeset.xml
index 5549cb82ff..49d1f45c0d 100644
--- a/tests/qemuxml2argvdata/hugepages-nodeset.xml
+++ b/tests/qemuxml2argvdata/hugepages-nodeset.xml
@@ -5,7 +5,7 @@
1048576
-
+
2
@@ -13,18 +13,22 @@
hvm
+
+ qemu64
+
destroy
restart
destroy
/usr/bin/qemu-system-x86_64
-
+
+
diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-2M.xml b/tests/qemuxml2argvdata/hugepages-numa-default-2M.xml
index 130af8dd81..ac084a0461 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-default-2M.xml
+++ b/tests/qemuxml2argvdata/hugepages-numa-default-2M.xml
@@ -13,7 +13,8 @@
hvm
-
+
+ qemu64
|
|
@@ -25,10 +26,13 @@
destroy
/usr/bin/qemu-system-x86_64
-
+
+
+
+
diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.xml b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.xml
index 260cbb4869..c7d471af39 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.xml
+++ b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.xml
@@ -12,7 +12,8 @@
hvm
-
+
+ qemu64
|
@@ -23,7 +24,7 @@
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.xml b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.xml
index 5fbf6b5e85..74e15800fc 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.xml
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.xml
@@ -13,7 +13,8 @@
hvm
-
+
+ qemu64
|
|
@@ -25,10 +26,13 @@
destroy
/usr/bin/qemu-system-x86_64
-
+
+
+
+
diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset.xml b/tests/qemuxml2argvdata/hugepages-numa-nodeset.xml
index 31ebc1553a..4149d239b1 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-nodeset.xml
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset.xml
@@ -14,7 +14,8 @@
hvm
-
+
+ qemu64
|
|
@@ -28,10 +29,13 @@
destroy
/usr/bin/qemu-system-x86_64
-
+
+
+
+
diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.xml b/tests/qemuxml2argvdata/hugepages-nvdimm.xml
index a33cce9293..1a1500895b 100644
--- a/tests/qemuxml2argvdata/hugepages-nvdimm.xml
+++ b/tests/qemuxml2argvdata/hugepages-nvdimm.xml
@@ -15,7 +15,8 @@
hvm
-
+
+ qemu64
|
@@ -27,7 +28,7 @@
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2argvdata/hugepages-shared.xml b/tests/qemuxml2argvdata/hugepages-shared.xml
index 33abe71d9e..0a8efc806c 100644
--- a/tests/qemuxml2argvdata/hugepages-shared.xml
+++ b/tests/qemuxml2argvdata/hugepages-shared.xml
@@ -18,7 +18,8 @@
hvm
-
+
+ qemu64
|
|
@@ -33,15 +34,23 @@
/usr/bin/qemu-system-x86_64
+
-
-
+
+
+
+
+
+
-
+
+
+
+
diff --git a/tests/qemuxml2argvdata/pages-dimm-discard.xml b/tests/qemuxml2argvdata/pages-dimm-discard.xml
index de7e63ad32..eb0b409b8a 100644
--- a/tests/qemuxml2argvdata/pages-dimm-discard.xml
+++ b/tests/qemuxml2argvdata/pages-dimm-discard.xml
@@ -9,7 +9,8 @@
hvm
-
+
+ qemu64
|
@@ -20,7 +21,7 @@
restart
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2argvdata/pages-discard-hugepages.xml b/tests/qemuxml2argvdata/pages-discard-hugepages.xml
index 70c5eca0d0..c0b61141c7 100644
--- a/tests/qemuxml2argvdata/pages-discard-hugepages.xml
+++ b/tests/qemuxml2argvdata/pages-discard-hugepages.xml
@@ -11,7 +11,8 @@
hvm
-
+
+ qemu64
|
|
@@ -23,7 +24,7 @@
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/hugepages-default-2M.xml b/tests/qemuxml2xmloutdata/hugepages-default-2M.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hugepages-default-2M.xml
rename to tests/qemuxml2xmloutdata/hugepages-default-2M.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hugepages-default-system-size.xml b/tests/qemuxml2xmloutdata/hugepages-default-system-size.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hugepages-default-system-size.xml
rename to tests/qemuxml2xmloutdata/hugepages-default-system-size.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hugepages-default.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hugepages-default.x86_64-latest.xml
new file mode 120000
index 0000000000..a55514468e
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/hugepages-default.x86_64-latest.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/hugepages-default.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/hugepages-default.xml b/tests/qemuxml2xmloutdata/hugepages-default.xml
deleted file mode 100644
index 977993fa52..0000000000
--- a/tests/qemuxml2xmloutdata/hugepages-default.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 219136
- 219136
-
-
-
- 1
-
- hvm
-
-
-
- destroy
- restart
- destroy
-
- /usr/bin/qemu-system-x86_64
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/qemuxml2xmloutdata/hugepages-memaccess.xml b/tests/qemuxml2xmloutdata/hugepages-memaccess.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hugepages-memaccess.xml
rename to tests/qemuxml2xmloutdata/hugepages-memaccess.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hugepages-memaccess2.xml b/tests/qemuxml2xmloutdata/hugepages-memaccess2.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hugepages-memaccess2.xml
rename to tests/qemuxml2xmloutdata/hugepages-memaccess2.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hugepages-memaccess3.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hugepages-memaccess3.x86_64-latest.xml
new file mode 120000
index 0000000000..0b2a12b5de
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/hugepages-memaccess3.x86_64-latest.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/hugepages-memaccess3.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/hugepages-nodeset.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hugepages-nodeset.x86_64-latest.xml
new file mode 120000
index 0000000000..b55838b780
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/hugepages-nodeset.x86_64-latest.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/hugepages-nodeset.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/hugepages-nodeset.xml b/tests/qemuxml2xmloutdata/hugepages-nodeset.xml
deleted file mode 100644
index 296933c6f2..0000000000
--- a/tests/qemuxml2xmloutdata/hugepages-nodeset.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
- SomeDummyHugepagesGuest
- ef1bdff4-27f3-4e85-a807-5fb4d58463cc
- 1048576
- 1048576
-
-
-
-
-
- 2
-
- hvm
-
-
-
- destroy
- restart
- destroy
-
- /usr/bin/qemu-system-x86_64
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.x86_64-latest.xml
new file mode 120000
index 0000000000..bab31c4b99
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.x86_64-latest.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/hugepages-numa-default-2M.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.xml b/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.xml
deleted file mode 100644
index bf9f352d98..0000000000
--- a/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
- SomeDummyHugepagesGuest
- ef1bdff4-27f3-4e85-a807-5fb4d58463cc
- 1048576
- 1048576
-
-
-
-
-
- 2
-
- hvm
-
-
-
-
- |
- |
-
-
-
- destroy
- restart
- destroy
-
- /usr/bin/qemu-system-x86_64
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/qemuxml2xmloutdata/hugepages-numa-default-dimm.xml b/tests/qemuxml2xmloutdata/hugepages-numa-default-dimm.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hugepages-numa-default-dimm.xml
rename to tests/qemuxml2xmloutdata/hugepages-numa-default-dimm.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.x86_64-latest.xml
new file mode 120000
index 0000000000..c98dfbcd12
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.x86_64-latest.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/hugepages-numa-nodeset-part.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml
deleted file mode 100644
index 177faaa19f..0000000000
--- a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
- SomeDummyHugepagesGuest
- ef1bdff4-27f3-4e85-a807-5fb4d58463cc
- 1048576
- 1048576
-
-
-
-
-
- 2
-
- hvm
-
-
-
-
- |
- |
-
-
-
- destroy
- restart
- destroy
-
- /usr/bin/qemu-system-x86_64
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset.x86_64-latest.xml
new file mode 120000
index 0000000000..5603409c08
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset.x86_64-latest.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/hugepages-numa-nodeset.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset.xml b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset.xml
deleted file mode 100644
index e63407d1e2..0000000000
--- a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 4194304
- 4194304
-
-
-
-
-
-
- 4
-
- hvm
-
-
-
-
- |
- |
- |
- |
-
-
-
- destroy
- restart
- destroy
-
- /usr/bin/qemu-system-x86_64
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/qemuxml2xmloutdata/hugepages-nvdimm.xml b/tests/qemuxml2xmloutdata/hugepages-nvdimm.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/hugepages-nvdimm.xml
rename to tests/qemuxml2xmloutdata/hugepages-nvdimm.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/hugepages-shared.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hugepages-shared.x86_64-latest.xml
new file mode 120000
index 0000000000..3b7f1d12b1
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/hugepages-shared.x86_64-latest.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/hugepages-shared.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/hugepages-shared.xml b/tests/qemuxml2xmloutdata/hugepages-shared.xml
deleted file mode 100644
index 4310442936..0000000000
--- a/tests/qemuxml2xmloutdata/hugepages-shared.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 4194304
- 4194304
-
-
-
-
-
-
- 4
-
-
-
-
-
- hvm
-
-
-
-
- |
- |
- |
- |
-
-
-
- destroy
- restart
- destroy
-
- /usr/bin/qemu-system-x86_64
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/qemuxml2xmloutdata/pages-dimm-discard.xml b/tests/qemuxml2xmloutdata/pages-dimm-discard.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pages-dimm-discard.xml
rename to tests/qemuxml2xmloutdata/pages-dimm-discard.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pages-discard-hugepages.xml b/tests/qemuxml2xmloutdata/pages-discard-hugepages.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pages-discard-hugepages.xml
rename to tests/qemuxml2xmloutdata/pages-discard-hugepages.x86_64-latest.xml
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 3a2d029c4f..966496604d 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -295,24 +295,21 @@ mymain(void)
DO_TEST_NOCAPS("pmu-feature-off");
DO_TEST_NOCAPS("pages-discard");
- DO_TEST("pages-discard-hugepages", QEMU_CAPS_OBJECT_MEMORY_FILE);
- DO_TEST("pages-dimm-discard", QEMU_CAPS_DEVICE_PC_DIMM);
- DO_TEST("hugepages-default", QEMU_CAPS_OBJECT_MEMORY_FILE);
- DO_TEST("hugepages-default-2M", QEMU_CAPS_OBJECT_MEMORY_FILE);
- DO_TEST("hugepages-default-system-size", QEMU_CAPS_OBJECT_MEMORY_FILE);
- DO_TEST("hugepages-nodeset", QEMU_CAPS_OBJECT_MEMORY_FILE);
- DO_TEST("hugepages-numa-default-2M", QEMU_CAPS_OBJECT_MEMORY_FILE);
- DO_TEST("hugepages-numa-default-dimm", QEMU_CAPS_DEVICE_PC_DIMM,
- QEMU_CAPS_OBJECT_MEMORY_FILE);
- DO_TEST("hugepages-numa-nodeset", QEMU_CAPS_OBJECT_MEMORY_FILE);
- DO_TEST("hugepages-numa-nodeset-part", QEMU_CAPS_OBJECT_MEMORY_FILE);
- DO_TEST("hugepages-shared", QEMU_CAPS_OBJECT_MEMORY_FILE);
- DO_TEST("hugepages-memaccess", QEMU_CAPS_DEVICE_PC_DIMM,
- QEMU_CAPS_OBJECT_MEMORY_FILE);
- DO_TEST("hugepages-memaccess2", QEMU_CAPS_DEVICE_PC_DIMM,
- QEMU_CAPS_OBJECT_MEMORY_FILE);
- DO_TEST("hugepages-nvdimm", QEMU_CAPS_DEVICE_NVDIMM,
- QEMU_CAPS_OBJECT_MEMORY_FILE);
+ DO_TEST_CAPS_LATEST("pages-discard-hugepages");
+ DO_TEST_CAPS_LATEST("pages-dimm-discard");
+ DO_TEST_CAPS_LATEST("hugepages-default");
+ DO_TEST_CAPS_LATEST("hugepages-default-2M");
+ DO_TEST_CAPS_LATEST("hugepages-default-system-size");
+ DO_TEST_CAPS_LATEST("hugepages-nodeset");
+ DO_TEST_CAPS_LATEST("hugepages-numa-default-2M");
+ DO_TEST_CAPS_LATEST("hugepages-numa-default-dimm");
+ DO_TEST_CAPS_LATEST("hugepages-numa-nodeset");
+ DO_TEST_CAPS_LATEST("hugepages-numa-nodeset-part");
+ DO_TEST_CAPS_LATEST("hugepages-shared");
+ DO_TEST_CAPS_LATEST("hugepages-memaccess");
+ DO_TEST_CAPS_LATEST("hugepages-memaccess2");
+ DO_TEST_CAPS_LATEST("hugepages-memaccess3");
+ DO_TEST_CAPS_LATEST("hugepages-nvdimm");
DO_TEST_NOCAPS("nosharepages");
DO_TEST_NOCAPS("restore-v2");
DO_TEST_NOCAPS("migrate");