From nobody Wed May 14 13:30:29 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 1524146450295314.114818329631; Thu, 19 Apr 2018 07:00:50 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D712582A1; Thu, 19 Apr 2018 14:00:48 +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 985D484AED; Thu, 19 Apr 2018 14:00:41 +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 7DCC54CAAB; Thu, 19 Apr 2018 14:00:40 +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 w3JE0b0X001136 for ; Thu, 19 Apr 2018 10:00:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0CF1E2166BC6; Thu, 19 Apr 2018 14:00:37 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 69CE22166BAE; Thu, 19 Apr 2018 14:00:36 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Thu, 19 Apr 2018 16:00:24 +0200 Message-Id: <3caa45c7fc159b7eaafb864b2fb26ec9f203d64e.1524146247.git.mprivozn@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Cc: zack.cornelius@kove.net, ehabkost@redhat.com Subject: [libvirt] [PATCH v3 2/5] qemu_capabilities: Separate out device props fetching 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 19 Apr 2018 14:00:49 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The code is written generic enough to be reused. Move it into a separate function. Signed-off-by: Michal Privoznik Reviewed-by: J=EF=BF=BDn Tomko --- src/qemu/qemu_capabilities.c | 62 ++++++++++++++++++++++++++++++----------= ---- 1 file changed, 42 insertions(+), 20 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 634998bbf1..833c75514c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1249,14 +1249,19 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMP= SchemaQueries[] =3D { { "blockdev-add/arg-type/+qcow2/encrypt/+luks/key-secret", QEMU_CAPS_Q= COW2_LUKS }, }; =20 -struct virQEMUCapsObjectTypeProps { +typedef struct _virQEMUCapsObjectTypeProps virQEMUCapsObjectTypeProps; +struct _virQEMUCapsObjectTypeProps { const char *type; struct virQEMUCapsStringFlags *props; size_t nprops; int capsCondition; }; =20 -static struct virQEMUCapsObjectTypeProps virQEMUCapsDeviceProps[] =3D { +typedef int (*virQEMUCapsObjectTypePropsCB)(qemuMonitorPtr mon, + const char *type, + char ***props); + +static virQEMUCapsObjectTypeProps virQEMUCapsDeviceProps[] =3D { { "virtio-blk-pci", virQEMUCapsDevicePropsVirtioBlk, ARRAY_CARDINALITY(virQEMUCapsDevicePropsVirtioBlk), -1 }, @@ -2066,6 +2071,35 @@ virQEMUCapsProbeQMPEvents(virQEMUCapsPtr qemuCaps, return 0; } =20 +static int +virQEMUCapsProbeQMPGenericProps(virQEMUCapsPtr qemuCaps, + qemuMonitorPtr mon, + virQEMUCapsObjectTypeProps *props, + size_t nprops, + virQEMUCapsObjectTypePropsCB propsGetCB) +{ + int nvalues; + char **values; + size_t i; + + for (i =3D 0; i < nprops; i++) { + const char *type =3D props[i].type; + int cap =3D props[i].capsCondition; + + if (cap >=3D 0 && !virQEMUCapsGet(qemuCaps, cap)) + continue; + + if ((nvalues =3D propsGetCB(mon, type, &values)) < 0) + return -1; + virQEMUCapsProcessStringFlags(qemuCaps, + props[i].nprops, + props[i].props, + nvalues, values); + virStringListFreeCount(values, nvalues); + } + + return 0; +} =20 static int virQEMUCapsProbeQMPDevices(virQEMUCapsPtr qemuCaps, @@ -2073,7 +2107,6 @@ virQEMUCapsProbeQMPDevices(virQEMUCapsPtr qemuCaps, { int nvalues; char **values; - size_t i; =20 if ((nvalues =3D qemuMonitorGetObjectTypes(mon, &values)) < 0) return -1; @@ -2083,23 +2116,12 @@ virQEMUCapsProbeQMPDevices(virQEMUCapsPtr qemuCaps, nvalues, values); virStringListFreeCount(values, nvalues); =20 - for (i =3D 0; i < ARRAY_CARDINALITY(virQEMUCapsDeviceProps); i++) { - const char *device =3D virQEMUCapsDeviceProps[i].type; - int cap =3D virQEMUCapsDeviceProps[i].capsCondition; - - if (cap >=3D 0 && !virQEMUCapsGet(qemuCaps, cap)) - continue; - - if ((nvalues =3D qemuMonitorGetDeviceProps(mon, - device, - &values)) < 0) - return -1; - virQEMUCapsProcessStringFlags(qemuCaps, - virQEMUCapsDeviceProps[i].nprops, - virQEMUCapsDeviceProps[i].props, - nvalues, values); - virStringListFreeCount(values, nvalues); - } + if (virQEMUCapsProbeQMPGenericProps(qemuCaps, + mon, + virQEMUCapsDeviceProps, + ARRAY_CARDINALITY(virQEMUCapsDevic= eProps), + qemuMonitorGetDeviceProps) < 0) + return -1; =20 return 0; } --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list