diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
index 243b65d36f..4c30761110 100644
--- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
+++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
@@ -1,4 +1,4 @@
-
+
instance-00000092
126f2720-6f8e-45ab-a886-ec9277079a67
14680064
@@ -16,12 +16,20 @@
-
+
destroy
restart
destroy
/usr/bin/qemu-system-x86_64
-
+
+
+
+
+
+
+
+
+
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology.xml
index ca5402dbb0..f22a8e81f8 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology.xml
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.xml
@@ -19,12 +19,20 @@
|
-
+
destroy
restart
destroy
/usr/bin/qemu-system-x86_64
-
+
+
+
+
+
+
+
+
+
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
index 31f4567737..925f39b6ab 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
@@ -1,4 +1,4 @@
-
+
instance-00000092
126f2720-6f8e-45ab-a886-ec9277079a67
14680064
@@ -26,6 +26,14 @@
destroy
/usr/bin/qemu-system-x86_64
-
+
+
+
+
+
+
+
+
+
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
index 42d8a3bdad..71a8e083c9 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
@@ -1,4 +1,4 @@
-
+
instance-00000092
126f2720-6f8e-45ab-a886-ec9277079a67
14680064
@@ -27,6 +27,14 @@
destroy
/usr/bin/qemu-system-x86_64
-
+
+
+
+
+
+
+
+
+
diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
index ee425a737b..c582878a12 100644
--- a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
@@ -31,7 +31,7 @@ share=yes,size=15032385536,host-nodes=3,policy=preferred \
-no-acpi \
-boot strict=on \
-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.xml b/tests/qemuxml2argvdata/memfd-memory-numa.xml
index 41c1f9bfc2..f088f01d11 100644
--- a/tests/qemuxml2argvdata/memfd-memory-numa.xml
+++ b/tests/qemuxml2argvdata/memfd-memory-numa.xml
@@ -1,20 +1,20 @@
-
+
instance-00000092
126f2720-6f8e-45ab-a886-ec9277079a67
14680064
14680064
-
+
-
-
-
8
+
+
+
hvm
@@ -31,6 +31,14 @@
destroy
/usr/bin/qemu-system-x86_64
-
+
+
+
+
+
+
+
+
+
diff --git a/tests/qemuxml2xmloutdata/fd-memory-no-numa-topology.xml b/tests/qemuxml2xmloutdata/fd-memory-no-numa-topology.xml
new file mode 120000
index 0000000000..4a35465bd2
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/fd-memory-no-numa-topology.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/fd-memory-no-numa-topology.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/fd-memory-numa-topology.xml b/tests/qemuxml2xmloutdata/fd-memory-numa-topology.xml
new file mode 120000
index 0000000000..6ccadd7e24
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/fd-memory-numa-topology.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/fd-memory-numa-topology.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/fd-memory-numa-topology2.xml b/tests/qemuxml2xmloutdata/fd-memory-numa-topology2.xml
new file mode 120000
index 0000000000..9c5ab497de
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/fd-memory-numa-topology2.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/fd-memory-numa-topology2.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/fd-memory-numa-topology3.xml b/tests/qemuxml2xmloutdata/fd-memory-numa-topology3.xml
new file mode 120000
index 0000000000..40ae69bcb0
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/fd-memory-numa-topology3.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/fd-memory-numa-topology3.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/memfd-memory-numa.xml b/tests/qemuxml2xmloutdata/memfd-memory-numa.xml
new file mode 120000
index 0000000000..a610bf7a49
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/memfd-memory-numa.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/memfd-memory-numa.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 7630587d3b..057483237f 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1158,6 +1158,20 @@ mymain(void)
QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM,
QEMU_CAPS_VIRTIO_PCI_ATS);
+ DO_TEST("fd-memory-numa-topology", QEMU_CAPS_OBJECT_MEMORY_FILE,
+ QEMU_CAPS_KVM);
+ DO_TEST("fd-memory-numa-topology2", QEMU_CAPS_OBJECT_MEMORY_FILE,
+ QEMU_CAPS_KVM);
+ DO_TEST("fd-memory-numa-topology3", QEMU_CAPS_OBJECT_MEMORY_FILE,
+ QEMU_CAPS_KVM);
+
+ DO_TEST("fd-memory-no-numa-topology", QEMU_CAPS_OBJECT_MEMORY_FILE,
+ QEMU_CAPS_KVM);
+
+ DO_TEST("memfd-memory-numa",
+ QEMU_CAPS_OBJECT_MEMORY_MEMFD,
+ QEMU_CAPS_OBJECT_MEMORY_MEMFD_HUGETLB);
+
DO_TEST("acpi-table", NONE);
DO_TEST("video-device-pciaddr-default",