0a7476
From 28e7a0e77e32354ae1e485c4ea5a74a7ed17eadb Mon Sep 17 00:00:00 2001
0a7476
Message-Id: <28e7a0e77e32354ae1e485c4ea5a74a7ed17eadb@dist-git>
0a7476
From: Andrea Bolognani <abologna@redhat.com>
0a7476
Date: Fri, 5 Apr 2019 10:57:39 +0200
0a7476
Subject: [PATCH] tests: Add more tests to qemucaps2xml
0a7476
0a7476
More specifically, everything that's tested by qemucapabilities
0a7476
now goes through qemucaps2xml as well.
0a7476
0a7476
Ideally we'll rewrite both so that listing all test cases is
0a7476
unnecessary and they get picked up automatically by listing the
0a7476
contents of the input directory instead, but that's a refactor
0a7476
for another day :)
0a7476
0a7476
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
0a7476
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
0a7476
(cherry picked from commit a3676f3763625d06778ee14dd6b006b3ba91846a)
0a7476
0a7476
Changes from upstream:
0a7476
0a7476
  * Removed references to RISC-V architectures.
0a7476
    Necessary for the test suite to pass because we never
0a7476
    picked up 869cb692fa1d downstream.
0a7476
0a7476
https://bugzilla.redhat.com/show_bug.cgi?id=1628469
0a7476
0a7476
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
0a7476
Message-Id: <20190405085744.8179-3-abologna@redhat.com>
0a7476
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
0a7476
---
0a7476
 tests/qemucapabilitiestest.c                  |  1 +
0a7476
 .../qemucaps2xmloutdata/caps_1.5.3.x86_64.xml | 30 +++++++++++++++++++
0a7476
 .../qemucaps2xmloutdata/caps_1.7.0.x86_64.xml | 30 +++++++++++++++++++
0a7476
 .../qemucaps2xmloutdata/caps_2.1.1.x86_64.xml | 30 +++++++++++++++++++
0a7476
 .../caps_2.10.0.aarch64.xml                   | 29 ++++++++++++++++++
0a7476
 .../qemucaps2xmloutdata/caps_2.10.0.ppc64.xml | 28 +++++++++++++++++
0a7476
 .../qemucaps2xmloutdata/caps_2.10.0.s390x.xml | 28 +++++++++++++++++
0a7476
 .../caps_2.10.0.x86_64.xml                    | 30 +++++++++++++++++++
0a7476
 .../qemucaps2xmloutdata/caps_2.11.0.s390x.xml | 28 +++++++++++++++++
0a7476
 .../caps_2.11.0.x86_64.xml                    | 30 +++++++++++++++++++
0a7476
 .../caps_2.12.0.aarch64.xml                   | 29 ++++++++++++++++++
0a7476
 .../qemucaps2xmloutdata/caps_2.12.0.ppc64.xml | 28 +++++++++++++++++
0a7476
 .../qemucaps2xmloutdata/caps_2.12.0.s390x.xml | 28 +++++++++++++++++
0a7476
 .../caps_2.12.0.x86_64.xml                    | 30 +++++++++++++++++++
0a7476
 .../qemucaps2xmloutdata/caps_2.4.0.x86_64.xml | 30 +++++++++++++++++++
0a7476
 .../qemucaps2xmloutdata/caps_2.5.0.x86_64.xml | 30 +++++++++++++++++++
0a7476
 .../caps_2.6.0.aarch64.xml                    | 29 ++++++++++++++++++
0a7476
 .../qemucaps2xmloutdata/caps_2.6.0.ppc64.xml  | 28 +++++++++++++++++
0a7476
 .../qemucaps2xmloutdata/caps_2.6.0.x86_64.xml | 30 +++++++++++++++++++
0a7476
 .../qemucaps2xmloutdata/caps_2.7.0.s390x.xml  | 28 +++++++++++++++++
0a7476
 .../qemucaps2xmloutdata/caps_2.7.0.x86_64.xml | 30 +++++++++++++++++++
0a7476
 .../qemucaps2xmloutdata/caps_2.8.0.s390x.xml  | 28 +++++++++++++++++
0a7476
 .../qemucaps2xmloutdata/caps_2.8.0.x86_64.xml | 30 +++++++++++++++++++
0a7476
 .../qemucaps2xmloutdata/caps_2.9.0.ppc64.xml  | 28 +++++++++++++++++
0a7476
 .../qemucaps2xmloutdata/caps_2.9.0.s390x.xml  | 28 +++++++++++++++++
0a7476
 .../qemucaps2xmloutdata/caps_2.9.0.x86_64.xml | 30 +++++++++++++++++++
0a7476
 .../qemucaps2xmloutdata/caps_3.0.0.ppc64.xml  | 28 +++++++++++++++++
0a7476
 .../qemucaps2xmloutdata/caps_3.0.0.x86_64.xml | 30 +++++++++++++++++++
0a7476
 tests/qemucaps2xmltest.c                      | 28 +++++++++++++++++
0a7476
 29 files changed, 814 insertions(+)
0a7476
 create mode 100644 tests/qemucaps2xmloutdata/caps_1.5.3.x86_64.xml
0a7476
 create mode 100644 tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml
0a7476
 create mode 100644 tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml
0a7476
 create mode 100644 tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml
0a7476
 create mode 100644 tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml
0a7476
 create mode 100644 tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml
0a7476
 create mode 100644 tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml
0a7476
 create mode 100644 tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml
0a7476
 create mode 100644 tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml
0a7476
 create mode 100644 tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml
0a7476
 create mode 100644 tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml
0a7476
 create mode 100644 tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml
0a7476
 create mode 100644 tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml
0a7476
 create mode 100644 tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml
0a7476
 create mode 100644 tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml
0a7476
 create mode 100644 tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml
0a7476
 create mode 100644 tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml
0a7476
 create mode 100644 tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml
0a7476
 create mode 100644 tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml
0a7476
 create mode 100644 tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml
0a7476
 create mode 100644 tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml
0a7476
 create mode 100644 tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml
0a7476
 create mode 100644 tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml
0a7476
 create mode 100644 tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml
0a7476
 create mode 100644 tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml
0a7476
 create mode 100644 tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml
0a7476
 create mode 100644 tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml
0a7476
0a7476
diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c
0a7476
index 4aec175968..828e3d106c 100644
0a7476
--- a/tests/qemucapabilitiestest.c
0a7476
+++ b/tests/qemucapabilitiestest.c
0a7476
@@ -163,6 +163,7 @@ mymain(void)
0a7476
             ret = -1; \
0a7476
     } while (0)
0a7476
 
0a7476
+    /* Keep this in sync with qemucaps2xmltest */
0a7476
     DO_TEST("x86_64", "caps_1.5.3");
0a7476
     DO_TEST("x86_64", "caps_1.6.0");
0a7476
     DO_TEST("x86_64", "caps_1.7.0");
0a7476
diff --git a/tests/qemucaps2xmloutdata/caps_1.5.3.x86_64.xml b/tests/qemucaps2xmloutdata/caps_1.5.3.x86_64.xml
0a7476
new file mode 100644
0a7476
index 0000000000..b58f54fefd
0a7476
--- /dev/null
0a7476
+++ b/tests/qemucaps2xmloutdata/caps_1.5.3.x86_64.xml
0a7476
@@ -0,0 +1,30 @@
0a7476
+<capabilities>
0a7476
+
0a7476
+  <host>
0a7476
+    <cpu>
0a7476
+      <arch>x86_64</arch>
0a7476
+    </cpu>
0a7476
+    <power_management/>
0a7476
+    <iommu support='no'/>
0a7476
+  </host>
0a7476
+
0a7476
+  <guest>
0a7476
+    <os_type>hvm</os_type>
0a7476
+    <arch name='x86_64'>
0a7476
+      <wordsize>64</wordsize>
0a7476
+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
0a7476
+      <domain type='qemu'/>
0a7476
+      <domain type='kvm'>
0a7476
+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
0a7476
+      </domain>
0a7476
+    </arch>
0a7476
+    <features>
0a7476
+      <cpuselection/>
0a7476
+      <deviceboot/>
0a7476
+      <disksnapshot default='on' toggle='no'/>
0a7476
+      <acpi default='on' toggle='yes'/>
0a7476
+      <apic default='on' toggle='no'/>
0a7476
+    </features>
0a7476
+  </guest>
0a7476
+
0a7476
+</capabilities>
0a7476
diff --git a/tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml
0a7476
new file mode 100644
0a7476
index 0000000000..b58f54fefd
0a7476
--- /dev/null
0a7476
+++ b/tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml
0a7476
@@ -0,0 +1,30 @@
0a7476
+<capabilities>
0a7476
+
0a7476
+  <host>
0a7476
+    <cpu>
0a7476
+      <arch>x86_64</arch>
0a7476
+    </cpu>
0a7476
+    <power_management/>
0a7476
+    <iommu support='no'/>
0a7476
+  </host>
0a7476
+
0a7476
+  <guest>
0a7476
+    <os_type>hvm</os_type>
0a7476
+    <arch name='x86_64'>
0a7476
+      <wordsize>64</wordsize>
0a7476
+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
0a7476
+      <domain type='qemu'/>
0a7476
+      <domain type='kvm'>
0a7476
+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
0a7476
+      </domain>
0a7476
+    </arch>
0a7476
+    <features>
0a7476
+      <cpuselection/>
0a7476
+      <deviceboot/>
0a7476
+      <disksnapshot default='on' toggle='no'/>
0a7476
+      <acpi default='on' toggle='yes'/>
0a7476
+      <apic default='on' toggle='no'/>
0a7476
+    </features>
0a7476
+  </guest>
0a7476
+
0a7476
+</capabilities>
0a7476
diff --git a/tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml
0a7476
new file mode 100644
0a7476
index 0000000000..b58f54fefd
0a7476
--- /dev/null
0a7476
+++ b/tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml
0a7476
@@ -0,0 +1,30 @@
0a7476
+<capabilities>
0a7476
+
0a7476
+  <host>
0a7476
+    <cpu>
0a7476
+      <arch>x86_64</arch>
0a7476
+    </cpu>
0a7476
+    <power_management/>
0a7476
+    <iommu support='no'/>
0a7476
+  </host>
0a7476
+
0a7476
+  <guest>
0a7476
+    <os_type>hvm</os_type>
0a7476
+    <arch name='x86_64'>
0a7476
+      <wordsize>64</wordsize>
0a7476
+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
0a7476
+      <domain type='qemu'/>
0a7476
+      <domain type='kvm'>
0a7476
+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
0a7476
+      </domain>
0a7476
+    </arch>
0a7476
+    <features>
0a7476
+      <cpuselection/>
0a7476
+      <deviceboot/>
0a7476
+      <disksnapshot default='on' toggle='no'/>
0a7476
+      <acpi default='on' toggle='yes'/>
0a7476
+      <apic default='on' toggle='no'/>
0a7476
+    </features>
0a7476
+  </guest>
0a7476
+
0a7476
+</capabilities>
0a7476
diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml b/tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml
0a7476
new file mode 100644
0a7476
index 0000000000..a879d67df3
0a7476
--- /dev/null
0a7476
+++ b/tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml
0a7476
@@ -0,0 +1,29 @@
0a7476
+<capabilities>
0a7476
+
0a7476
+  <host>
0a7476
+    <cpu>
0a7476
+      <arch>aarch64</arch>
0a7476
+    </cpu>
0a7476
+    <power_management/>
0a7476
+    <iommu support='no'/>
0a7476
+  </host>
0a7476
+
0a7476
+  <guest>
0a7476
+    <os_type>hvm</os_type>
0a7476
+    <arch name='aarch64'>
0a7476
+      <wordsize>64</wordsize>
0a7476
+      <emulator>/usr/bin/qemu-system-aarch64</emulator>
0a7476
+      <domain type='qemu'/>
0a7476
+      <domain type='kvm'>
0a7476
+        <emulator>/usr/bin/qemu-system-aarch64</emulator>
0a7476
+      </domain>
0a7476
+    </arch>
0a7476
+    <features>
0a7476
+      <cpuselection/>
0a7476
+      <deviceboot/>
0a7476
+      <disksnapshot default='on' toggle='no'/>
0a7476
+      <acpi default='on' toggle='yes'/>
0a7476
+    </features>
0a7476
+  </guest>
0a7476
+
0a7476
+</capabilities>
0a7476
diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml
0a7476
new file mode 100644
0a7476
index 0000000000..74eaf3ba0e
0a7476
--- /dev/null
0a7476
+++ b/tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml
0a7476
@@ -0,0 +1,28 @@
0a7476
+<capabilities>
0a7476
+
0a7476
+  <host>
0a7476
+    <cpu>
0a7476
+      <arch>ppc64</arch>
0a7476
+    </cpu>
0a7476
+    <power_management/>
0a7476
+    <iommu support='no'/>
0a7476
+  </host>
0a7476
+
0a7476
+  <guest>
0a7476
+    <os_type>hvm</os_type>
0a7476
+    <arch name='ppc64'>
0a7476
+      <wordsize>64</wordsize>
0a7476
+      <emulator>/usr/bin/qemu-system-ppc64</emulator>
0a7476
+      <domain type='qemu'/>
0a7476
+      <domain type='kvm'>
0a7476
+        <emulator>/usr/bin/qemu-system-ppc64</emulator>
0a7476
+      </domain>
0a7476
+    </arch>
0a7476
+    <features>
0a7476
+      <cpuselection/>
0a7476
+      <deviceboot/>
0a7476
+      <disksnapshot default='on' toggle='no'/>
0a7476
+    </features>
0a7476
+  </guest>
0a7476
+
0a7476
+</capabilities>
0a7476
diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml
0a7476
new file mode 100644
0a7476
index 0000000000..20ef995d62
0a7476
--- /dev/null
0a7476
+++ b/tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml
0a7476
@@ -0,0 +1,28 @@
0a7476
+<capabilities>
0a7476
+
0a7476
+  <host>
0a7476
+    <cpu>
0a7476
+      <arch>s390x</arch>
0a7476
+    </cpu>
0a7476
+    <power_management/>
0a7476
+    <iommu support='no'/>
0a7476
+  </host>
0a7476
+
0a7476
+  <guest>
0a7476
+    <os_type>hvm</os_type>
0a7476
+    <arch name='s390x'>
0a7476
+      <wordsize>64</wordsize>
0a7476
+      <emulator>/usr/bin/qemu-system-s390x</emulator>
0a7476
+      <domain type='qemu'/>
0a7476
+      <domain type='kvm'>
0a7476
+        <emulator>/usr/bin/qemu-system-s390x</emulator>
0a7476
+      </domain>
0a7476
+    </arch>
0a7476
+    <features>
0a7476
+      <cpuselection/>
0a7476
+      <deviceboot/>
0a7476
+      <disksnapshot default='on' toggle='no'/>
0a7476
+    </features>
0a7476
+  </guest>
0a7476
+
0a7476
+</capabilities>
0a7476
diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml
0a7476
new file mode 100644
0a7476
index 0000000000..b58f54fefd
0a7476
--- /dev/null
0a7476
+++ b/tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml
0a7476
@@ -0,0 +1,30 @@
0a7476
+<capabilities>
0a7476
+
0a7476
+  <host>
0a7476
+    <cpu>
0a7476
+      <arch>x86_64</arch>
0a7476
+    </cpu>
0a7476
+    <power_management/>
0a7476
+    <iommu support='no'/>
0a7476
+  </host>
0a7476
+
0a7476
+  <guest>
0a7476
+    <os_type>hvm</os_type>
0a7476
+    <arch name='x86_64'>
0a7476
+      <wordsize>64</wordsize>
0a7476
+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
0a7476
+      <domain type='qemu'/>
0a7476
+      <domain type='kvm'>
0a7476
+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
0a7476
+      </domain>
0a7476
+    </arch>
0a7476
+    <features>
0a7476
+      <cpuselection/>
0a7476
+      <deviceboot/>
0a7476
+      <disksnapshot default='on' toggle='no'/>
0a7476
+      <acpi default='on' toggle='yes'/>
0a7476
+      <apic default='on' toggle='no'/>
0a7476
+    </features>
0a7476
+  </guest>
0a7476
+
0a7476
+</capabilities>
0a7476
diff --git a/tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml
0a7476
new file mode 100644
0a7476
index 0000000000..20ef995d62
0a7476
--- /dev/null
0a7476
+++ b/tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml
0a7476
@@ -0,0 +1,28 @@
0a7476
+<capabilities>
0a7476
+
0a7476
+  <host>
0a7476
+    <cpu>
0a7476
+      <arch>s390x</arch>
0a7476
+    </cpu>
0a7476
+    <power_management/>
0a7476
+    <iommu support='no'/>
0a7476
+  </host>
0a7476
+
0a7476
+  <guest>
0a7476
+    <os_type>hvm</os_type>
0a7476
+    <arch name='s390x'>
0a7476
+      <wordsize>64</wordsize>
0a7476
+      <emulator>/usr/bin/qemu-system-s390x</emulator>
0a7476
+      <domain type='qemu'/>
0a7476
+      <domain type='kvm'>
0a7476
+        <emulator>/usr/bin/qemu-system-s390x</emulator>
0a7476
+      </domain>
0a7476
+    </arch>
0a7476
+    <features>
0a7476
+      <cpuselection/>
0a7476
+      <deviceboot/>
0a7476
+      <disksnapshot default='on' toggle='no'/>
0a7476
+    </features>
0a7476
+  </guest>
0a7476
+
0a7476
+</capabilities>
0a7476
diff --git a/tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml
0a7476
new file mode 100644
0a7476
index 0000000000..b58f54fefd
0a7476
--- /dev/null
0a7476
+++ b/tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml
0a7476
@@ -0,0 +1,30 @@
0a7476
+<capabilities>
0a7476
+
0a7476
+  <host>
0a7476
+    <cpu>
0a7476
+      <arch>x86_64</arch>
0a7476
+    </cpu>
0a7476
+    <power_management/>
0a7476
+    <iommu support='no'/>
0a7476
+  </host>
0a7476
+
0a7476
+  <guest>
0a7476
+    <os_type>hvm</os_type>
0a7476
+    <arch name='x86_64'>
0a7476
+      <wordsize>64</wordsize>
0a7476
+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
0a7476
+      <domain type='qemu'/>
0a7476
+      <domain type='kvm'>
0a7476
+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
0a7476
+      </domain>
0a7476
+    </arch>
0a7476
+    <features>
0a7476
+      <cpuselection/>
0a7476
+      <deviceboot/>
0a7476
+      <disksnapshot default='on' toggle='no'/>
0a7476
+      <acpi default='on' toggle='yes'/>
0a7476
+      <apic default='on' toggle='no'/>
0a7476
+    </features>
0a7476
+  </guest>
0a7476
+
0a7476
+</capabilities>
0a7476
diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml
0a7476
new file mode 100644
0a7476
index 0000000000..a879d67df3
0a7476
--- /dev/null
0a7476
+++ b/tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml
0a7476
@@ -0,0 +1,29 @@
0a7476
+<capabilities>
0a7476
+
0a7476
+  <host>
0a7476
+    <cpu>
0a7476
+      <arch>aarch64</arch>
0a7476
+    </cpu>
0a7476
+    <power_management/>
0a7476
+    <iommu support='no'/>
0a7476
+  </host>
0a7476
+
0a7476
+  <guest>
0a7476
+    <os_type>hvm</os_type>
0a7476
+    <arch name='aarch64'>
0a7476
+      <wordsize>64</wordsize>
0a7476
+      <emulator>/usr/bin/qemu-system-aarch64</emulator>
0a7476
+      <domain type='qemu'/>
0a7476
+      <domain type='kvm'>
0a7476
+        <emulator>/usr/bin/qemu-system-aarch64</emulator>
0a7476
+      </domain>
0a7476
+    </arch>
0a7476
+    <features>
0a7476
+      <cpuselection/>
0a7476
+      <deviceboot/>
0a7476
+      <disksnapshot default='on' toggle='no'/>
0a7476
+      <acpi default='on' toggle='yes'/>
0a7476
+    </features>
0a7476
+  </guest>
0a7476
+
0a7476
+</capabilities>
0a7476
diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml
0a7476
new file mode 100644
0a7476
index 0000000000..74eaf3ba0e
0a7476
--- /dev/null
0a7476
+++ b/tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml
0a7476
@@ -0,0 +1,28 @@
0a7476
+<capabilities>
0a7476
+
0a7476
+  <host>
0a7476
+    <cpu>
0a7476
+      <arch>ppc64</arch>
0a7476
+    </cpu>
0a7476
+    <power_management/>
0a7476
+    <iommu support='no'/>
0a7476
+  </host>
0a7476
+
0a7476
+  <guest>
0a7476
+    <os_type>hvm</os_type>
0a7476
+    <arch name='ppc64'>
0a7476
+      <wordsize>64</wordsize>
0a7476
+      <emulator>/usr/bin/qemu-system-ppc64</emulator>
0a7476
+      <domain type='qemu'/>
0a7476
+      <domain type='kvm'>
0a7476
+        <emulator>/usr/bin/qemu-system-ppc64</emulator>
0a7476
+      </domain>
0a7476
+    </arch>
0a7476
+    <features>
0a7476
+      <cpuselection/>
0a7476
+      <deviceboot/>
0a7476
+      <disksnapshot default='on' toggle='no'/>
0a7476
+    </features>
0a7476
+  </guest>
0a7476
+
0a7476
+</capabilities>
0a7476
diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml
0a7476
new file mode 100644
0a7476
index 0000000000..20ef995d62
0a7476
--- /dev/null
0a7476
+++ b/tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml
0a7476
@@ -0,0 +1,28 @@
0a7476
+<capabilities>
0a7476
+
0a7476
+  <host>
0a7476
+    <cpu>
0a7476
+      <arch>s390x</arch>
0a7476
+    </cpu>
0a7476
+    <power_management/>
0a7476
+    <iommu support='no'/>
0a7476
+  </host>
0a7476
+
0a7476
+  <guest>
0a7476
+    <os_type>hvm</os_type>
0a7476
+    <arch name='s390x'>
0a7476
+      <wordsize>64</wordsize>
0a7476
+      <emulator>/usr/bin/qemu-system-s390x</emulator>
0a7476
+      <domain type='qemu'/>
0a7476
+      <domain type='kvm'>
0a7476
+        <emulator>/usr/bin/qemu-system-s390x</emulator>
0a7476
+      </domain>
0a7476
+    </arch>
0a7476
+    <features>
0a7476
+      <cpuselection/>
0a7476
+      <deviceboot/>
0a7476
+      <disksnapshot default='on' toggle='no'/>
0a7476
+    </features>
0a7476
+  </guest>
0a7476
+
0a7476
+</capabilities>
0a7476
diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml
0a7476
new file mode 100644
0a7476
index 0000000000..b58f54fefd
0a7476
--- /dev/null
0a7476
+++ b/tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml
0a7476
@@ -0,0 +1,30 @@
0a7476
+<capabilities>
0a7476
+
0a7476
+  <host>
0a7476
+    <cpu>
0a7476
+      <arch>x86_64</arch>
0a7476
+    </cpu>
0a7476
+    <power_management/>
0a7476
+    <iommu support='no'/>
0a7476
+  </host>
0a7476
+
0a7476
+  <guest>
0a7476
+    <os_type>hvm</os_type>
0a7476
+    <arch name='x86_64'>
0a7476
+      <wordsize>64</wordsize>
0a7476
+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
0a7476
+      <domain type='qemu'/>
0a7476
+      <domain type='kvm'>
0a7476
+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
0a7476
+      </domain>
0a7476
+    </arch>
0a7476
+    <features>
0a7476
+      <cpuselection/>
0a7476
+      <deviceboot/>
0a7476
+      <disksnapshot default='on' toggle='no'/>
0a7476
+      <acpi default='on' toggle='yes'/>
0a7476
+      <apic default='on' toggle='no'/>
0a7476
+    </features>
0a7476
+  </guest>
0a7476
+
0a7476
+</capabilities>
0a7476
diff --git a/tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml
0a7476
new file mode 100644
0a7476
index 0000000000..b58f54fefd
0a7476
--- /dev/null
0a7476
+++ b/tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml
0a7476
@@ -0,0 +1,30 @@
0a7476
+<capabilities>
0a7476
+
0a7476
+  <host>
0a7476
+    <cpu>
0a7476
+      <arch>x86_64</arch>
0a7476
+    </cpu>
0a7476
+    <power_management/>
0a7476
+    <iommu support='no'/>
0a7476
+  </host>
0a7476
+
0a7476
+  <guest>
0a7476
+    <os_type>hvm</os_type>
0a7476
+    <arch name='x86_64'>
0a7476
+      <wordsize>64</wordsize>
0a7476
+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
0a7476
+      <domain type='qemu'/>
0a7476
+      <domain type='kvm'>
0a7476
+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
0a7476
+      </domain>
0a7476
+    </arch>
0a7476
+    <features>
0a7476
+      <cpuselection/>
0a7476
+      <deviceboot/>
0a7476
+      <disksnapshot default='on' toggle='no'/>
0a7476
+      <acpi default='on' toggle='yes'/>
0a7476
+      <apic default='on' toggle='no'/>
0a7476
+    </features>
0a7476
+  </guest>
0a7476
+
0a7476
+</capabilities>
0a7476
diff --git a/tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml
0a7476
new file mode 100644
0a7476
index 0000000000..b58f54fefd
0a7476
--- /dev/null
0a7476
+++ b/tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml
0a7476
@@ -0,0 +1,30 @@
0a7476
+<capabilities>
0a7476
+
0a7476
+  <host>
0a7476
+    <cpu>
0a7476
+      <arch>x86_64</arch>
0a7476
+    </cpu>
0a7476
+    <power_management/>
0a7476
+    <iommu support='no'/>
0a7476
+  </host>
0a7476
+
0a7476
+  <guest>
0a7476
+    <os_type>hvm</os_type>
0a7476
+    <arch name='x86_64'>
0a7476
+      <wordsize>64</wordsize>
0a7476
+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
0a7476
+      <domain type='qemu'/>
0a7476
+      <domain type='kvm'>
0a7476
+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
0a7476
+      </domain>
0a7476
+    </arch>
0a7476
+    <features>
0a7476
+      <cpuselection/>
0a7476
+      <deviceboot/>
0a7476
+      <disksnapshot default='on' toggle='no'/>
0a7476
+      <acpi default='on' toggle='yes'/>
0a7476
+      <apic default='on' toggle='no'/>
0a7476
+    </features>
0a7476
+  </guest>
0a7476
+
0a7476
+</capabilities>
0a7476
diff --git a/tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml b/tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml
0a7476
new file mode 100644
0a7476
index 0000000000..a879d67df3
0a7476
--- /dev/null
0a7476
+++ b/tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml
0a7476
@@ -0,0 +1,29 @@
0a7476
+<capabilities>
0a7476
+
0a7476
+  <host>
0a7476
+    <cpu>
0a7476
+      <arch>aarch64</arch>
0a7476
+    </cpu>
0a7476
+    <power_management/>
0a7476
+    <iommu support='no'/>
0a7476
+  </host>
0a7476
+
0a7476
+  <guest>
0a7476
+    <os_type>hvm</os_type>
0a7476
+    <arch name='aarch64'>
0a7476
+      <wordsize>64</wordsize>
0a7476
+      <emulator>/usr/bin/qemu-system-aarch64</emulator>
0a7476
+      <domain type='qemu'/>
0a7476
+      <domain type='kvm'>
0a7476
+        <emulator>/usr/bin/qemu-system-aarch64</emulator>
0a7476
+      </domain>
0a7476
+    </arch>
0a7476
+    <features>
0a7476
+      <cpuselection/>
0a7476
+      <deviceboot/>
0a7476
+      <disksnapshot default='on' toggle='no'/>
0a7476
+      <acpi default='on' toggle='yes'/>
0a7476
+    </features>
0a7476
+  </guest>
0a7476
+
0a7476
+</capabilities>
0a7476
diff --git a/tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml
0a7476
new file mode 100644
0a7476
index 0000000000..74eaf3ba0e
0a7476
--- /dev/null
0a7476
+++ b/tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml
0a7476
@@ -0,0 +1,28 @@
0a7476
+<capabilities>
0a7476
+
0a7476
+  <host>
0a7476
+    <cpu>
0a7476
+      <arch>ppc64</arch>
0a7476
+    </cpu>
0a7476
+    <power_management/>
0a7476
+    <iommu support='no'/>
0a7476
+  </host>
0a7476
+
0a7476
+  <guest>
0a7476
+    <os_type>hvm</os_type>
0a7476
+    <arch name='ppc64'>
0a7476
+      <wordsize>64</wordsize>
0a7476
+      <emulator>/usr/bin/qemu-system-ppc64</emulator>
0a7476
+      <domain type='qemu'/>
0a7476
+      <domain type='kvm'>
0a7476
+        <emulator>/usr/bin/qemu-system-ppc64</emulator>
0a7476
+      </domain>
0a7476
+    </arch>
0a7476
+    <features>
0a7476
+      <cpuselection/>
0a7476
+      <deviceboot/>
0a7476
+      <disksnapshot default='on' toggle='no'/>
0a7476
+    </features>
0a7476
+  </guest>
0a7476
+
0a7476
+</capabilities>
0a7476
diff --git a/tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml
0a7476
new file mode 100644
0a7476
index 0000000000..b58f54fefd
0a7476
--- /dev/null
0a7476
+++ b/tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml
0a7476
@@ -0,0 +1,30 @@
0a7476
+<capabilities>
0a7476
+
0a7476
+  <host>
0a7476
+    <cpu>
0a7476
+      <arch>x86_64</arch>
0a7476
+    </cpu>
0a7476
+    <power_management/>
0a7476
+    <iommu support='no'/>
0a7476
+  </host>
0a7476
+
0a7476
+  <guest>
0a7476
+    <os_type>hvm</os_type>
0a7476
+    <arch name='x86_64'>
0a7476
+      <wordsize>64</wordsize>
0a7476
+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
0a7476
+      <domain type='qemu'/>
0a7476
+      <domain type='kvm'>
0a7476
+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
0a7476
+      </domain>
0a7476
+    </arch>
0a7476
+    <features>
0a7476
+      <cpuselection/>
0a7476
+      <deviceboot/>
0a7476
+      <disksnapshot default='on' toggle='no'/>
0a7476
+      <acpi default='on' toggle='yes'/>
0a7476
+      <apic default='on' toggle='no'/>
0a7476
+    </features>
0a7476
+  </guest>
0a7476
+
0a7476
+</capabilities>
0a7476
diff --git a/tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml
0a7476
new file mode 100644
0a7476
index 0000000000..20ef995d62
0a7476
--- /dev/null
0a7476
+++ b/tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml
0a7476
@@ -0,0 +1,28 @@
0a7476
+<capabilities>
0a7476
+
0a7476
+  <host>
0a7476
+    <cpu>
0a7476
+      <arch>s390x</arch>
0a7476
+    </cpu>
0a7476
+    <power_management/>
0a7476
+    <iommu support='no'/>
0a7476
+  </host>
0a7476
+
0a7476
+  <guest>
0a7476
+    <os_type>hvm</os_type>
0a7476
+    <arch name='s390x'>
0a7476
+      <wordsize>64</wordsize>
0a7476
+      <emulator>/usr/bin/qemu-system-s390x</emulator>
0a7476
+      <domain type='qemu'/>
0a7476
+      <domain type='kvm'>
0a7476
+        <emulator>/usr/bin/qemu-system-s390x</emulator>
0a7476
+      </domain>
0a7476
+    </arch>
0a7476
+    <features>
0a7476
+      <cpuselection/>
0a7476
+      <deviceboot/>
0a7476
+      <disksnapshot default='on' toggle='no'/>
0a7476
+    </features>
0a7476
+  </guest>
0a7476
+
0a7476
+</capabilities>
0a7476
diff --git a/tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml
0a7476
new file mode 100644
0a7476
index 0000000000..b58f54fefd
0a7476
--- /dev/null
0a7476
+++ b/tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml
0a7476
@@ -0,0 +1,30 @@
0a7476
+<capabilities>
0a7476
+
0a7476
+  <host>
0a7476
+    <cpu>
0a7476
+      <arch>x86_64</arch>
0a7476
+    </cpu>
0a7476
+    <power_management/>
0a7476
+    <iommu support='no'/>
0a7476
+  </host>
0a7476
+
0a7476
+  <guest>
0a7476
+    <os_type>hvm</os_type>
0a7476
+    <arch name='x86_64'>
0a7476
+      <wordsize>64</wordsize>
0a7476
+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
0a7476
+      <domain type='qemu'/>
0a7476
+      <domain type='kvm'>
0a7476
+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
0a7476
+      </domain>
0a7476
+    </arch>
0a7476
+    <features>
0a7476
+      <cpuselection/>
0a7476
+      <deviceboot/>
0a7476
+      <disksnapshot default='on' toggle='no'/>
0a7476
+      <acpi default='on' toggle='yes'/>
0a7476
+      <apic default='on' toggle='no'/>
0a7476
+    </features>
0a7476
+  </guest>
0a7476
+
0a7476
+</capabilities>
0a7476
diff --git a/tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml
0a7476
new file mode 100644
0a7476
index 0000000000..20ef995d62
0a7476
--- /dev/null
0a7476
+++ b/tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml
0a7476
@@ -0,0 +1,28 @@
0a7476
+<capabilities>
0a7476
+
0a7476
+  <host>
0a7476
+    <cpu>
0a7476
+      <arch>s390x</arch>
0a7476
+    </cpu>
0a7476
+    <power_management/>
0a7476
+    <iommu support='no'/>
0a7476
+  </host>
0a7476
+
0a7476
+  <guest>
0a7476
+    <os_type>hvm</os_type>
0a7476
+    <arch name='s390x'>
0a7476
+      <wordsize>64</wordsize>
0a7476
+      <emulator>/usr/bin/qemu-system-s390x</emulator>
0a7476
+      <domain type='qemu'/>
0a7476
+      <domain type='kvm'>
0a7476
+        <emulator>/usr/bin/qemu-system-s390x</emulator>
0a7476
+      </domain>
0a7476
+    </arch>
0a7476
+    <features>
0a7476
+      <cpuselection/>
0a7476
+      <deviceboot/>
0a7476
+      <disksnapshot default='on' toggle='no'/>
0a7476
+    </features>
0a7476
+  </guest>
0a7476
+
0a7476
+</capabilities>
0a7476
diff --git a/tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml
0a7476
new file mode 100644
0a7476
index 0000000000..b58f54fefd
0a7476
--- /dev/null
0a7476
+++ b/tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml
0a7476
@@ -0,0 +1,30 @@
0a7476
+<capabilities>
0a7476
+
0a7476
+  <host>
0a7476
+    <cpu>
0a7476
+      <arch>x86_64</arch>
0a7476
+    </cpu>
0a7476
+    <power_management/>
0a7476
+    <iommu support='no'/>
0a7476
+  </host>
0a7476
+
0a7476
+  <guest>
0a7476
+    <os_type>hvm</os_type>
0a7476
+    <arch name='x86_64'>
0a7476
+      <wordsize>64</wordsize>
0a7476
+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
0a7476
+      <domain type='qemu'/>
0a7476
+      <domain type='kvm'>
0a7476
+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
0a7476
+      </domain>
0a7476
+    </arch>
0a7476
+    <features>
0a7476
+      <cpuselection/>
0a7476
+      <deviceboot/>
0a7476
+      <disksnapshot default='on' toggle='no'/>
0a7476
+      <acpi default='on' toggle='yes'/>
0a7476
+      <apic default='on' toggle='no'/>
0a7476
+    </features>
0a7476
+  </guest>
0a7476
+
0a7476
+</capabilities>
0a7476
diff --git a/tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml
0a7476
new file mode 100644
0a7476
index 0000000000..74eaf3ba0e
0a7476
--- /dev/null
0a7476
+++ b/tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml
0a7476
@@ -0,0 +1,28 @@
0a7476
+<capabilities>
0a7476
+
0a7476
+  <host>
0a7476
+    <cpu>
0a7476
+      <arch>ppc64</arch>
0a7476
+    </cpu>
0a7476
+    <power_management/>
0a7476
+    <iommu support='no'/>
0a7476
+  </host>
0a7476
+
0a7476
+  <guest>
0a7476
+    <os_type>hvm</os_type>
0a7476
+    <arch name='ppc64'>
0a7476
+      <wordsize>64</wordsize>
0a7476
+      <emulator>/usr/bin/qemu-system-ppc64</emulator>
0a7476
+      <domain type='qemu'/>
0a7476
+      <domain type='kvm'>
0a7476
+        <emulator>/usr/bin/qemu-system-ppc64</emulator>
0a7476
+      </domain>
0a7476
+    </arch>
0a7476
+    <features>
0a7476
+      <cpuselection/>
0a7476
+      <deviceboot/>
0a7476
+      <disksnapshot default='on' toggle='no'/>
0a7476
+    </features>
0a7476
+  </guest>
0a7476
+
0a7476
+</capabilities>
0a7476
diff --git a/tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml
0a7476
new file mode 100644
0a7476
index 0000000000..20ef995d62
0a7476
--- /dev/null
0a7476
+++ b/tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml
0a7476
@@ -0,0 +1,28 @@
0a7476
+<capabilities>
0a7476
+
0a7476
+  <host>
0a7476
+    <cpu>
0a7476
+      <arch>s390x</arch>
0a7476
+    </cpu>
0a7476
+    <power_management/>
0a7476
+    <iommu support='no'/>
0a7476
+  </host>
0a7476
+
0a7476
+  <guest>
0a7476
+    <os_type>hvm</os_type>
0a7476
+    <arch name='s390x'>
0a7476
+      <wordsize>64</wordsize>
0a7476
+      <emulator>/usr/bin/qemu-system-s390x</emulator>
0a7476
+      <domain type='qemu'/>
0a7476
+      <domain type='kvm'>
0a7476
+        <emulator>/usr/bin/qemu-system-s390x</emulator>
0a7476
+      </domain>
0a7476
+    </arch>
0a7476
+    <features>
0a7476
+      <cpuselection/>
0a7476
+      <deviceboot/>
0a7476
+      <disksnapshot default='on' toggle='no'/>
0a7476
+    </features>
0a7476
+  </guest>
0a7476
+
0a7476
+</capabilities>
0a7476
diff --git a/tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml
0a7476
new file mode 100644
0a7476
index 0000000000..b58f54fefd
0a7476
--- /dev/null
0a7476
+++ b/tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml
0a7476
@@ -0,0 +1,30 @@
0a7476
+<capabilities>
0a7476
+
0a7476
+  <host>
0a7476
+    <cpu>
0a7476
+      <arch>x86_64</arch>
0a7476
+    </cpu>
0a7476
+    <power_management/>
0a7476
+    <iommu support='no'/>
0a7476
+  </host>
0a7476
+
0a7476
+  <guest>
0a7476
+    <os_type>hvm</os_type>
0a7476
+    <arch name='x86_64'>
0a7476
+      <wordsize>64</wordsize>
0a7476
+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
0a7476
+      <domain type='qemu'/>
0a7476
+      <domain type='kvm'>
0a7476
+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
0a7476
+      </domain>
0a7476
+    </arch>
0a7476
+    <features>
0a7476
+      <cpuselection/>
0a7476
+      <deviceboot/>
0a7476
+      <disksnapshot default='on' toggle='no'/>
0a7476
+      <acpi default='on' toggle='yes'/>
0a7476
+      <apic default='on' toggle='no'/>
0a7476
+    </features>
0a7476
+  </guest>
0a7476
+
0a7476
+</capabilities>
0a7476
diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml
0a7476
new file mode 100644
0a7476
index 0000000000..74eaf3ba0e
0a7476
--- /dev/null
0a7476
+++ b/tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml
0a7476
@@ -0,0 +1,28 @@
0a7476
+<capabilities>
0a7476
+
0a7476
+  <host>
0a7476
+    <cpu>
0a7476
+      <arch>ppc64</arch>
0a7476
+    </cpu>
0a7476
+    <power_management/>
0a7476
+    <iommu support='no'/>
0a7476
+  </host>
0a7476
+
0a7476
+  <guest>
0a7476
+    <os_type>hvm</os_type>
0a7476
+    <arch name='ppc64'>
0a7476
+      <wordsize>64</wordsize>
0a7476
+      <emulator>/usr/bin/qemu-system-ppc64</emulator>
0a7476
+      <domain type='qemu'/>
0a7476
+      <domain type='kvm'>
0a7476
+        <emulator>/usr/bin/qemu-system-ppc64</emulator>
0a7476
+      </domain>
0a7476
+    </arch>
0a7476
+    <features>
0a7476
+      <cpuselection/>
0a7476
+      <deviceboot/>
0a7476
+      <disksnapshot default='on' toggle='no'/>
0a7476
+    </features>
0a7476
+  </guest>
0a7476
+
0a7476
+</capabilities>
0a7476
diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml
0a7476
new file mode 100644
0a7476
index 0000000000..b58f54fefd
0a7476
--- /dev/null
0a7476
+++ b/tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml
0a7476
@@ -0,0 +1,30 @@
0a7476
+<capabilities>
0a7476
+
0a7476
+  <host>
0a7476
+    <cpu>
0a7476
+      <arch>x86_64</arch>
0a7476
+    </cpu>
0a7476
+    <power_management/>
0a7476
+    <iommu support='no'/>
0a7476
+  </host>
0a7476
+
0a7476
+  <guest>
0a7476
+    <os_type>hvm</os_type>
0a7476
+    <arch name='x86_64'>
0a7476
+      <wordsize>64</wordsize>
0a7476
+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
0a7476
+      <domain type='qemu'/>
0a7476
+      <domain type='kvm'>
0a7476
+        <emulator>/usr/bin/qemu-system-x86_64</emulator>
0a7476
+      </domain>
0a7476
+    </arch>
0a7476
+    <features>
0a7476
+      <cpuselection/>
0a7476
+      <deviceboot/>
0a7476
+      <disksnapshot default='on' toggle='no'/>
0a7476
+      <acpi default='on' toggle='yes'/>
0a7476
+      <apic default='on' toggle='no'/>
0a7476
+    </features>
0a7476
+  </guest>
0a7476
+
0a7476
+</capabilities>
0a7476
diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c
0a7476
index 65dd97c0a4..cd951b2bb4 100644
0a7476
--- a/tests/qemucaps2xmltest.c
0a7476
+++ b/tests/qemucaps2xmltest.c
0a7476
@@ -187,7 +187,35 @@ mymain(void)
0a7476
     if (virTestRun(name "(" arch ")", testQemuCapsXML, &data) < 0) \
0a7476
         ret = -1
0a7476
 
0a7476
+    /* Keep this in sync with qemucapabilitiestest */
0a7476
+    DO_TEST("x86_64", "caps_1.5.3");
0a7476
     DO_TEST("x86_64", "caps_1.6.0");
0a7476
+    DO_TEST("x86_64", "caps_1.7.0");
0a7476
+    DO_TEST("x86_64", "caps_2.1.1");
0a7476
+    DO_TEST("x86_64", "caps_2.4.0");
0a7476
+    DO_TEST("x86_64", "caps_2.5.0");
0a7476
+    DO_TEST("x86_64", "caps_2.6.0");
0a7476
+    DO_TEST("x86_64", "caps_2.7.0");
0a7476
+    DO_TEST("x86_64", "caps_2.8.0");
0a7476
+    DO_TEST("x86_64", "caps_2.9.0");
0a7476
+    DO_TEST("x86_64", "caps_2.10.0");
0a7476
+    DO_TEST("x86_64", "caps_2.11.0");
0a7476
+    DO_TEST("x86_64", "caps_2.12.0");
0a7476
+    DO_TEST("x86_64", "caps_3.0.0");
0a7476
+    DO_TEST("aarch64", "caps_2.6.0");
0a7476
+    DO_TEST("aarch64", "caps_2.10.0");
0a7476
+    DO_TEST("aarch64", "caps_2.12.0");
0a7476
+    DO_TEST("ppc64", "caps_2.6.0");
0a7476
+    DO_TEST("ppc64", "caps_2.9.0");
0a7476
+    DO_TEST("ppc64", "caps_2.10.0");
0a7476
+    DO_TEST("ppc64", "caps_2.12.0");
0a7476
+    DO_TEST("ppc64", "caps_3.0.0");
0a7476
+    DO_TEST("s390x", "caps_2.7.0");
0a7476
+    DO_TEST("s390x", "caps_2.8.0");
0a7476
+    DO_TEST("s390x", "caps_2.9.0");
0a7476
+    DO_TEST("s390x", "caps_2.10.0");
0a7476
+    DO_TEST("s390x", "caps_2.11.0");
0a7476
+    DO_TEST("s390x", "caps_2.12.0");
0a7476
 
0a7476
     return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
0a7476
 }
0a7476
-- 
0a7476
2.21.0
0a7476