From nobody Thu May 15 13:18:16 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1507029927003666.3270187133063; Tue, 3 Oct 2017 04:25:27 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 79272711F9; Tue, 3 Oct 2017 11:25:25 +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 33F324F9C3; Tue, 3 Oct 2017 11:25:25 +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 27B4C18355C5; Tue, 3 Oct 2017 11:25:24 +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 v93Ax5fl027083 for ; Tue, 3 Oct 2017 06:59:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id 45DF46017C; Tue, 3 Oct 2017 10:59:05 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B3E360487 for ; Tue, 3 Oct 2017 10:59:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 79272711F9 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 3 Oct 2017 12:58:57 +0200 Message-Id: <5eb9fbf0497b70a05829f9b0bbdc26ae8886700f.1507028214.git.mprivozn@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 v2 1/3] virDomainDeviceInfoParseXML: Separate address parsing into separate func 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 03 Oct 2017 11:25:26 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" There's one 'return' in the middle of the function body. It's very easy to miss and so it makes adding new code harder. Also the function doesn't follow our style 100%. Signed-off-by: Michal Privoznik --- src/conf/domain_conf.c | 174 ++++++++++++++++++++++++++-------------------= ---- 1 file changed, 93 insertions(+), 81 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 87192eb2d..0bc2e2f94 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6303,6 +6303,93 @@ virDomainDeviceDimmAddressParseXML(xmlNodePtr node, } =20 =20 +static int +virDomainDeviceAddressParseXML(xmlNodePtr address, + virDomainDeviceInfoPtr info) +{ + int ret =3D -1; + char *type =3D virXMLPropString(address, "type"); + + if (type) { + if ((info->type =3D virDomainDeviceAddressTypeFromString(type)) <= =3D 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown address type '%s'"), type); + goto cleanup; + } + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("No type specified for device address")); + goto cleanup; + } + + switch ((virDomainDeviceAddressType) info->type) { + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI: + if (virPCIDeviceAddressParseXML(address, &info->addr.pci) < 0) + goto cleanup; + break; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE: + if (virDomainDeviceDriveAddressParseXML(address, &info->addr.drive= ) < 0) + goto cleanup; + break; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL: + if (virDomainDeviceVirtioSerialAddressParseXML + (address, &info->addr.vioserial) < 0) + goto cleanup; + break; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCID: + if (virDomainDeviceCcidAddressParseXML(address, &info->addr.ccid) = < 0) + goto cleanup; + break; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB: + if (virDomainDeviceUSBAddressParseXML(address, &info->addr.usb) < = 0) + goto cleanup; + break; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO: + if (virDomainDeviceSpaprVioAddressParseXML(address, &info->addr.sp= aprvio) < 0) + goto cleanup; + break; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: + if (virDomainDeviceCCWAddressParseXML + (address, &info->addr.ccw) < 0) + goto cleanup; + break; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO: + break; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_ISA: + if (virDomainDeviceISAAddressParseXML(address, &info->addr.isa) < = 0) + goto cleanup; + break; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390: + virReportError(VIR_ERR_XML_ERROR, "%s", + _("virtio-s390 bus doesn't have an address")); + goto cleanup; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM: + if (virDomainDeviceDimmAddressParseXML(address, &info->addr.dimm) = < 0) + goto cleanup; + break; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST: + break; + } + + ret =3D 0; + cleanup: + VIR_FREE(type); + return ret; +} + + /* Parse the XML definition for a device address * @param node XML nodeset to parse for device address definition */ @@ -6319,6 +6406,7 @@ virDomainDeviceInfoParseXML(xmlNodePtr node, xmlNodePtr boot =3D NULL; xmlNodePtr rom =3D NULL; char *type =3D NULL; + char *rombar =3D NULL; int ret =3D -1; =20 virDomainDeviceInfoClear(info); @@ -6364,102 +6452,26 @@ virDomainDeviceInfoParseXML(xmlNodePtr node, } =20 if (rom) { - char *rombar =3D virXMLPropString(rom, "bar"); - if (rombar && + if ((rombar =3D virXMLPropString(rom, "bar")) && ((info->rombar =3D virTristateSwitchTypeFromString(rombar)) <= =3D 0)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown rom bar value '%s'"), rombar); - VIR_FREE(rombar); goto cleanup; } - VIR_FREE(rombar); info->romfile =3D virXMLPropString(rom, "file"); } =20 - if (!address) - return 0; - - type =3D virXMLPropString(address, "type"); - - if (type) { - if ((info->type =3D virDomainDeviceAddressTypeFromString(type)) <= =3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown address type '%s'"), type); - goto cleanup; - } - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("No type specified for device address")); - goto cleanup; - } - - switch ((virDomainDeviceAddressType) info->type) { - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI: - if (virPCIDeviceAddressParseXML(address, &info->addr.pci) < 0) - goto cleanup; - break; - - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE: - if (virDomainDeviceDriveAddressParseXML(address, &info->addr.drive= ) < 0) - goto cleanup; - break; - - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL: - if (virDomainDeviceVirtioSerialAddressParseXML - (address, &info->addr.vioserial) < 0) - goto cleanup; - break; - - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCID: - if (virDomainDeviceCcidAddressParseXML(address, &info->addr.ccid) = < 0) - goto cleanup; - break; - - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB: - if (virDomainDeviceUSBAddressParseXML(address, &info->addr.usb) < = 0) - goto cleanup; - break; - - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO: - if (virDomainDeviceSpaprVioAddressParseXML(address, &info->addr.sp= aprvio) < 0) - goto cleanup; - break; - - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: - if (virDomainDeviceCCWAddressParseXML - (address, &info->addr.ccw) < 0) - goto cleanup; - break; - - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO: - break; - - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_ISA: - if (virDomainDeviceISAAddressParseXML(address, &info->addr.isa) < = 0) - goto cleanup; - break; - - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390: - virReportError(VIR_ERR_XML_ERROR, "%s", - _("virtio-s390 bus doesn't have an address")); + if (address && + virDomainDeviceAddressParseXML(address, info) < 0) goto cleanup; =20 - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM: - if (virDomainDeviceDimmAddressParseXML(address, &info->addr.dimm) = < 0) - goto cleanup; - break; - - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE: - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST: - break; - } =20 ret =3D 0; - cleanup: - if (ret =3D=3D -1) + if (ret < 0) VIR_FREE(info->alias); VIR_FREE(type); + VIR_FREE(rombar); return ret; } =20 --=20 2.13.5 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list