render / rpms / libvirt

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