From nobody Thu May 2 07:35:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1521814038517196.300769222162; Fri, 23 Mar 2018 07:07:18 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 405787E9DE; Fri, 23 Mar 2018 14:07:17 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F41EC60F8D; Fri, 23 Mar 2018 14:07:16 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id B892E4CA99; Fri, 23 Mar 2018 14:07:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2NE5kHF028700 for ; Fri, 23 Mar 2018 10:05:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 304B82023234; Fri, 23 Mar 2018 14:05:46 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CB7EC2023233 for ; Fri, 23 Mar 2018 14:05:45 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 23 Mar 2018 15:05:39 +0100 Message-Id: <20180323140541.15175-2-abologna@redhat.com> In-Reply-To: <20180323140541.15175-1-abologna@redhat.com> References: <20180323140541.15175-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/3] tests: domaincaps: Order by architecture X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 23 Mar 2018 14:07:17 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Test cases in qemucapabilitiestest are ordered by architecture first, then by QEMU version. Use the same order here. Signed-off-by: Andrea Bolognani --- 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); =20 - 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); =20 + 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); --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 07:35:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1521814045675560.4248934090143; Fri, 23 Mar 2018 07:07:25 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 050967D509; Fri, 23 Mar 2018 14:07:24 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BB311842CE; Fri, 23 Mar 2018 14:07:23 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 72A6F4CA9C; Fri, 23 Mar 2018 14:07:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2NE5lrn028707 for ; Fri, 23 Mar 2018 10:05:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id DF1A02023234; Fri, 23 Mar 2018 14:05:46 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6A5802023233 for ; Fri, 23 Mar 2018 14:05:46 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 23 Mar 2018 15:05:40 +0100 Message-Id: <20180323140541.15175-3-abologna@redhat.com> In-Reply-To: <20180323140541.15175-1-abologna@redhat.com> References: <20180323140541.15175-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/3] tests: domaincaps: Add QEMU 2.12 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 23 Mar 2018 14:07:24 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Andrea Bolognani --- .../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/test= s/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 @@ + + /usr/bin/qemu-system-aarch64 + kvm + virt-2.12 + aarch64 + + + + /usr/share/AAVMF/AAVMF_CODE.fd + /usr/share/AAVMF/AAVMF32_CODE.fd + /usr/share/OVMF/OVMF_CODE.fd + + rom + pflash + + + yes + no + + + + + + + + pxa262 + pxa270-a0 + arm1136 + cortex-a15 + pxa260 + arm1136-r2 + pxa261 + pxa255 + cortex-m33 + arm926 + arm11mpcore + pxa250 + ti925t + cortex-a57 + sa1110 + arm1176 + cortex-a53 + sa1100 + pxa270-c5 + cortex-a9 + cortex-a8 + cortex-a7 + pxa270-c0 + arm1026 + pxa270-b1 + cortex-m3 + max + cortex-m4 + pxa270-b0 + arm946 + cortex-r5 + pxa270-a1 + pxa270 + + + + + + disk + cdrom + floppy + lun + + + fdc + scsi + virtio + usb + sata + + + + + sdl + vnc + + + + + + subsystem + + + default + mandatory + requisite + optional + + + usb + pci + scsi + + + + default + kvm + vfio + + + + + + + 3 + + + + diff --git a/tests/domaincapsschemadata/qemu_2.12.0.ppc64.xml b/tests/domai= ncapsschemadata/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 @@ + + /usr/bin/qemu-system-ppc64 + kvm + pseries-2.12 + ppc64 + + + + /usr/share/AAVMF/AAVMF_CODE.fd + /usr/share/AAVMF/AAVMF32_CODE.fd + /usr/share/OVMF/OVMF_CODE.fd + + rom + pflash + + + yes + no + + + + + + + POWER8 + + + + + + + disk + cdrom + lun + + + scsi + virtio + usb + sata + + + + + sdl + vnc + + + + + + subsystem + + + default + mandatory + requisite + optional + + + usb + pci + scsi + + + + default + kvm + vfio + + + + + + + diff --git a/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml b/tests/domai= ncapsschemadata/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 @@ + + /usr/bin/qemu-system-s390x + kvm + s390-ccw-virtio-2.12 + s390x + + + + /usr/share/AAVMF/AAVMF_CODE.fd + /usr/share/AAVMF/AAVMF32_CODE.fd + /usr/share/OVMF/OVMF_CODE.fd + + rom + pflash + + + yes + no + + + + + + + + + + + + disk + cdrom + floppy + lun + + + fdc + scsi + virtio + + + + + sdl + vnc + + + + + + subsystem + + + default + mandatory + requisite + optional + + + usb + pci + scsi + + + + default + kvm + vfio + + + + + + + diff --git a/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml b/tests/doma= incapsschemadata/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 @@ + + /usr/bin/qemu-system-x86_64 + kvm + pc-i440fx-2.12 + x86_64 + + + + /usr/share/AAVMF/AAVMF_CODE.fd + /usr/share/AAVMF/AAVMF32_CODE.fd + /usr/share/OVMF/OVMF_CODE.fd + + rom + pflash + + + yes + no + + + + + + + Haswell-noTSX + Intel + + + + + + + + + + + + + + qemu64 + qemu32 + phenom + pentium3 + pentium2 + pentium + n270 + kvm64 + kvm32 + coreduo + core2duo + athlon + Westmere + Westmere-IBRS + Skylake-Server + Skylake-Server-IBRS + Skylake-Client + Skylake-Client-IBRS + SandyBridge + SandyBridge-IBRS + Penryn + Opteron_G5 + Opteron_G4 + Opteron_G3 + Opteron_G2 + Opteron_G1 + Nehalem + Nehalem-IBRS + IvyBridge + IvyBridge-IBRS + Haswell + Haswell-noTSX + Haswell-noTSX-IBRS + Haswell-IBRS + EPYC + EPYC-IBPB + Conroe + Broadwell + Broadwell-noTSX + Broadwell-noTSX-IBRS + Broadwell-IBRS + 486 + + + + + + disk + cdrom + floppy + lun + + + ide + fdc + scsi + virtio + usb + sata + + + + + sdl + vnc + spice + + + + + + subsystem + + + default + mandatory + requisite + optional + + + usb + pci + scsi + + + + default + kvm + vfio + + + + + + + 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); =20 + 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); =20 + 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); =20 + 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); =20 + DO_TEST_QEMU("2.12.0", "caps_2.12.0", + "/usr/bin/qemu-system-s390x", NULL, + "s390x", VIR_DOMAIN_VIRT_KVM); + virObjectUnref(cfg); =20 #endif /* WITH_QEMU */ --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 07:35:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1521814048152204.50785303478483; Fri, 23 Mar 2018 07:07:28 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8A4A97D4EF; Fri, 23 Mar 2018 14:07:26 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 62FE418022; Fri, 23 Mar 2018 14:07:26 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2D2D84CA9E; Fri, 23 Mar 2018 14:07:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2NE5lJe028715 for ; Fri, 23 Mar 2018 10:05:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7E37D2023234; Fri, 23 Mar 2018 14:05:47 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 253032023233 for ; Fri, 23 Mar 2018 14:05:47 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 23 Mar 2018 15:05:41 +0100 Message-Id: <20180323140541.15175-4-abologna@redhat.com> In-Reply-To: <20180323140541.15175-1-abologna@redhat.com> References: <20180323140541.15175-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/3] tests: qemucapabilities: Drop mostly duplicated data X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 23 Mar 2018 14:07:27 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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 <=3D 2.10 and GICv3 data for QEMU >=3D 2.12, without losing any coverage. Signed-off-by: Andrea Bolognani --- Heavily snipped. You get the idea. .../qemu_2.6.0-gicv3-virt.aarch64.xml | 116 - ...irt.aarch64.xml =3D> 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 =3D> caps_2.10.0.aarch64.replies} | 0 ...0-gicv2.aarch64.xml =3D> 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 =3D> caps_2.12.0.aarch64.replies} | 0 ...0-gicv3.aarch64.xml =3D> 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 =3D> caps_2.6.0.aarch64.replies} | 0 ....0-gicv2.aarch64.xml =3D> 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.aarch6= 4.xml rename tests/domaincapsschemadata/{qemu_2.6.0-gicv2-virt.aarch64.xml =3D> = qemu_2.6.0-virt.aarch64.xml} (100%) delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.re= plies delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.xml rename tests/qemucapabilitiesdata/{caps_2.10.0-gicv2.aarch64.replies =3D> = caps_2.10.0.aarch64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_2.10.0-gicv2.aarch64.xml =3D> caps= _2.10.0.aarch64.xml} (100%) delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.re= plies delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.xml rename tests/qemucapabilitiesdata/{caps_2.12.0-gicv3.aarch64.replies =3D> = caps_2.12.0.aarch64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_2.12.0-gicv3.aarch64.xml =3D> caps= _2.12.0.aarch64.xml} (100%) delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.rep= lies delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml rename tests/qemucapabilitiesdata/{caps_2.6.0-gicv2.aarch64.replies =3D> c= aps_2.6.0.aarch64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_2.6.0-gicv2.aarch64.xml =3D> 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 @@ - - /usr/bin/qemu-system-aarch64 - kvm - virt-2.6 - aarch64 [...] 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); =20 - 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); =20 - 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); =20 - 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); =20 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/tes= ts/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 @@ - - 0 - 0 - 0 - [...] 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/tes= ts/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/tes= ts/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 @@ - - 0 - 0 - 0 - [...] 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/tes= ts/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/test= s/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 @@ - - 0 - 0 - 0 - [...] 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/test= s/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"); --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list