From nobody Wed Feb 11 10:03:11 2026 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.zoho.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 1490282993423891.4887677904429; Thu, 23 Mar 2017 08:29:53 -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 A282CC05166F; Thu, 23 Mar 2017 15:29:52 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 716FB77EE7; Thu, 23 Mar 2017 15:29:52 +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 1D2185EC64; Thu, 23 Mar 2017 15:29:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2NFQVEj020980 for ; Thu, 23 Mar 2017 11:26:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 345C919167; Thu, 23 Mar 2017 15:26:31 +0000 (UTC) Received: from dnr.brq.redhat.com (dhcp129-199.brq.redhat.com [10.34.129.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id AF4141915A for ; Thu, 23 Mar 2017 15:26:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A282CC05166F Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com A282CC05166F From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Thu, 23 Mar 2017 16:26:17 +0100 Message-Id: <6dfa411538bf2f7e73b667ad060b971dbce4d775.1490282724.git.jtomko@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 5/9] qemu: allow 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 23 Mar 2017 15:29:53 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Do not probe for devices that QEMU does not know when probing for device options. --- src/qemu/qemu_capabilities.c | 99 ++++++++++++++++++++++++++++++----------= ---- 1 file changed, 68 insertions(+), 31 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 05d0a91..278badf 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1742,71 +1742,103 @@ struct virQEMUCapsObjectTypeProps { const char *type; struct virQEMUCapsStringFlags *props; size_t nprops; + int capsCondition; }; =20 static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] =3D { { "virtio-blk-pci", virQEMUCapsObjectPropsVirtioBlk, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBlk) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBlk), + -1 }, { "virtio-net-pci", virQEMUCapsObjectPropsVirtioNet, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioNet) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioNet), + -1 }, { "virtio-scsi-pci", virQEMUCapsObjectPropsVirtioSCSI, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioSCSI) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioSCSI), + -1 }, { "virtio-blk-ccw", virQEMUCapsObjectPropsVirtioBlk, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBlk) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBlk), + -1 }, { "virtio-net-ccw", virQEMUCapsObjectPropsVirtioNet, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioNet) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioNet), + -1 }, { "virtio-scsi-ccw", virQEMUCapsObjectPropsVirtioSCSI, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioSCSI) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioSCSI), + -1 }, { "virtio-blk-s390", virQEMUCapsObjectPropsVirtioBlk, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBlk) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBlk), + -1 }, { "virtio-net-s390", virQEMUCapsObjectPropsVirtioNet, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioNet) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioNet), + -1 }, { "pci-assign", virQEMUCapsObjectPropsPCIAssign, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsPCIAssign) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsPCIAssign), + -1 }, { "kvm-pci-assign", virQEMUCapsObjectPropsPCIAssign, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsPCIAssign) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsPCIAssign), + -1 }, { "vfio-pci", virQEMUCapsObjectPropsVfioPCI, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsVfioPCI) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsVfioPCI), + -1 }, { "scsi-disk", virQEMUCapsObjectPropsSCSIDisk, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsSCSIDisk) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsSCSIDisk), + -1 }, { "ide-drive", virQEMUCapsObjectPropsIDEDrive, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsIDEDrive) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsIDEDrive), + -1 }, { "PIIX4_PM", virQEMUCapsObjectPropsPiix4PM, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsPiix4PM) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsPiix4PM), + -1 }, { "usb-redir", virQEMUCapsObjectPropsUSBRedir, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBRedir) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBRedir), + -1 }, { "usb-host", virQEMUCapsObjectPropsUSBHost, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBHost) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBHost), + -1 }, { "scsi-generic", virQEMUCapsObjectPropsSCSIGeneric, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsSCSIGeneric) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsSCSIGeneric), + -1 }, { "i440FX-pcihost", virQEMUCapsObjectPropsI440FXPCIHost, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsI440FXPCIHost) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsI440FXPCIHost), + -1 }, { "q35-pcihost", virQEMUCapsObjectPropsQ35PCIHost, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsQ35PCIHost) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsQ35PCIHost), + -1 }, { "usb-storage", virQEMUCapsObjectPropsUSBStorage, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBStorage) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBStorage), + -1 }, { "kvm-pit", virQEMUCapsObjectPropsKVMPit, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsKVMPit) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsKVMPit), + -1 }, { "VGA", virQEMUCapsObjectPropsVGA, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsVGA) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsVGA), + -1 }, { "vmware-svga", virQEMUCapsObjectPropsVmwareSvga, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsVmwareSvga) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsVmwareSvga), + -1 }, { "qxl", virQEMUCapsObjectPropsQxl, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsQxl) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsQxl), + -1 }, { "virtio-gpu-pci", virQEMUCapsObjectPropsVirtioGpu, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioGpu) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioGpu), + -1 }, { "virtio-gpu-device", virQEMUCapsObjectPropsVirtioGpu, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioGpu) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioGpu), + -1 }, { "ICH9-LPC", virQEMUCapsObjectPropsICH9, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsICH9) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsICH9), + -1 }, { "virtio-balloon-pci", virQEMUCapsObjectPropsVirtioBalloon, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBalloon) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBalloon), + -1 }, { "virtio-balloon-ccw", virQEMUCapsObjectPropsVirtioBalloon, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBalloon) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBalloon), + -1 }, { "virtio-balloon-device", virQEMUCapsObjectPropsVirtioBalloon, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBalloon) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBalloon), + -1 }, { "nec-usb-xhci", virQEMUCapsObjectPropsUSBNECXHCI, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBNECXHCI) }, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBNECXHCI), + -1 }, }; =20 struct virQEMUCapsPropTypeObjects { @@ -2719,6 +2751,11 @@ virQEMUCapsProbeQMPObjects(virQEMUCapsPtr qemuCaps, =20 for (i =3D 0; i < ARRAY_CARDINALITY(virQEMUCapsObjectProps); i++) { const char *type =3D virQEMUCapsObjectProps[i].type; + int cap =3D virQEMUCapsObjectProps[i].capsCondition; + + if (cap >=3D 0 && !virQEMUCapsGet(qemuCaps, cap)) + continue; + if ((nvalues =3D qemuMonitorGetObjectProps(mon, type, &values)) < 0) --=20 2.10.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list