From nobody Wed May 14 19:56:01 2025 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1520350164577895.9905815820839; Tue, 6 Mar 2018 07:29:24 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A4B736E761; Tue, 6 Mar 2018 15:29:22 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E6B8E60851; Tue, 6 Mar 2018 15:29:21 +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 7B4EA181A875; Tue, 6 Mar 2018 15:29:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w26FTJ8w003449 for ; Tue, 6 Mar 2018 10:29:19 -0500 Received: by smtp.corp.redhat.com (Postfix) id 96DCE213AEFA; Tue, 6 Mar 2018 15:29:19 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.98]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3DB7A213AEF8 for ; Tue, 6 Mar 2018 15:29:19 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Tue, 6 Mar 2018 16:29:13 +0100 Message-Id: <20180306152915.8518-2-abologna@redhat.com> In-Reply-To: <20180306152915.8518-1-abologna@redhat.com> References: <20180306152915.8518-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/3] qemu: Take full advantage of conditional device property probing 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 06 Mar 2018 15:29:23 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Commit 4ae59411fa3f introduced the ability to make probing for device properties conditional on a capability being set, but didn't extend the use of this feature to existing devices. This commit does the last bit of work, which results in a lot of pointless QMP chatter no longer happening and our test suite shrinking a fair bit. Signed-off-by: Andrea Bolognani --- "I have discovered a truly marvelous diff for this, which this mailing list is too narrow to contain." - Pierre de Fermat, 1637 The full version can be fetched from https://github.com/andreabolognani/libvirt/tree/caps-cleanup src/qemu/qemu_capabilities.c | 34 +++---- .../qemucapabilitiesdata/caps_1.2.2.x86_64.replies | 102 ++++++-----------= -- tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_1.3.1.x86_64.replies | 90 ++++++----------- tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_1.4.2.x86_64.replies | 90 ++++++----------- tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 90 ++++++----------- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 90 ++++++----------- tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 90 ++++++----------- tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 90 ++++++----------- tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 2 +- .../caps_2.10.0-gicv2.aarch64.replies | 100 ++++++-----------= -- .../caps_2.10.0-gicv2.aarch64.xml | 2 +- .../caps_2.10.0-gicv3.aarch64.replies | 100 ++++++-----------= -- .../caps_2.10.0-gicv3.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 100 ++++++-----------= -- tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 108 +++++------------= ---- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 2 +- .../caps_2.10.0.x86_64.replies | 90 +++++++---------- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 108 +++++------------= ---- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 80 ++++++--------- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 82 +++++++--------- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 2 +- .../caps_2.6.0-gicv2.aarch64.replies | 100 ++++++-----------= -- .../caps_2.6.0-gicv2.aarch64.xml | 2 +- .../caps_2.6.0-gicv3.aarch64.replies | 100 ++++++-----------= -- .../caps_2.6.0-gicv3.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 100 ++++++-----------= -- tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 82 +++++++--------- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 104 +++++------------= --- tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 82 +++++++--------- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 108 +++++------------= ---- tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 82 +++++++--------- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 100 ++++++-----------= -- tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 108 +++++------------= ---- tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 90 +++++++---------- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 2 +- 53 files changed, 820 insertions(+), 1732 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b5eb8cf46a..4dec0046df 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1838,25 +1838,25 @@ static struct virQEMUCapsObjectTypeProps virQEMUCap= sObjectProps[] =3D { -1 }, { "virtio-net-pci", virQEMUCapsObjectPropsVirtioNet, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioNet), - -1 }, + QEMU_CAPS_DEVICE_VIRTIO_NET }, { "virtio-scsi-pci", virQEMUCapsObjectPropsVirtioSCSI, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioSCSI), - -1 }, + QEMU_CAPS_VIRTIO_SCSI }, { "virtio-blk-ccw", virQEMUCapsObjectPropsVirtioBlk, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBlk), - -1 }, + QEMU_CAPS_VIRTIO_CCW }, { "virtio-net-ccw", virQEMUCapsObjectPropsVirtioNet, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioNet), - -1 }, + QEMU_CAPS_DEVICE_VIRTIO_NET }, { "virtio-scsi-ccw", virQEMUCapsObjectPropsVirtioSCSI, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioSCSI), - -1 }, + QEMU_CAPS_VIRTIO_SCSI }, { "virtio-blk-s390", virQEMUCapsObjectPropsVirtioBlk, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBlk), - -1 }, + QEMU_CAPS_VIRTIO_S390 }, { "virtio-net-s390", virQEMUCapsObjectPropsVirtioNet, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioNet), - -1 }, + QEMU_CAPS_DEVICE_VIRTIO_NET }, { "pci-assign", virQEMUCapsObjectPropsPCIAssign, ARRAY_CARDINALITY(virQEMUCapsObjectPropsPCIAssign), -1 }, @@ -1865,7 +1865,7 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsO= bjectProps[] =3D { -1 }, { "vfio-pci", virQEMUCapsObjectPropsVfioPCI, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVfioPCI), - -1 }, + QEMU_CAPS_DEVICE_VFIO_PCI }, { "scsi-disk", virQEMUCapsObjectPropsSCSIDisk, ARRAY_CARDINALITY(virQEMUCapsObjectPropsSCSIDisk), -1 }, @@ -1877,13 +1877,13 @@ static struct virQEMUCapsObjectTypeProps virQEMUCap= sObjectProps[] =3D { -1 }, { "usb-redir", virQEMUCapsObjectPropsUSBRedir, ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBRedir), - -1 }, + QEMU_CAPS_USB_REDIR }, { "usb-host", virQEMUCapsObjectPropsUSBHost, ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBHost), -1 }, { "scsi-generic", virQEMUCapsObjectPropsSCSIGeneric, ARRAY_CARDINALITY(virQEMUCapsObjectPropsSCSIGeneric), - -1 }, + QEMU_CAPS_DEVICE_SCSI_GENERIC }, { "i440FX-pcihost", virQEMUCapsObjectPropsI440FXPCIHost, ARRAY_CARDINALITY(virQEMUCapsObjectPropsI440FXPCIHost), -1 }, @@ -1892,25 +1892,25 @@ static struct virQEMUCapsObjectTypeProps virQEMUCap= sObjectProps[] =3D { -1 }, { "usb-storage", virQEMUCapsObjectPropsUSBStorage, ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBStorage), - -1 }, + QEMU_CAPS_DEVICE_USB_STORAGE }, { "kvm-pit", virQEMUCapsObjectPropsKVMPit, ARRAY_CARDINALITY(virQEMUCapsObjectPropsKVMPit), -1 }, { "VGA", virQEMUCapsObjectPropsVGA, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVGA), - -1 }, + QEMU_CAPS_DEVICE_VGA }, { "vmware-svga", virQEMUCapsObjectPropsVmwareSvga, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVmwareSvga), - -1 }, + QEMU_CAPS_DEVICE_VMWARE_SVGA }, { "qxl", virQEMUCapsObjectPropsQxl, ARRAY_CARDINALITY(virQEMUCapsObjectPropsQxl), - -1 }, + QEMU_CAPS_DEVICE_QXL }, { "virtio-gpu-pci", virQEMUCapsObjectPropsVirtioGpu, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioGpu), - -1 }, + QEMU_CAPS_DEVICE_VIRTIO_GPU }, { "virtio-gpu-device", virQEMUCapsObjectPropsVirtioGpu, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioGpu), - -1 }, + QEMU_CAPS_DEVICE_VIRTIO_GPU }, { "ICH9-LPC", virQEMUCapsObjectPropsICH9, ARRAY_CARDINALITY(virQEMUCapsObjectPropsICH9), -1 }, @@ -1925,7 +1925,7 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsO= bjectProps[] =3D { -1 }, { "nec-usb-xhci", virQEMUCapsObjectPropsUSBNECXHCI, ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBNECXHCI), - -1 }, + QEMU_CAPS_NEC_USB_XHCI }, { "intel-iommu", virQEMUCapsObjectPropsIntelIOMMU, ARRAY_CARDINALITY(virQEMUCapsObjectPropsIntelIOMMU), QEMU_CAPS_DEVICE_INTEL_IOMMU }, --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list