Turns out different versions of QEMU on the same architecture
produce the same output, so we can have a single output file
per architecture instead of duplicating the same data over and
over again.
Spotted-by: Ján Tomko <jtomko@xxxxxxxxxx>
Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx>
---
...ps_2.10.0.aarch64.xml => caps.aarch64.xml} | 0
.../{caps_2.10.0.ppc64.xml => caps.ppc64.xml} | 0
...aps_3.0.0.riscv32.xml => caps.riscv32.xml} | 0
...aps_3.0.0.riscv64.xml => caps.riscv64.xml} | 0
.../{caps_2.10.0.s390x.xml => caps.s390x.xml} | 0
...{caps_1.5.3.x86_64.xml => caps.x86_64.xml} | 0
.../qemucaps2xmloutdata/caps_1.6.0.x86_64.xml | 28 -------------------
.../qemucaps2xmloutdata/caps_1.7.0.x86_64.xml | 28 -------------------
.../qemucaps2xmloutdata/caps_2.1.1.x86_64.xml | 28 -------------------
.../caps_2.10.0.x86_64.xml | 28 -------------------
.../qemucaps2xmloutdata/caps_2.11.0.s390x.xml | 26 -----------------
.../caps_2.11.0.x86_64.xml | 28 -------------------
.../caps_2.12.0.aarch64.xml | 27 ------------------
.../qemucaps2xmloutdata/caps_2.12.0.ppc64.xml | 26 -----------------
.../qemucaps2xmloutdata/caps_2.12.0.s390x.xml | 26 -----------------
.../caps_2.12.0.x86_64.xml | 28 -------------------
.../qemucaps2xmloutdata/caps_2.4.0.x86_64.xml | 28 -------------------
.../qemucaps2xmloutdata/caps_2.5.0.x86_64.xml | 28 -------------------
.../caps_2.6.0.aarch64.xml | 27 ------------------
.../qemucaps2xmloutdata/caps_2.6.0.ppc64.xml | 26 -----------------
.../qemucaps2xmloutdata/caps_2.6.0.x86_64.xml | 28 -------------------
.../qemucaps2xmloutdata/caps_2.7.0.s390x.xml | 26 -----------------
.../qemucaps2xmloutdata/caps_2.7.0.x86_64.xml | 28 -------------------
.../qemucaps2xmloutdata/caps_2.8.0.s390x.xml | 26 -----------------
.../qemucaps2xmloutdata/caps_2.8.0.x86_64.xml | 28 -------------------
.../qemucaps2xmloutdata/caps_2.9.0.ppc64.xml | 26 -----------------
.../qemucaps2xmloutdata/caps_2.9.0.s390x.xml | 26 -----------------
.../qemucaps2xmloutdata/caps_2.9.0.x86_64.xml | 28 -------------------
.../qemucaps2xmloutdata/caps_3.0.0.ppc64.xml | 26 -----------------
.../qemucaps2xmloutdata/caps_3.0.0.s390x.xml | 26 -----------------
.../qemucaps2xmloutdata/caps_3.0.0.x86_64.xml | 28 -------------------
.../qemucaps2xmloutdata/caps_3.1.0.ppc64.xml | 26 -----------------
.../qemucaps2xmloutdata/caps_3.1.0.x86_64.xml | 28 -------------------
.../caps_4.0.0.riscv32.xml | 25 -----------------
.../caps_4.0.0.riscv64.xml | 25 -----------------
.../qemucaps2xmloutdata/caps_4.0.0.x86_64.xml | 28 -------------------
tests/qemucaps2xmltest.c | 4 +--
37 files changed, 2 insertions(+), 812 deletions(-)
rename tests/qemucaps2xmloutdata/{caps_2.10.0.aarch64.xml => caps.aarch64.xml} (100%)
rename tests/qemucaps2xmloutdata/{caps_2.10.0.ppc64.xml => caps.ppc64.xml} (100%)
rename tests/qemucaps2xmloutdata/{caps_3.0.0.riscv32.xml => caps.riscv32.xml} (100%)
rename tests/qemucaps2xmloutdata/{caps_3.0.0.riscv64.xml => caps.riscv64.xml} (100%)
rename tests/qemucaps2xmloutdata/{caps_2.10.0.s390x.xml => caps.s390x.xml} (100%)
rename tests/qemucaps2xmloutdata/{caps_1.5.3.x86_64.xml => caps.x86_64.xml} (100%)
delete mode 100644 tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml
delete mode 100644 tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml
delete mode 100644 tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml
delete mode 100644 tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml
delete mode 100644 tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml
delete mode 100644 tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml
delete mode 100644 tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml
delete mode 100644 tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml
delete mode 100644 tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml
delete mode 100644 tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml
delete mode 100644 tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml
delete mode 100644 tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml
delete mode 100644 tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml
delete mode 100644 tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml
delete mode 100644 tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml
delete mode 100644 tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml
delete mode 100644 tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml
delete mode 100644 tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml
delete mode 100644 tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml
delete mode 100644 tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml
delete mode 100644 tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml
delete mode 100644 tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml
delete mode 100644 tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml
delete mode 100644 tests/qemucaps2xmloutdata/caps_3.0.0.s390x.xml
delete mode 100644 tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml
delete mode 100644 tests/qemucaps2xmloutdata/caps_3.1.0.ppc64.xml
delete mode 100644 tests/qemucaps2xmloutdata/caps_3.1.0.x86_64.xml
delete mode 100644 tests/qemucaps2xmloutdata/caps_4.0.0.riscv32.xml
delete mode 100644 tests/qemucaps2xmloutdata/caps_4.0.0.riscv64.xml
delete mode 100644 tests/qemucaps2xmloutdata/caps_4.0.0.x86_64.xml
diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml b/tests/qemucaps2xmloutdata/caps.aarch64.xml
similarity index 100%
rename from tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml
rename to tests/qemucaps2xmloutdata/caps.aarch64.xml
diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps.ppc64.xml
similarity index 100%
rename from tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml
rename to tests/qemucaps2xmloutdata/caps.ppc64.xml
diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.riscv32.xml b/tests/qemucaps2xmloutdata/caps.riscv32.xml
similarity index 100%
rename from tests/qemucaps2xmloutdata/caps_3.0.0.riscv32.xml
rename to tests/qemucaps2xmloutdata/caps.riscv32.xml
diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.riscv64.xml b/tests/qemucaps2xmloutdata/caps.riscv64.xml
similarity index 100%
rename from tests/qemucaps2xmloutdata/caps_3.0.0.riscv64.xml
rename to tests/qemucaps2xmloutdata/caps.riscv64.xml
diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml b/tests/qemucaps2xmloutdata/caps.s390x.xml
similarity index 100%
rename from tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml
rename to tests/qemucaps2xmloutdata/caps.s390x.xml
diff --git a/tests/qemucaps2xmloutdata/caps_1.5.3.x86_64.xml b/tests/qemucaps2xmloutdata/caps.x86_64.xml
similarity index 100%
rename from tests/qemucaps2xmloutdata/caps_1.5.3.x86_64.xml
rename to tests/qemucaps2xmloutdata/caps.x86_64.xml
diff --git a/tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml
deleted file mode 100644
index d41693a001..0000000000
--- a/tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<capabilities>
-
- <host>
- <cpu>
- <arch>x86_64</arch>
- </cpu>
- <power_management/>
- <iommu support='no'/>
- </host>
-
- <guest>
- <os_type>hvm</os_type>
- <arch name='x86_64'>
- <wordsize>64</wordsize>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <domain type='qemu'/>
- <domain type='kvm'/>
- </arch>
- <features>
- <cpuselection/>
- <deviceboot/>
- <disksnapshot default='on' toggle='no'/>
- <acpi default='on' toggle='yes'/>
- <apic default='on' toggle='no'/>
- </features>
- </guest>
-
-</capabilities>
diff --git a/tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml
deleted file mode 100644
index d41693a001..0000000000
--- a/tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<capabilities>
-
- <host>
- <cpu>
- <arch>x86_64</arch>
- </cpu>
- <power_management/>
- <iommu support='no'/>
- </host>
-
- <guest>
- <os_type>hvm</os_type>
- <arch name='x86_64'>
- <wordsize>64</wordsize>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <domain type='qemu'/>
- <domain type='kvm'/>
- </arch>
- <features>
- <cpuselection/>
- <deviceboot/>
- <disksnapshot default='on' toggle='no'/>
- <acpi default='on' toggle='yes'/>
- <apic default='on' toggle='no'/>
- </features>
- </guest>
-
-</capabilities>
diff --git a/tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml
deleted file mode 100644
index d41693a001..0000000000
--- a/tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<capabilities>
-
- <host>
- <cpu>
- <arch>x86_64</arch>
- </cpu>
- <power_management/>
- <iommu support='no'/>
- </host>
-
- <guest>
- <os_type>hvm</os_type>
- <arch name='x86_64'>
- <wordsize>64</wordsize>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <domain type='qemu'/>
- <domain type='kvm'/>
- </arch>
- <features>
- <cpuselection/>
- <deviceboot/>
- <disksnapshot default='on' toggle='no'/>
- <acpi default='on' toggle='yes'/>
- <apic default='on' toggle='no'/>
- </features>
- </guest>
-
-</capabilities>
diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml
deleted file mode 100644
index d41693a001..0000000000
--- a/tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<capabilities>
-
- <host>
- <cpu>
- <arch>x86_64</arch>
- </cpu>
- <power_management/>
- <iommu support='no'/>
- </host>
-
- <guest>
- <os_type>hvm</os_type>
- <arch name='x86_64'>
- <wordsize>64</wordsize>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <domain type='qemu'/>
- <domain type='kvm'/>
- </arch>
- <features>
- <cpuselection/>
- <deviceboot/>
- <disksnapshot default='on' toggle='no'/>
- <acpi default='on' toggle='yes'/>
- <apic default='on' toggle='no'/>
- </features>
- </guest>
-
-</capabilities>
diff --git a/tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml
deleted file mode 100644
index bb82a15040..0000000000
--- a/tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<capabilities>
-
- <host>
- <cpu>
- <arch>s390x</arch>
- </cpu>
- <power_management/>
- <iommu support='no'/>
- </host>
-
- <guest>
- <os_type>hvm</os_type>
- <arch name='s390x'>
- <wordsize>64</wordsize>
- <emulator>/usr/bin/qemu-system-s390x</emulator>
- <domain type='qemu'/>
- <domain type='kvm'/>
- </arch>
- <features>
- <cpuselection/>
- <deviceboot/>
- <disksnapshot default='on' toggle='no'/>
- </features>
- </guest>
-
-</capabilities>
diff --git a/tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml
deleted file mode 100644
index d41693a001..0000000000
--- a/tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<capabilities>
-
- <host>
- <cpu>
- <arch>x86_64</arch>
- </cpu>
- <power_management/>
- <iommu support='no'/>
- </host>
-
- <guest>
- <os_type>hvm</os_type>
- <arch name='x86_64'>
- <wordsize>64</wordsize>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <domain type='qemu'/>
- <domain type='kvm'/>
- </arch>
- <features>
- <cpuselection/>
- <deviceboot/>
- <disksnapshot default='on' toggle='no'/>
- <acpi default='on' toggle='yes'/>
- <apic default='on' toggle='no'/>
- </features>
- </guest>
-
-</capabilities>
diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml
deleted file mode 100644
index f6572c8ecd..0000000000
--- a/tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<capabilities>
-
- <host>
- <cpu>
- <arch>aarch64</arch>
- </cpu>
- <power_management/>
- <iommu support='no'/>
- </host>
-
- <guest>
- <os_type>hvm</os_type>
- <arch name='aarch64'>
- <wordsize>64</wordsize>
- <emulator>/usr/bin/qemu-system-aarch64</emulator>
- <domain type='qemu'/>
- <domain type='kvm'/>
- </arch>
- <features>
- <cpuselection/>
- <deviceboot/>
- <disksnapshot default='on' toggle='no'/>
- <acpi default='on' toggle='yes'/>
- </features>
- </guest>
-
-</capabilities>
diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml
deleted file mode 100644
index 85623f3980..0000000000
--- a/tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<capabilities>
-
- <host>
- <cpu>
- <arch>ppc64</arch>
- </cpu>
- <power_management/>
- <iommu support='no'/>
- </host>
-
- <guest>
- <os_type>hvm</os_type>
- <arch name='ppc64'>
- <wordsize>64</wordsize>
- <emulator>/usr/bin/qemu-system-ppc64</emulator>
- <domain type='qemu'/>
- <domain type='kvm'/>
- </arch>
- <features>
- <cpuselection/>
- <deviceboot/>
- <disksnapshot default='on' toggle='no'/>
- </features>
- </guest>
-
-</capabilities>
diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml
deleted file mode 100644
index bb82a15040..0000000000
--- a/tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<capabilities>
-
- <host>
- <cpu>
- <arch>s390x</arch>
- </cpu>
- <power_management/>
- <iommu support='no'/>
- </host>
-
- <guest>
- <os_type>hvm</os_type>
- <arch name='s390x'>
- <wordsize>64</wordsize>
- <emulator>/usr/bin/qemu-system-s390x</emulator>
- <domain type='qemu'/>
- <domain type='kvm'/>
- </arch>
- <features>
- <cpuselection/>
- <deviceboot/>
- <disksnapshot default='on' toggle='no'/>
- </features>
- </guest>
-
-</capabilities>
diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml
deleted file mode 100644
index d41693a001..0000000000
--- a/tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<capabilities>
-
- <host>
- <cpu>
- <arch>x86_64</arch>
- </cpu>
- <power_management/>
- <iommu support='no'/>
- </host>
-
- <guest>
- <os_type>hvm</os_type>
- <arch name='x86_64'>
- <wordsize>64</wordsize>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <domain type='qemu'/>
- <domain type='kvm'/>
- </arch>
- <features>
- <cpuselection/>
- <deviceboot/>
- <disksnapshot default='on' toggle='no'/>
- <acpi default='on' toggle='yes'/>
- <apic default='on' toggle='no'/>
- </features>
- </guest>
-
-</capabilities>
diff --git a/tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml
deleted file mode 100644
index d41693a001..0000000000
--- a/tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<capabilities>
-
- <host>
- <cpu>
- <arch>x86_64</arch>
- </cpu>
- <power_management/>
- <iommu support='no'/>
- </host>
-
- <guest>
- <os_type>hvm</os_type>
- <arch name='x86_64'>
- <wordsize>64</wordsize>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <domain type='qemu'/>
- <domain type='kvm'/>
- </arch>
- <features>
- <cpuselection/>
- <deviceboot/>
- <disksnapshot default='on' toggle='no'/>
- <acpi default='on' toggle='yes'/>
- <apic default='on' toggle='no'/>
- </features>
- </guest>
-
-</capabilities>
diff --git a/tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml
deleted file mode 100644
index d41693a001..0000000000
--- a/tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<capabilities>
-
- <host>
- <cpu>
- <arch>x86_64</arch>
- </cpu>
- <power_management/>
- <iommu support='no'/>
- </host>
-
- <guest>
- <os_type>hvm</os_type>
- <arch name='x86_64'>
- <wordsize>64</wordsize>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <domain type='qemu'/>
- <domain type='kvm'/>
- </arch>
- <features>
- <cpuselection/>
- <deviceboot/>
- <disksnapshot default='on' toggle='no'/>
- <acpi default='on' toggle='yes'/>
- <apic default='on' toggle='no'/>
- </features>
- </guest>
-
-</capabilities>
diff --git a/tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml b/tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml
deleted file mode 100644
index f6572c8ecd..0000000000
--- a/tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<capabilities>
-
- <host>
- <cpu>
- <arch>aarch64</arch>
- </cpu>
- <power_management/>
- <iommu support='no'/>
- </host>
-
- <guest>
- <os_type>hvm</os_type>
- <arch name='aarch64'>
- <wordsize>64</wordsize>
- <emulator>/usr/bin/qemu-system-aarch64</emulator>
- <domain type='qemu'/>
- <domain type='kvm'/>
- </arch>
- <features>
- <cpuselection/>
- <deviceboot/>
- <disksnapshot default='on' toggle='no'/>
- <acpi default='on' toggle='yes'/>
- </features>
- </guest>
-
-</capabilities>
diff --git a/tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml
deleted file mode 100644
index 85623f3980..0000000000
--- a/tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<capabilities>
-
- <host>
- <cpu>
- <arch>ppc64</arch>
- </cpu>
- <power_management/>
- <iommu support='no'/>
- </host>
-
- <guest>
- <os_type>hvm</os_type>
- <arch name='ppc64'>
- <wordsize>64</wordsize>
- <emulator>/usr/bin/qemu-system-ppc64</emulator>
- <domain type='qemu'/>
- <domain type='kvm'/>
- </arch>
- <features>
- <cpuselection/>
- <deviceboot/>
- <disksnapshot default='on' toggle='no'/>
- </features>
- </guest>
-
-</capabilities>
diff --git a/tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml
deleted file mode 100644
index d41693a001..0000000000
--- a/tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<capabilities>
-
- <host>
- <cpu>
- <arch>x86_64</arch>
- </cpu>
- <power_management/>
- <iommu support='no'/>
- </host>
-
- <guest>
- <os_type>hvm</os_type>
- <arch name='x86_64'>
- <wordsize>64</wordsize>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <domain type='qemu'/>
- <domain type='kvm'/>
- </arch>
- <features>
- <cpuselection/>
- <deviceboot/>
- <disksnapshot default='on' toggle='no'/>
- <acpi default='on' toggle='yes'/>
- <apic default='on' toggle='no'/>
- </features>
- </guest>
-
-</capabilities>
diff --git a/tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml
deleted file mode 100644
index bb82a15040..0000000000
--- a/tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<capabilities>
-
- <host>
- <cpu>
- <arch>s390x</arch>
- </cpu>
- <power_management/>
- <iommu support='no'/>
- </host>
-
- <guest>
- <os_type>hvm</os_type>
- <arch name='s390x'>
- <wordsize>64</wordsize>
- <emulator>/usr/bin/qemu-system-s390x</emulator>
- <domain type='qemu'/>
- <domain type='kvm'/>
- </arch>
- <features>
- <cpuselection/>
- <deviceboot/>
- <disksnapshot default='on' toggle='no'/>
- </features>
- </guest>
-
-</capabilities>
diff --git a/tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml
deleted file mode 100644
index d41693a001..0000000000
--- a/tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<capabilities>
-
- <host>
- <cpu>
- <arch>x86_64</arch>
- </cpu>
- <power_management/>
- <iommu support='no'/>
- </host>
-
- <guest>
- <os_type>hvm</os_type>
- <arch name='x86_64'>
- <wordsize>64</wordsize>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <domain type='qemu'/>
- <domain type='kvm'/>
- </arch>
- <features>
- <cpuselection/>
- <deviceboot/>
- <disksnapshot default='on' toggle='no'/>
- <acpi default='on' toggle='yes'/>
- <apic default='on' toggle='no'/>
- </features>
- </guest>
-
-</capabilities>
diff --git a/tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml
deleted file mode 100644
index bb82a15040..0000000000
--- a/tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<capabilities>
-
- <host>
- <cpu>
- <arch>s390x</arch>
- </cpu>
- <power_management/>
- <iommu support='no'/>
- </host>
-
- <guest>
- <os_type>hvm</os_type>
- <arch name='s390x'>
- <wordsize>64</wordsize>
- <emulator>/usr/bin/qemu-system-s390x</emulator>
- <domain type='qemu'/>
- <domain type='kvm'/>
- </arch>
- <features>
- <cpuselection/>
- <deviceboot/>
- <disksnapshot default='on' toggle='no'/>
- </features>
- </guest>
-
-</capabilities>
diff --git a/tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml
deleted file mode 100644
index d41693a001..0000000000
--- a/tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<capabilities>
-
- <host>
- <cpu>
- <arch>x86_64</arch>
- </cpu>
- <power_management/>
- <iommu support='no'/>
- </host>
-
- <guest>
- <os_type>hvm</os_type>
- <arch name='x86_64'>
- <wordsize>64</wordsize>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <domain type='qemu'/>
- <domain type='kvm'/>
- </arch>
- <features>
- <cpuselection/>
- <deviceboot/>
- <disksnapshot default='on' toggle='no'/>
- <acpi default='on' toggle='yes'/>
- <apic default='on' toggle='no'/>
- </features>
- </guest>
-
-</capabilities>
diff --git a/tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml
deleted file mode 100644
index 85623f3980..0000000000
--- a/tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<capabilities>
-
- <host>
- <cpu>
- <arch>ppc64</arch>
- </cpu>
- <power_management/>
- <iommu support='no'/>
- </host>
-
- <guest>
- <os_type>hvm</os_type>
- <arch name='ppc64'>
- <wordsize>64</wordsize>
- <emulator>/usr/bin/qemu-system-ppc64</emulator>
- <domain type='qemu'/>
- <domain type='kvm'/>
- </arch>
- <features>
- <cpuselection/>
- <deviceboot/>
- <disksnapshot default='on' toggle='no'/>
- </features>
- </guest>
-
-</capabilities>
diff --git a/tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml
deleted file mode 100644
index bb82a15040..0000000000
--- a/tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<capabilities>
-
- <host>
- <cpu>
- <arch>s390x</arch>
- </cpu>
- <power_management/>
- <iommu support='no'/>
- </host>
-
- <guest>
- <os_type>hvm</os_type>
- <arch name='s390x'>
- <wordsize>64</wordsize>
- <emulator>/usr/bin/qemu-system-s390x</emulator>
- <domain type='qemu'/>
- <domain type='kvm'/>
- </arch>
- <features>
- <cpuselection/>
- <deviceboot/>
- <disksnapshot default='on' toggle='no'/>
- </features>
- </guest>
-
-</capabilities>
diff --git a/tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml
deleted file mode 100644
index d41693a001..0000000000
--- a/tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<capabilities>
-
- <host>
- <cpu>
- <arch>x86_64</arch>
- </cpu>
- <power_management/>
- <iommu support='no'/>
- </host>
-
- <guest>
- <os_type>hvm</os_type>
- <arch name='x86_64'>
- <wordsize>64</wordsize>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <domain type='qemu'/>
- <domain type='kvm'/>
- </arch>
- <features>
- <cpuselection/>
- <deviceboot/>
- <disksnapshot default='on' toggle='no'/>
- <acpi default='on' toggle='yes'/>
- <apic default='on' toggle='no'/>
- </features>
- </guest>
-
-</capabilities>
diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml
deleted file mode 100644
index 85623f3980..0000000000
--- a/tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<capabilities>
-
- <host>
- <cpu>
- <arch>ppc64</arch>
- </cpu>
- <power_management/>
- <iommu support='no'/>
- </host>
-
- <guest>
- <os_type>hvm</os_type>
- <arch name='ppc64'>
- <wordsize>64</wordsize>
- <emulator>/usr/bin/qemu-system-ppc64</emulator>
- <domain type='qemu'/>
- <domain type='kvm'/>
- </arch>
- <features>
- <cpuselection/>
- <deviceboot/>
- <disksnapshot default='on' toggle='no'/>
- </features>
- </guest>
-
-</capabilities>
diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_3.0.0.s390x.xml
deleted file mode 100644
index bb82a15040..0000000000
--- a/tests/qemucaps2xmloutdata/caps_3.0.0.s390x.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<capabilities>
-
- <host>
- <cpu>
- <arch>s390x</arch>
- </cpu>
- <power_management/>
- <iommu support='no'/>
- </host>
-
- <guest>
- <os_type>hvm</os_type>
- <arch name='s390x'>
- <wordsize>64</wordsize>
- <emulator>/usr/bin/qemu-system-s390x</emulator>
- <domain type='qemu'/>
- <domain type='kvm'/>
- </arch>
- <features>
- <cpuselection/>
- <deviceboot/>
- <disksnapshot default='on' toggle='no'/>
- </features>
- </guest>
-
-</capabilities>
diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml
deleted file mode 100644
index d41693a001..0000000000
--- a/tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<capabilities>
-
- <host>
- <cpu>
- <arch>x86_64</arch>
- </cpu>
- <power_management/>
- <iommu support='no'/>
- </host>
-
- <guest>
- <os_type>hvm</os_type>
- <arch name='x86_64'>
- <wordsize>64</wordsize>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <domain type='qemu'/>
- <domain type='kvm'/>
- </arch>
- <features>
- <cpuselection/>
- <deviceboot/>
- <disksnapshot default='on' toggle='no'/>
- <acpi default='on' toggle='yes'/>
- <apic default='on' toggle='no'/>
- </features>
- </guest>
-
-</capabilities>
diff --git a/tests/qemucaps2xmloutdata/caps_3.1.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_3.1.0.ppc64.xml
deleted file mode 100644
index 85623f3980..0000000000
--- a/tests/qemucaps2xmloutdata/caps_3.1.0.ppc64.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<capabilities>
-
- <host>
- <cpu>
- <arch>ppc64</arch>
- </cpu>
- <power_management/>
- <iommu support='no'/>
- </host>
-
- <guest>
- <os_type>hvm</os_type>
- <arch name='ppc64'>
- <wordsize>64</wordsize>
- <emulator>/usr/bin/qemu-system-ppc64</emulator>
- <domain type='qemu'/>
- <domain type='kvm'/>
- </arch>
- <features>
- <cpuselection/>
- <deviceboot/>
- <disksnapshot default='on' toggle='no'/>
- </features>
- </guest>
-
-</capabilities>
diff --git a/tests/qemucaps2xmloutdata/caps_3.1.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_3.1.0.x86_64.xml
deleted file mode 100644
index d41693a001..0000000000
--- a/tests/qemucaps2xmloutdata/caps_3.1.0.x86_64.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<capabilities>
-
- <host>
- <cpu>
- <arch>x86_64</arch>
- </cpu>
- <power_management/>
- <iommu support='no'/>
- </host>
-
- <guest>
- <os_type>hvm</os_type>
- <arch name='x86_64'>
- <wordsize>64</wordsize>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <domain type='qemu'/>
- <domain type='kvm'/>
- </arch>
- <features>
- <cpuselection/>
- <deviceboot/>
- <disksnapshot default='on' toggle='no'/>
- <acpi default='on' toggle='yes'/>
- <apic default='on' toggle='no'/>
- </features>
- </guest>
-
-</capabilities>
diff --git a/tests/qemucaps2xmloutdata/caps_4.0.0.riscv32.xml b/tests/qemucaps2xmloutdata/caps_4.0.0.riscv32.xml
deleted file mode 100644
index 63c374da7f..0000000000
--- a/tests/qemucaps2xmloutdata/caps_4.0.0.riscv32.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<capabilities>
-
- <host>
- <cpu>
- <arch>riscv32</arch>
- </cpu>
- <power_management/>
- <iommu support='no'/>
- </host>
-
- <guest>
- <os_type>hvm</os_type>
- <arch name='riscv32'>
- <wordsize>32</wordsize>
- <emulator>/usr/bin/qemu-system-riscv32</emulator>
- <domain type='qemu'/>
- </arch>
- <features>
- <cpuselection/>
- <deviceboot/>
- <disksnapshot default='on' toggle='no'/>
- </features>
- </guest>
-
-</capabilities>
diff --git a/tests/qemucaps2xmloutdata/caps_4.0.0.riscv64.xml b/tests/qemucaps2xmloutdata/caps_4.0.0.riscv64.xml
deleted file mode 100644
index 09b7eb7f2f..0000000000
--- a/tests/qemucaps2xmloutdata/caps_4.0.0.riscv64.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<capabilities>
-
- <host>
- <cpu>
- <arch>riscv64</arch>
- </cpu>
- <power_management/>
- <iommu support='no'/>
- </host>
-
- <guest>
- <os_type>hvm</os_type>
- <arch name='riscv64'>
- <wordsize>64</wordsize>
- <emulator>/usr/bin/qemu-system-riscv64</emulator>
- <domain type='qemu'/>
- </arch>
- <features>
- <cpuselection/>
- <deviceboot/>
- <disksnapshot default='on' toggle='no'/>
- </features>
- </guest>
-
-</capabilities>
diff --git a/tests/qemucaps2xmloutdata/caps_4.0.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_4.0.0.x86_64.xml
deleted file mode 100644
index d41693a001..0000000000
--- a/tests/qemucaps2xmloutdata/caps_4.0.0.x86_64.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<capabilities>
-
- <host>
- <cpu>
- <arch>x86_64</arch>
- </cpu>
- <power_management/>
- <iommu support='no'/>
- </host>
-
- <guest>
- <os_type>hvm</os_type>
- <arch name='x86_64'>
- <wordsize>64</wordsize>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <domain type='qemu'/>
- <domain type='kvm'/>
- </arch>
- <features>
- <cpuselection/>
- <deviceboot/>
- <disksnapshot default='on' toggle='no'/>
- <acpi default='on' toggle='yes'/>
- <apic default='on' toggle='no'/>
- </features>
- </guest>
-
-</capabilities>
diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c
index ec9d16e8dd..0d9b4e679a 100644
--- a/tests/qemucaps2xmltest.c
+++ b/tests/qemucaps2xmltest.c
@@ -128,8 +128,8 @@ testQemuCapsXML(const void *opaque)
char *capsXml = NULL;
virCapsPtr capsProvided = NULL;
- if (virAsprintf(&xmlFile, "%s/qemucaps2xmloutdata/%s.%s.xml",
- abs_srcdir, data->base, data->archName) < 0)
+ if (virAsprintf(&xmlFile, "%s/qemucaps2xmloutdata/caps.%s.xml",
+ abs_srcdir, data->archName) < 0)
goto cleanup;
if (virAsprintf(&capsFile, "%s/qemucapabilitiesdata/%s.%s.xml",
--
2.20.1
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
