From nobody Mon Feb 9 07:26:19 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 1492694048485823.1941998435198; Thu, 20 Apr 2017 06:14:08 -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 8B0E4C05B1CB; Thu, 20 Apr 2017 13:14:06 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 680447FB72; Thu, 20 Apr 2017 13:14:05 +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 5F3665EC63; Thu, 20 Apr 2017 13:13:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v3KD6E9H027916 for ; Thu, 20 Apr 2017 09:06:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id E83A477E55; Thu, 20 Apr 2017 13:06:14 +0000 (UTC) Received: from beluga.usersys.redhat.com (dhcp129-94.brq.redhat.com [10.34.129.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D26F4DA37; Thu, 20 Apr 2017 13:06:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8B0E4C05B1CB Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.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 8B0E4C05B1CB From: Erik Skultety To: libvir-list@redhat.com Date: Thu, 20 Apr 2017 15:05:55 +0200 Message-Id: <6ba125a955916b259b24554e9bd13394ed083666.1492692115.git.eskultet@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Erik Skultety Subject: [libvirt] [PATCH v2 05/10] nodedev: conf: Split PCI sub-capability parsing to a separate method 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.32]); Thu, 20 Apr 2017 13:14:07 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Since there's at least SRIOV and MDEV sub-capabilities to be parsed, let's make the code more readable by splitting it to several logical blocks. Signed-off-by: Erik Skultety --- src/conf/node_device_conf.c | 84 ++++++++++++++++++++++++++++-------------= ---- 1 file changed, 53 insertions(+), 31 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 85cfd8396..de346597a 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -1286,76 +1286,100 @@ virPCIEDeviceInfoParseXML(xmlXPathContextPtr ctxt, =20 =20 static int -virNodeDevPCICapabilityParseXML(xmlXPathContextPtr ctxt, - xmlNodePtr node, - virNodeDevCapPCIDevPtr pci_dev) +virNodeDevPCICapSRIOVParseXML(xmlXPathContextPtr ctxt, + xmlNodePtr node, + virNodeDevCapPCIDevPtr pci_dev, + unsigned int cap) { + int ret =3D -1; char *maxFuncsStr =3D virXMLPropString(node, "maxCount"); - char *type =3D virXMLPropString(node, "type"); xmlNodePtr *addresses =3D NULL; - xmlNodePtr orignode =3D ctxt->node; - int ret =3D -1; - size_t i =3D 0; =20 - ctxt->node =3D node; - - if (!type) { - virReportError(VIR_ERR_XML_ERROR, "%s", _("Missing capability type= ")); - goto out; - } - - if (STREQ(type, "phys_function")) { + if (cap =3D=3D VIR_NODE_DEV_CAP_FLAG_PCI_PHYSICAL_FUNCTION) { xmlNodePtr address =3D virXPathNode("./address[1]", ctxt); =20 if (VIR_ALLOC(pci_dev->physical_function) < 0) - goto out; + goto cleanup; =20 if (!address) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Missing address in 'phys_function' capabilit= y")); - goto out; + goto cleanup; } =20 if (virPCIDeviceAddressParseXML(address, pci_dev->physical_function) < 0) - goto out; - - pci_dev->flags |=3D VIR_NODE_DEV_CAP_FLAG_PCI_PHYSICAL_FUNCTION; - } else if (STREQ(type, "virt_functions")) { + goto cleanup; + } else { + size_t i; int naddresses; =20 if ((naddresses =3D virXPathNodeSet("./address", ctxt, &addresses)= ) < 0) - goto out; + goto cleanup; =20 if (maxFuncsStr && virStrToLong_uip(maxFuncsStr, NULL, 10, &pci_dev->max_virtual_functions) < 0) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Malformed 'maxCount' parameter")); - goto out; + goto cleanup; } =20 if (VIR_ALLOC_N(pci_dev->virtual_functions, naddresses) < 0) - goto out; + goto cleanup; =20 for (i =3D 0; i < naddresses; i++) { virPCIDeviceAddressPtr addr =3D NULL; =20 if (VIR_ALLOC(addr) < 0) - goto out; + goto cleanup; =20 if (virPCIDeviceAddressParseXML(addresses[i], addr) < 0) { VIR_FREE(addr); - goto out; + goto cleanup; } =20 if (VIR_APPEND_ELEMENT(pci_dev->virtual_functions, pci_dev->num_virtual_functions, addr) < 0) - goto out; + goto cleanup; } + } =20 - pci_dev->flags |=3D VIR_NODE_DEV_CAP_FLAG_PCI_VIRTUAL_FUNCTION; + pci_dev->flags |=3D cap; + ret =3D 0; + cleanup: + VIR_FREE(addresses); + VIR_FREE(maxFuncsStr); + return ret; +} + + +static int +virNodeDevPCICapabilityParseXML(xmlXPathContextPtr ctxt, + xmlNodePtr node, + virNodeDevCapPCIDevPtr pci_dev) +{ + char *type =3D virXMLPropString(node, "type"); + xmlNodePtr orignode =3D ctxt->node; + unsigned int sriov_cap =3D 0; + int ret =3D -1; + + ctxt->node =3D node; + + if (!type) { + virReportError(VIR_ERR_XML_ERROR, "%s", _("Missing capability type= ")); + goto cleanup; + } + + if (STREQ(type, "phys_function")) + sriov_cap =3D VIR_NODE_DEV_CAP_FLAG_PCI_PHYSICAL_FUNCTION; + else if (STREQ(type, "virt_functions")) + sriov_cap =3D VIR_NODE_DEV_CAP_FLAG_PCI_VIRTUAL_FUNCTION; + + if (sriov_cap && + virNodeDevPCICapSRIOVParseXML(ctxt, node, pci_dev, sriov_cap) < 0)= { + goto cleanup; } else { int hdrType =3D virPCIHeaderTypeFromString(type); =20 @@ -1364,9 +1388,7 @@ virNodeDevPCICapabilityParseXML(xmlXPathContextPtr ct= xt, } =20 ret =3D 0; - out: - VIR_FREE(addresses); - VIR_FREE(maxFuncsStr); + cleanup: VIR_FREE(type); ctxt->node =3D orignode; return ret; --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list