[libvirt] [PATCH 0/3] tests: Improvements and cleanups to capabilities testing
*** BLURB NOW OR FOREVER HOLD YOUR PEACE *** Andrea Bolognani (3): tests: domaincaps: Order by architecture tests: domaincaps: Add QEMU 2.12 tests: qemucapabilities: Drop mostly duplicated data ...rt.aarch64.xml => qemu_2.12.0-virt.aarch64.xml} | 5 +- ...icv2-virt.aarch64.xml => qemu_2.12.0.ppc64.xml} | 51 +- ...icv2-virt.aarch64.xml => qemu_2.12.0.s390x.xml} | 50 +- tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml | 143 + ...irt.aarch64.xml => qemu_2.6.0-virt.aarch64.xml} | 0 tests/domaincapstest.c | 44 +- .../caps_2.10.0-gicv3.aarch64.replies | 16495 ----------------- .../caps_2.10.0-gicv3.aarch64.xml | 310 - ...aarch64.replies => caps_2.10.0.aarch64.replies} | 0 ...0-gicv2.aarch64.xml => caps_2.10.0.aarch64.xml} | 0 .../caps_2.12.0-gicv2.aarch64.replies | 18551 ------------------- .../caps_2.12.0-gicv2.aarch64.xml | 322 - ...aarch64.replies => caps_2.12.0.aarch64.replies} | 0 ...0-gicv3.aarch64.xml => caps_2.12.0.aarch64.xml} | 0 .../caps_2.6.0-gicv3.aarch64.replies | 13035 ------------- .../caps_2.6.0-gicv3.aarch64.xml | 287 - ....aarch64.replies => caps_2.6.0.aarch64.replies} | 0 ....0-gicv2.aarch64.xml => caps_2.6.0.aarch64.xml} | 0 tests/qemucapabilitiestest.c | 9 +- 19 files changed, 192 insertions(+), 49110 deletions(-) rename tests/domaincapsschemadata/{qemu_2.6.0-gicv3-virt.aarch64.xml => qemu_2.12.0-virt.aarch64.xml} (95%) copy tests/domaincapsschemadata/{qemu_2.6.0-gicv2-virt.aarch64.xml => qemu_2.12.0.ppc64.xml} (50%) copy tests/domaincapsschemadata/{qemu_2.6.0-gicv2-virt.aarch64.xml => qemu_2.12.0.s390x.xml} (50%) create mode 100644 tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml rename tests/domaincapsschemadata/{qemu_2.6.0-gicv2-virt.aarch64.xml => qemu_2.6.0-virt.aarch64.xml} (100%) delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.xml rename tests/qemucapabilitiesdata/{caps_2.10.0-gicv2.aarch64.replies => caps_2.10.0.aarch64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_2.10.0-gicv2.aarch64.xml => caps_2.10.0.aarch64.xml} (100%) delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.xml rename tests/qemucapabilitiesdata/{caps_2.12.0-gicv3.aarch64.replies => caps_2.12.0.aarch64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_2.12.0-gicv3.aarch64.xml => caps_2.12.0.aarch64.xml} (100%) delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml rename tests/qemucapabilitiesdata/{caps_2.6.0-gicv2.aarch64.replies => caps_2.6.0.aarch64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_2.6.0-gicv2.aarch64.xml => caps_2.6.0.aarch64.xml} (100%) -- 2.14.3
Test cases in qemucapabilitiestest are ordered by architecture first, then by QEMU version. Use the same order here. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- tests/domaincapstest.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 533a4b3791..12a7167b30 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -448,22 +448,6 @@ mymain(void) "/usr/bin/qemu-system-x86_64", NULL, "x86_64", VIR_DOMAIN_VIRT_KVM); - DO_TEST_QEMU("2.6.0", "caps_2.6.0-gicv2", - "/usr/bin/qemu-system-aarch64", NULL, - "aarch64", VIR_DOMAIN_VIRT_KVM); - - DO_TEST_QEMU("2.6.0-gicv2", "caps_2.6.0-gicv2", - "/usr/bin/qemu-system-aarch64", "virt", - "aarch64", VIR_DOMAIN_VIRT_KVM); - - DO_TEST_QEMU("2.6.0-gicv3", "caps_2.6.0-gicv3", - "/usr/bin/qemu-system-aarch64", "virt", - "aarch64", VIR_DOMAIN_VIRT_KVM); - - DO_TEST_QEMU("2.6.0", "caps_2.6.0", - "/usr/bin/qemu-system-ppc64", NULL, - "ppc64", VIR_DOMAIN_VIRT_KVM); - DO_TEST_QEMU("2.8.0", "caps_2.8.0", "/usr/bin/qemu-system-x86_64", NULL, "x86_64", VIR_DOMAIN_VIRT_KVM); @@ -484,6 +468,22 @@ mymain(void) "/usr/bin/qemu-system-x86_64", NULL, "x86_64", VIR_DOMAIN_VIRT_QEMU); + DO_TEST_QEMU("2.6.0", "caps_2.6.0-gicv2", + "/usr/bin/qemu-system-aarch64", NULL, + "aarch64", VIR_DOMAIN_VIRT_KVM); + + DO_TEST_QEMU("2.6.0-gicv2", "caps_2.6.0-gicv2", + "/usr/bin/qemu-system-aarch64", "virt", + "aarch64", VIR_DOMAIN_VIRT_KVM); + + DO_TEST_QEMU("2.6.0-gicv3", "caps_2.6.0-gicv3", + "/usr/bin/qemu-system-aarch64", "virt", + "aarch64", VIR_DOMAIN_VIRT_KVM); + + DO_TEST_QEMU("2.6.0", "caps_2.6.0", + "/usr/bin/qemu-system-ppc64", NULL, + "ppc64", VIR_DOMAIN_VIRT_KVM); + DO_TEST_QEMU("2.7.0", "caps_2.7.0", "/usr/bin/qemu-system-s390x", NULL, "s390x", VIR_DOMAIN_VIRT_KVM); -- 2.14.3
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- .../qemu_2.12.0-virt.aarch64.xml | 119 +++++++++++++++++ tests/domaincapsschemadata/qemu_2.12.0.ppc64.xml | 81 ++++++++++++ tests/domaincapsschemadata/qemu_2.12.0.s390x.xml | 78 +++++++++++ tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml | 143 +++++++++++++++++++++ tests/domaincapstest.c | 16 +++ 5 files changed, 437 insertions(+) create mode 100644 tests/domaincapsschemadata/qemu_2.12.0-virt.aarch64.xml create mode 100644 tests/domaincapsschemadata/qemu_2.12.0.ppc64.xml create mode 100644 tests/domaincapsschemadata/qemu_2.12.0.s390x.xml create mode 100644 tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml diff --git a/tests/domaincapsschemadata/qemu_2.12.0-virt.aarch64.xml b/tests/domaincapsschemadata/qemu_2.12.0-virt.aarch64.xml new file mode 100644 index 0000000000..9cba942fbf --- /dev/null +++ b/tests/domaincapsschemadata/qemu_2.12.0-virt.aarch64.xml @@ -0,0 +1,119 @@ +<domainCapabilities> + <path>/usr/bin/qemu-system-aarch64</path> + <domain>kvm</domain> + <machine>virt-2.12</machine> + <arch>aarch64</arch> + <vcpu max='255'/> + <os supported='yes'> + <loader supported='yes'> + <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> + <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> + <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <enum name='type'> + <value>rom</value> + <value>pflash</value> + </enum> + <enum name='readonly'> + <value>yes</value> + <value>no</value> + </enum> + </loader> + </os> + <cpu> + <mode name='host-passthrough' supported='yes'/> + <mode name='host-model' supported='no'/> + <mode name='custom' supported='yes'> + <model usable='unknown'>pxa262</model> + <model usable='unknown'>pxa270-a0</model> + <model usable='unknown'>arm1136</model> + <model usable='unknown'>cortex-a15</model> + <model usable='unknown'>pxa260</model> + <model usable='unknown'>arm1136-r2</model> + <model usable='unknown'>pxa261</model> + <model usable='unknown'>pxa255</model> + <model usable='unknown'>cortex-m33</model> + <model usable='unknown'>arm926</model> + <model usable='unknown'>arm11mpcore</model> + <model usable='unknown'>pxa250</model> + <model usable='unknown'>ti925t</model> + <model usable='unknown'>cortex-a57</model> + <model usable='unknown'>sa1110</model> + <model usable='unknown'>arm1176</model> + <model usable='unknown'>cortex-a53</model> + <model usable='unknown'>sa1100</model> + <model usable='unknown'>pxa270-c5</model> + <model usable='unknown'>cortex-a9</model> + <model usable='unknown'>cortex-a8</model> + <model usable='unknown'>cortex-a7</model> + <model usable='unknown'>pxa270-c0</model> + <model usable='unknown'>arm1026</model> + <model usable='unknown'>pxa270-b1</model> + <model usable='unknown'>cortex-m3</model> + <model usable='unknown'>max</model> + <model usable='unknown'>cortex-m4</model> + <model usable='unknown'>pxa270-b0</model> + <model usable='unknown'>arm946</model> + <model usable='unknown'>cortex-r5</model> + <model usable='unknown'>pxa270-a1</model> + <model usable='unknown'>pxa270</model> + </mode> + </cpu> + <devices> + <disk supported='yes'> + <enum name='diskDevice'> + <value>disk</value> + <value>cdrom</value> + <value>floppy</value> + <value>lun</value> + </enum> + <enum name='bus'> + <value>fdc</value> + <value>scsi</value> + <value>virtio</value> + <value>usb</value> + <value>sata</value> + </enum> + </disk> + <graphics supported='yes'> + <enum name='type'> + <value>sdl</value> + <value>vnc</value> + </enum> + </graphics> + <video supported='yes'> + <enum name='modelType'> + <value>vga</value> + <value>virtio</value> + </enum> + </video> + <hostdev supported='yes'> + <enum name='mode'> + <value>subsystem</value> + </enum> + <enum name='startupPolicy'> + <value>default</value> + <value>mandatory</value> + <value>requisite</value> + <value>optional</value> + </enum> + <enum name='subsysType'> + <value>usb</value> + <value>pci</value> + <value>scsi</value> + </enum> + <enum name='capsType'/> + <enum name='pciBackend'> + <value>default</value> + <value>kvm</value> + <value>vfio</value> + </enum> + </hostdev> + </devices> + <features> + <gic supported='yes'> + <enum name='version'> + <value>3</value> + </enum> + </gic> + </features> +</domainCapabilities> diff --git a/tests/domaincapsschemadata/qemu_2.12.0.ppc64.xml b/tests/domaincapsschemadata/qemu_2.12.0.ppc64.xml new file mode 100644 index 0000000000..4029e9e386 --- /dev/null +++ b/tests/domaincapsschemadata/qemu_2.12.0.ppc64.xml @@ -0,0 +1,81 @@ +<domainCapabilities> + <path>/usr/bin/qemu-system-ppc64</path> + <domain>kvm</domain> + <machine>pseries-2.12</machine> + <arch>ppc64</arch> + <vcpu max='1024'/> + <os supported='yes'> + <loader supported='yes'> + <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> + <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> + <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <enum name='type'> + <value>rom</value> + <value>pflash</value> + </enum> + <enum name='readonly'> + <value>yes</value> + <value>no</value> + </enum> + </loader> + </os> + <cpu> + <mode name='host-passthrough' supported='yes'/> + <mode name='host-model' supported='yes'> + <model fallback='allow'>POWER8</model> + </mode> + <mode name='custom' supported='no'/> + </cpu> + <devices> + <disk supported='yes'> + <enum name='diskDevice'> + <value>disk</value> + <value>cdrom</value> + <value>lun</value> + </enum> + <enum name='bus'> + <value>scsi</value> + <value>virtio</value> + <value>usb</value> + <value>sata</value> + </enum> + </disk> + <graphics supported='yes'> + <enum name='type'> + <value>sdl</value> + <value>vnc</value> + </enum> + </graphics> + <video supported='yes'> + <enum name='modelType'> + <value>vga</value> + <value>virtio</value> + </enum> + </video> + <hostdev supported='yes'> + <enum name='mode'> + <value>subsystem</value> + </enum> + <enum name='startupPolicy'> + <value>default</value> + <value>mandatory</value> + <value>requisite</value> + <value>optional</value> + </enum> + <enum name='subsysType'> + <value>usb</value> + <value>pci</value> + <value>scsi</value> + </enum> + <enum name='capsType'/> + <enum name='pciBackend'> + <value>default</value> + <value>kvm</value> + <value>vfio</value> + </enum> + </hostdev> + </devices> + <features> + <gic supported='no'/> + </features> +</domainCapabilities> diff --git a/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml b/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml new file mode 100644 index 0000000000..50680c1ef8 --- /dev/null +++ b/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml @@ -0,0 +1,78 @@ +<domainCapabilities> + <path>/usr/bin/qemu-system-s390x</path> + <domain>kvm</domain> + <machine>s390-ccw-virtio-2.12</machine> + <arch>s390x</arch> + <vcpu max='248'/> + <os supported='yes'> + <loader supported='yes'> + <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> + <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> + <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <enum name='type'> + <value>rom</value> + <value>pflash</value> + </enum> + <enum name='readonly'> + <value>yes</value> + <value>no</value> + </enum> + </loader> + </os> + <cpu> + <mode name='host-passthrough' supported='yes'/> + <mode name='host-model' supported='no'/> + <mode name='custom' supported='no'/> + </cpu> + <devices> + <disk supported='yes'> + <enum name='diskDevice'> + <value>disk</value> + <value>cdrom</value> + <value>floppy</value> + <value>lun</value> + </enum> + <enum name='bus'> + <value>fdc</value> + <value>scsi</value> + <value>virtio</value> + </enum> + </disk> + <graphics supported='yes'> + <enum name='type'> + <value>sdl</value> + <value>vnc</value> + </enum> + </graphics> + <video supported='yes'> + <enum name='modelType'> + <value>virtio</value> + </enum> + </video> + <hostdev supported='yes'> + <enum name='mode'> + <value>subsystem</value> + </enum> + <enum name='startupPolicy'> + <value>default</value> + <value>mandatory</value> + <value>requisite</value> + <value>optional</value> + </enum> + <enum name='subsysType'> + <value>usb</value> + <value>pci</value> + <value>scsi</value> + </enum> + <enum name='capsType'/> + <enum name='pciBackend'> + <value>default</value> + <value>kvm</value> + <value>vfio</value> + </enum> + </hostdev> + </devices> + <features> + <gic supported='no'/> + </features> +</domainCapabilities> diff --git a/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml b/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml new file mode 100644 index 0000000000..851d914bc9 --- /dev/null +++ b/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml @@ -0,0 +1,143 @@ +<domainCapabilities> + <path>/usr/bin/qemu-system-x86_64</path> + <domain>kvm</domain> + <machine>pc-i440fx-2.12</machine> + <arch>x86_64</arch> + <vcpu max='255'/> + <os supported='yes'> + <loader supported='yes'> + <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> + <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> + <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <enum name='type'> + <value>rom</value> + <value>pflash</value> + </enum> + <enum name='readonly'> + <value>yes</value> + <value>no</value> + </enum> + </loader> + </os> + <cpu> + <mode name='host-passthrough' supported='yes'/> + <mode name='host-model' supported='yes'> + <model fallback='forbid'>Haswell-noTSX</model> + <vendor>Intel</vendor> + <feature policy='require' name='vme'/> + <feature policy='require' name='ss'/> + <feature policy='require' name='f16c'/> + <feature policy='require' name='rdrand'/> + <feature policy='require' name='hypervisor'/> + <feature policy='require' name='arat'/> + <feature policy='require' name='tsc_adjust'/> + <feature policy='require' name='xsaveopt'/> + <feature policy='require' name='pdpe1gb'/> + <feature policy='require' name='abm'/> + <feature policy='require' name='invtsc'/> + </mode> + <mode name='custom' supported='yes'> + <model usable='yes'>qemu64</model> + <model usable='yes'>qemu32</model> + <model usable='no'>phenom</model> + <model usable='yes'>pentium3</model> + <model usable='yes'>pentium2</model> + <model usable='yes'>pentium</model> + <model usable='yes'>n270</model> + <model usable='yes'>kvm64</model> + <model usable='yes'>kvm32</model> + <model usable='yes'>coreduo</model> + <model usable='yes'>core2duo</model> + <model usable='no'>athlon</model> + <model usable='yes'>Westmere</model> + <model usable='no'>Westmere-IBRS</model> + <model usable='no'>Skylake-Server</model> + <model usable='no'>Skylake-Server-IBRS</model> + <model usable='no'>Skylake-Client</model> + <model usable='no'>Skylake-Client-IBRS</model> + <model usable='yes'>SandyBridge</model> + <model usable='no'>SandyBridge-IBRS</model> + <model usable='yes'>Penryn</model> + <model usable='no'>Opteron_G5</model> + <model usable='no'>Opteron_G4</model> + <model usable='no'>Opteron_G3</model> + <model usable='yes'>Opteron_G2</model> + <model usable='yes'>Opteron_G1</model> + <model usable='yes'>Nehalem</model> + <model usable='no'>Nehalem-IBRS</model> + <model usable='yes'>IvyBridge</model> + <model usable='no'>IvyBridge-IBRS</model> + <model usable='no'>Haswell</model> + <model usable='yes'>Haswell-noTSX</model> + <model usable='no'>Haswell-noTSX-IBRS</model> + <model usable='no'>Haswell-IBRS</model> + <model usable='no'>EPYC</model> + <model usable='no'>EPYC-IBPB</model> + <model usable='yes'>Conroe</model> + <model usable='no'>Broadwell</model> + <model usable='no'>Broadwell-noTSX</model> + <model usable='no'>Broadwell-noTSX-IBRS</model> + <model usable='no'>Broadwell-IBRS</model> + <model usable='yes'>486</model> + </mode> + </cpu> + <devices> + <disk supported='yes'> + <enum name='diskDevice'> + <value>disk</value> + <value>cdrom</value> + <value>floppy</value> + <value>lun</value> + </enum> + <enum name='bus'> + <value>ide</value> + <value>fdc</value> + <value>scsi</value> + <value>virtio</value> + <value>usb</value> + <value>sata</value> + </enum> + </disk> + <graphics supported='yes'> + <enum name='type'> + <value>sdl</value> + <value>vnc</value> + <value>spice</value> + </enum> + </graphics> + <video supported='yes'> + <enum name='modelType'> + <value>vga</value> + <value>cirrus</value> + <value>vmvga</value> + <value>qxl</value> + <value>virtio</value> + </enum> + </video> + <hostdev supported='yes'> + <enum name='mode'> + <value>subsystem</value> + </enum> + <enum name='startupPolicy'> + <value>default</value> + <value>mandatory</value> + <value>requisite</value> + <value>optional</value> + </enum> + <enum name='subsysType'> + <value>usb</value> + <value>pci</value> + <value>scsi</value> + </enum> + <enum name='capsType'/> + <enum name='pciBackend'> + <value>default</value> + <value>kvm</value> + <value>vfio</value> + </enum> + </hostdev> + </devices> + <features> + <gic supported='no'/> + </features> +</domainCapabilities> diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 12a7167b30..a950f9b79e 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -468,6 +468,10 @@ mymain(void) "/usr/bin/qemu-system-x86_64", NULL, "x86_64", VIR_DOMAIN_VIRT_QEMU); + DO_TEST_QEMU("2.12.0", "caps_2.12.0", + "/usr/bin/qemu-system-x86_64", NULL, + "x86_64", VIR_DOMAIN_VIRT_KVM); + DO_TEST_QEMU("2.6.0", "caps_2.6.0-gicv2", "/usr/bin/qemu-system-aarch64", NULL, "aarch64", VIR_DOMAIN_VIRT_KVM); @@ -480,10 +484,18 @@ mymain(void) "/usr/bin/qemu-system-aarch64", "virt", "aarch64", VIR_DOMAIN_VIRT_KVM); + DO_TEST_QEMU("2.12.0", "caps_2.12.0-gicv3", + "/usr/bin/qemu-system-aarch64", "virt", + "aarch64", VIR_DOMAIN_VIRT_KVM); + DO_TEST_QEMU("2.6.0", "caps_2.6.0", "/usr/bin/qemu-system-ppc64", NULL, "ppc64", VIR_DOMAIN_VIRT_KVM); + DO_TEST_QEMU("2.12.0", "caps_2.12.0", + "/usr/bin/qemu-system-ppc64", NULL, + "ppc64", VIR_DOMAIN_VIRT_KVM); + DO_TEST_QEMU("2.7.0", "caps_2.7.0", "/usr/bin/qemu-system-s390x", NULL, "s390x", VIR_DOMAIN_VIRT_KVM); @@ -492,6 +504,10 @@ mymain(void) "/usr/bin/qemu-system-s390x", NULL, "s390x", VIR_DOMAIN_VIRT_KVM); + DO_TEST_QEMU("2.12.0", "caps_2.12.0", + "/usr/bin/qemu-system-s390x", NULL, + "s390x", VIR_DOMAIN_VIRT_KVM); + virObjectUnref(cfg); #endif /* WITH_QEMU */ -- 2.14.3
When GIC support was introduced (QEMU 2.6 timeframe) we needed to make sure both GICv2 hardware and GICv3 hardware were handled correctly, and that was achieved by having separate capabilities data for each. Now that we have capabilities data for several QEMU versions we can stop storing data for GICv2 and GICv3 hardware separately, and instead have GICv2 data for QEMU <= 2.10 and GICv3 data for QEMU >= 2.12, without losing any coverage. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- Heavily snipped. You get the idea. .../qemu_2.6.0-gicv3-virt.aarch64.xml | 116 - ...irt.aarch64.xml => qemu_2.6.0-virt.aarch64.xml} | 0 tests/domaincapstest.c | 10 +- .../caps_2.10.0-gicv3.aarch64.replies | 16495 ----------------- .../caps_2.10.0-gicv3.aarch64.xml | 310 - ...aarch64.replies => caps_2.10.0.aarch64.replies} | 0 ...0-gicv2.aarch64.xml => caps_2.10.0.aarch64.xml} | 0 .../caps_2.12.0-gicv2.aarch64.replies | 18551 ------------------- .../caps_2.12.0-gicv2.aarch64.xml | 322 - ...aarch64.replies => caps_2.12.0.aarch64.replies} | 0 ...0-gicv3.aarch64.xml => caps_2.12.0.aarch64.xml} | 0 .../caps_2.6.0-gicv3.aarch64.replies | 13035 ------------- .../caps_2.6.0-gicv3.aarch64.xml | 287 - ....aarch64.replies => caps_2.6.0.aarch64.replies} | 0 ....0-gicv2.aarch64.xml => caps_2.6.0.aarch64.xml} | 0 tests/qemucapabilitiestest.c | 9 +- 16 files changed, 6 insertions(+), 49129 deletions(-) delete mode 100644 tests/domaincapsschemadata/qemu_2.6.0-gicv3-virt.aarch64.xml rename tests/domaincapsschemadata/{qemu_2.6.0-gicv2-virt.aarch64.xml => qemu_2.6.0-virt.aarch64.xml} (100%) delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.xml rename tests/qemucapabilitiesdata/{caps_2.10.0-gicv2.aarch64.replies => caps_2.10.0.aarch64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_2.10.0-gicv2.aarch64.xml => caps_2.10.0.aarch64.xml} (100%) delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.xml rename tests/qemucapabilitiesdata/{caps_2.12.0-gicv3.aarch64.replies => caps_2.12.0.aarch64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_2.12.0-gicv3.aarch64.xml => caps_2.12.0.aarch64.xml} (100%) delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml rename tests/qemucapabilitiesdata/{caps_2.6.0-gicv2.aarch64.replies => caps_2.6.0.aarch64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_2.6.0-gicv2.aarch64.xml => caps_2.6.0.aarch64.xml} (100%) diff --git a/tests/domaincapsschemadata/qemu_2.6.0-gicv3-virt.aarch64.xml b/tests/domaincapsschemadata/qemu_2.6.0-gicv3-virt.aarch64.xml deleted file mode 100644 index 700dc618b2..0000000000 --- a/tests/domaincapsschemadata/qemu_2.6.0-gicv3-virt.aarch64.xml +++ /dev/null @@ -1,116 +0,0 @@ -<domainCapabilities> - <path>/usr/bin/qemu-system-aarch64</path> - <domain>kvm</domain> - <machine>virt-2.6</machine> - <arch>aarch64</arch> [...] diff --git a/tests/domaincapsschemadata/qemu_2.6.0-gicv2-virt.aarch64.xml b/tests/domaincapsschemadata/qemu_2.6.0-virt.aarch64.xml similarity index 100% rename from tests/domaincapsschemadata/qemu_2.6.0-gicv2-virt.aarch64.xml rename to tests/domaincapsschemadata/qemu_2.6.0-virt.aarch64.xml diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index a950f9b79e..06e77fd586 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -472,19 +472,15 @@ mymain(void) "/usr/bin/qemu-system-x86_64", NULL, "x86_64", VIR_DOMAIN_VIRT_KVM); - DO_TEST_QEMU("2.6.0", "caps_2.6.0-gicv2", + DO_TEST_QEMU("2.6.0", "caps_2.6.0", "/usr/bin/qemu-system-aarch64", NULL, "aarch64", VIR_DOMAIN_VIRT_KVM); - DO_TEST_QEMU("2.6.0-gicv2", "caps_2.6.0-gicv2", - "/usr/bin/qemu-system-aarch64", "virt", - "aarch64", VIR_DOMAIN_VIRT_KVM); - - DO_TEST_QEMU("2.6.0-gicv3", "caps_2.6.0-gicv3", + DO_TEST_QEMU("2.6.0", "caps_2.6.0", "/usr/bin/qemu-system-aarch64", "virt", "aarch64", VIR_DOMAIN_VIRT_KVM); - DO_TEST_QEMU("2.12.0", "caps_2.12.0-gicv3", + DO_TEST_QEMU("2.12.0", "caps_2.12.0", "/usr/bin/qemu-system-aarch64", "virt", "aarch64", VIR_DOMAIN_VIRT_KVM); diff --git a/tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.replies deleted file mode 100644 index 8843ae72bf..0000000000 --- a/tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.replies +++ /dev/null @@ -1,16495 +0,0 @@ -{ - "QMP": { - "version": { - "qemu": { - "micro": 0, - "minor": 10, - "major": 2 - }, - "package": " (v2.10.0)" - }, - "capabilities": [ - ] - } -} [...] diff --git a/tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.xml deleted file mode 100644 index 0f5f724c3e..0000000000 --- a/tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.xml +++ /dev/null @@ -1,310 +0,0 @@ -<qemuCaps> - <qemuctime>0</qemuctime> - <selfctime>0</selfctime> - <selfvers>0</selfvers> - <usedQMP/> [...] diff --git a/tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.replies rename to tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies diff --git a/tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.xml rename to tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml diff --git a/tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.replies deleted file mode 100644 index 50bc6d3895..0000000000 --- a/tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.replies +++ /dev/null @@ -1,18551 +0,0 @@ -{ - "QMP": { - "version": { - "qemu": { - "micro": 90, - "minor": 11, - "major": 2 - }, - "package": "v2.12.0-rc0" - }, - "capabilities": [ - "oob" - ] - } -} [...] diff --git a/tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.xml deleted file mode 100644 index 333ee40d95..0000000000 --- a/tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.xml +++ /dev/null @@ -1,322 +0,0 @@ -<qemuCaps> - <qemuctime>0</qemuctime> - <selfctime>0</selfctime> - <selfvers>0</selfvers> - <usedQMP/> [...] diff --git a/tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.replies rename to tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies diff --git a/tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.xml rename to tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies deleted file mode 100644 index 920b14d6f0..0000000000 --- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies +++ /dev/null @@ -1,13035 +0,0 @@ -{ - "QMP": { - "version": { - "qemu": { - "micro": 0, - "minor": 6, - "major": 2 - }, - "package": "" - }, - "capabilities": [ - ] - } -} [...] diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml deleted file mode 100644 index 880a49fc55..0000000000 --- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml +++ /dev/null @@ -1,287 +0,0 @@ -<qemuCaps> - <qemuctime>0</qemuctime> - <selfctime>0</selfctime> - <selfvers>0</selfvers> - <usedQMP/> [...] diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies rename to tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml rename to tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 33609af45c..0d136cc8b5 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -178,12 +178,9 @@ mymain(void) DO_TEST("x86_64", "caps_2.9.0"); DO_TEST("x86_64", "caps_2.10.0"); DO_TEST("x86_64", "caps_2.12.0"); - DO_TEST("aarch64", "caps_2.6.0-gicv2"); - DO_TEST("aarch64", "caps_2.6.0-gicv3"); - DO_TEST("aarch64", "caps_2.10.0-gicv2"); - DO_TEST("aarch64", "caps_2.10.0-gicv3"); - DO_TEST("aarch64", "caps_2.12.0-gicv2"); - DO_TEST("aarch64", "caps_2.12.0-gicv3"); + DO_TEST("aarch64", "caps_2.6.0"); + DO_TEST("aarch64", "caps_2.10.0"); + DO_TEST("aarch64", "caps_2.12.0"); DO_TEST("ppc64", "caps_2.6.0"); DO_TEST("ppc64", "caps_2.9.0"); DO_TEST("ppc64", "caps_2.10.0"); -- 2.14.3
participants (2)
-
Andrea Bolognani -
Ján Tomko