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