diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml b/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml
new file mode 100644
index 0000000000..418fa29def
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml
@@ -0,0 +1,115 @@
+
+ guest
+ 33844184-97c0-4cc0-aa7d-206f5803530b
+
+
+
+
+
+ 4194304
+ 4194304
+ 4
+
+ hvm
+ /usr/share/AAVMF/AAVMF_CODE.fd
+ /var/lib/libvirt/qemu/nvram/guest_VARS.fd
+
+
+
+
+
+
+
+ destroy
+ restart
+ destroy
+
+ /usr/bin/qemu-system-aarch64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /dev/urandom
+
+
+
+
diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml b/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml
new file mode 100644
index 0000000000..9b08a03981
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml
@@ -0,0 +1,101 @@
+
+ guest
+ 1ccfd97d-5eb4-478a-bbe6-88d254c16db7
+
+
+
+
+
+ 4194304
+ 4194304
+ 4
+
+ hvm
+ /usr/share/AAVMF/AAVMF_CODE.fd
+ /var/lib/libvirt/qemu/nvram/guest_VARS.fd
+
+
+
+
+
+
+
+ destroy
+ restart
+ destroy
+
+ /usr/bin/qemu-system-aarch64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /dev/urandom
+
+
+
+
diff --git a/tests/qemuxml2xmloutdata/ppc64-pseries-graphics.ppc64-latest.xml b/tests/qemuxml2xmloutdata/ppc64-pseries-graphics.ppc64-latest.xml
new file mode 100644
index 0000000000..bbb1e33007
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/ppc64-pseries-graphics.ppc64-latest.xml
@@ -0,0 +1,75 @@
+
+ guest
+ b35969f7-e7cf-4d90-a9a0-4dd9000f9824
+
+
+
+
+
+ 4194304
+ 4194304
+ 4
+
+ hvm
+
+
+
+ destroy
+ restart
+ destroy
+
+ /usr/bin/qemu-system-ppc64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /dev/urandom
+
+
+
+
+
diff --git a/tests/qemuxml2xmloutdata/ppc64-pseries-headless.ppc64-latest.xml b/tests/qemuxml2xmloutdata/ppc64-pseries-headless.ppc64-latest.xml
new file mode 100644
index 0000000000..8634f8ae3c
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/ppc64-pseries-headless.ppc64-latest.xml
@@ -0,0 +1,66 @@
+
+ guest
+ 1ccfd97d-5eb4-478a-bbe6-88d254c16db7
+
+
+
+
+
+ 4194304
+ 4194304
+ 4
+
+ hvm
+
+
+
+ destroy
+ restart
+ destroy
+
+ /usr/bin/qemu-system-ppc64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /dev/urandom
+
+
+
+
+
diff --git a/tests/qemuxml2xmloutdata/riscv64-virt-graphics.riscv64-latest.xml b/tests/qemuxml2xmloutdata/riscv64-virt-graphics.riscv64-latest.xml
new file mode 100644
index 0000000000..c51ddd8f83
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/riscv64-virt-graphics.riscv64-latest.xml
@@ -0,0 +1,109 @@
+
+ guest
+ 96bc2754-8842-4714-a45f-3f69e7a9a852
+
+
+
+
+
+ 4194304
+ 4194304
+ 4
+
+ hvm
+
+
+
+ destroy
+ restart
+ destroy
+
+ /usr/bin/qemu-system-riscv64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /dev/urandom
+
+
+
+
diff --git a/tests/qemuxml2xmloutdata/riscv64-virt-headless.riscv64-latest.xml b/tests/qemuxml2xmloutdata/riscv64-virt-headless.riscv64-latest.xml
new file mode 100644
index 0000000000..5e09ea3c6f
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/riscv64-virt-headless.riscv64-latest.xml
@@ -0,0 +1,95 @@
+
+ guest
+ 1ccfd97d-5eb4-478a-bbe6-88d254c16db7
+
+
+
+
+
+ 4194304
+ 4194304
+ 4
+
+ hvm
+
+
+
+ destroy
+ restart
+ destroy
+
+ /usr/bin/qemu-system-riscv64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /dev/urandom
+
+
+
+
diff --git a/tests/qemuxml2xmloutdata/s390x-ccw-graphics.s390x-latest.xml b/tests/qemuxml2xmloutdata/s390x-ccw-graphics.s390x-latest.xml
new file mode 100644
index 0000000000..a601ab85c2
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/s390x-ccw-graphics.s390x-latest.xml
@@ -0,0 +1,66 @@
+
+ guest
+ a7ca230a-fbe0-48b8-8ea6-25836f8cbc32
+
+
+
+
+
+ 4194304
+ 4194304
+ 4
+
+ hvm
+
+
+
+ destroy
+ restart
+ destroy
+
+ /usr/bin/qemu-system-s390x
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /dev/urandom
+
+
+
+
+
diff --git a/tests/qemuxml2xmloutdata/s390x-ccw-headless.s390x-latest.xml b/tests/qemuxml2xmloutdata/s390x-ccw-headless.s390x-latest.xml
new file mode 100644
index 0000000000..55de903c0a
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/s390x-ccw-headless.s390x-latest.xml
@@ -0,0 +1,53 @@
+
+ guest
+ 1ccfd97d-5eb4-478a-bbe6-88d254c16db7
+
+
+
+
+
+ 4194304
+ 4194304
+ 4
+
+ hvm
+
+
+
+ destroy
+ restart
+ destroy
+
+ /usr/bin/qemu-system-s390x
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /dev/urandom
+
+
+
+
+
diff --git a/tests/qemuxml2xmloutdata/x86_64-pc-graphics.x86_64-latest.xml b/tests/qemuxml2xmloutdata/x86_64-pc-graphics.x86_64-latest.xml
new file mode 100644
index 0000000000..a30926083b
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/x86_64-pc-graphics.x86_64-latest.xml
@@ -0,0 +1,82 @@
+
+ guest
+ 2c0abd3d-8f18-42c0-a132-9708213aaac9
+
+
+
+
+
+ 4194304
+ 4194304
+ 4
+
+ hvm
+
+
+
+
+
+
+
+
+
+
+
+ destroy
+ restart
+ destroy
+
+
+
+
+
+ /usr/bin/qemu-system-x86_64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /dev/urandom
+
+
+
+
diff --git a/tests/qemuxml2xmloutdata/x86_64-pc-headless.x86_64-latest.xml b/tests/qemuxml2xmloutdata/x86_64-pc-headless.x86_64-latest.xml
new file mode 100644
index 0000000000..3b200c22ac
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/x86_64-pc-headless.x86_64-latest.xml
@@ -0,0 +1,74 @@
+
+ guest
+ 1ccfd97d-5eb4-478a-bbe6-88d254c16db7
+
+
+
+
+
+ 4194304
+ 4194304
+ 4
+
+ hvm
+
+
+
+
+
+
+
+
+
+
+
+ destroy
+ restart
+ destroy
+
+
+
+
+
+ /usr/bin/qemu-system-x86_64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /dev/urandom
+
+
+
+
diff --git a/tests/qemuxml2xmloutdata/x86_64-q35-graphics.x86_64-latest.xml b/tests/qemuxml2xmloutdata/x86_64-q35-graphics.x86_64-latest.xml
new file mode 100644
index 0000000000..79c82f9d4f
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/x86_64-q35-graphics.x86_64-latest.xml
@@ -0,0 +1,120 @@
+
+ guest
+ 61288c03-0b0d-4f1e-9496-0f0256f2e013
+
+
+
+
+
+ 4194304
+ 4194304
+ 4
+
+ hvm
+
+
+
+
+
+
+
+
+
+
+
+ destroy
+ restart
+ destroy
+
+
+
+
+
+ /usr/bin/qemu-system-x86_64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /dev/urandom
+
+
+
+
diff --git a/tests/qemuxml2xmloutdata/x86_64-q35-headless.x86_64-latest.xml b/tests/qemuxml2xmloutdata/x86_64-q35-headless.x86_64-latest.xml
new file mode 100644
index 0000000000..18cfe8a94c
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/x86_64-q35-headless.x86_64-latest.xml
@@ -0,0 +1,112 @@
+
+ guest
+ 1ccfd97d-5eb4-478a-bbe6-88d254c16db7
+
+
+
+
+
+ 4194304
+ 4194304
+ 4
+
+ hvm
+
+
+
+
+
+
+
+
+
+
+
+ destroy
+ restart
+ destroy
+
+
+
+
+
+ /usr/bin/qemu-system-x86_64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /dev/urandom
+
+
+
+
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 06d1ad5ec0..a64b17ac28 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1297,6 +1297,22 @@ mymain(void)
DO_TEST_CAPS_LATEST("virtio-transitional");
DO_TEST_CAPS_LATEST("virtio-non-transitional");
+ /* Simple headless guests for various architectures */
+ DO_TEST_CAPS_ARCH_LATEST("aarch64-virt-headless", "aarch64");
+ DO_TEST_CAPS_ARCH_LATEST("ppc64-pseries-headless", "ppc64");
+ DO_TEST_CAPS_ARCH_LATEST("riscv64-virt-headless", "riscv64");
+ DO_TEST_CAPS_ARCH_LATEST("s390x-ccw-headless", "s390x");
+ DO_TEST_CAPS_ARCH_LATEST("x86_64-pc-headless", "x86_64");
+ DO_TEST_CAPS_ARCH_LATEST("x86_64-q35-headless", "x86_64");
+
+ /* Simple guests with graphics for various architectures */
+ DO_TEST_CAPS_ARCH_LATEST("aarch64-virt-graphics", "aarch64");
+ DO_TEST_CAPS_ARCH_LATEST("ppc64-pseries-graphics", "ppc64");
+ DO_TEST_CAPS_ARCH_LATEST("riscv64-virt-graphics", "riscv64");
+ DO_TEST_CAPS_ARCH_LATEST("s390x-ccw-graphics", "s390x");
+ DO_TEST_CAPS_ARCH_LATEST("x86_64-pc-graphics", "x86_64");
+ DO_TEST_CAPS_ARCH_LATEST("x86_64-q35-graphics", "x86_64");
+
if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL)
virFileDeleteTree(fakerootdir);