External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-09-30 11:25:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Unify qemucaps2xml output files

Browse Source 
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@redhat.com>
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Andrea Bolognani 2019-02-01 13:16:18 +01:00
parent 620d9dd598
commit eeafebc51d
37 changed files with 2 additions and 812 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml → tests/qemucaps2xmloutdata/caps.aarch64.xml
View File

0
tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml → tests/qemucaps2xmloutdata/caps.ppc64.xml
View File

0
tests/qemucaps2xmloutdata/caps_3.0.0.riscv32.xml → tests/qemucaps2xmloutdata/caps.riscv32.xml
View File

0
tests/qemucaps2xmloutdata/caps_3.0.0.riscv64.xml → tests/qemucaps2xmloutdata/caps.riscv64.xml
View File

0
tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml → tests/qemucaps2xmloutdata/caps.s390x.xml
View File

0
tests/qemucaps2xmloutdata/caps_1.5.3.x86_64.xml → tests/qemucaps2xmloutdata/caps.x86_64.xml
View File

28
tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml
View File

@ -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>

28
tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml
View File

@ -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>

28
tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml
View File

@ -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>

28
tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml
View File

@ -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>

26
tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml
View File

@ -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>

28
tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml
View File

@ -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>

27
tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml
View File

@ -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>

26
tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml
View File

@ -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>

26
tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml
View File

@ -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>

28
tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml
View File

@ -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>

28
tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml
View File

@ -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>

28
tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml
View File

@ -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>

27
tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml
View File

@ -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>

26
tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml
View File

@ -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>

28
tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml
View File

@ -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>

26
tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml
View File

@ -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>

28
tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml
View File

@ -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>

26
tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml
View File

@ -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>

28
tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml
View File

@ -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>

26
tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml
View File

@ -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>

26
tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml
View File

@ -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>

28
tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml
View File

@ -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>

26
tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml
View File

@ -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>

26
tests/qemucaps2xmloutdata/caps_3.0.0.s390x.xml
View File

@ -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>

28
tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml
View File

@ -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>

26
tests/qemucaps2xmloutdata/caps_3.1.0.ppc64.xml
View File

@ -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>

28
tests/qemucaps2xmloutdata/caps_3.1.0.x86_64.xml
View File

@ -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>

25
tests/qemucaps2xmloutdata/caps_4.0.0.riscv32.xml
View File

@ -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>

25
tests/qemucaps2xmloutdata/caps_4.0.0.riscv64.xml
View File

@ -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>

28
tests/qemucaps2xmloutdata/caps_4.0.0.x86_64.xml
View File

@ -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>

4
tests/qemucaps2xmltest.c
View File

@ -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",