render / rpms / libvirt

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