From nobody Sun Feb 8 18:49:31 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1578594865; cv=none; d=zohomail.com; s=zohoarc; b=bvMuKdr5cxAwDv4OA1lKnJ8wtjkfT79+czXO5OlSIJ82fl4Gk7BXv48TPpJCSXw53IoTD5Zp43FWOJQzrzcdOISn+4UT8Ol5axpkXPpwbAv1f2ORZpPXxtP1FS4AZ+pLio67bfbSTNia1qWZPaE61RbNpQaPj7ramEIGpaevYSc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578594865; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BkA81KShkU/wnKmzZFRY5mGjU0iYAlteCYWWyxKOHx4=; b=KYP8U88MQVdbjm+q4uRHEwL6rc8NCTQ+1ttrjfeeuexZj4M5K44HEjbhceSjoRsswjAPUW+ZZN73SEtRIW3l5GkSiQTu8ZGftXUkse/T5HlL0d3cu5LNix8POSuRSYS+f19VpZNNvAtT3bAw4jZ8MvZz2eibFfPvoeJYgNIw/Q8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 157859486518574.8026866125274; Thu, 9 Jan 2020 10:34:25 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-366-WYU_r474MXeFQ8lPdzsLEw-1; Thu, 09 Jan 2020 13:34:21 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id BBED3107ACC7; Thu, 9 Jan 2020 18:34:15 +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 972605D9C9; Thu, 9 Jan 2020 18:34:15 +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 5D22918089D0; Thu, 9 Jan 2020 18:34:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 009IY9fJ019859 for ; Thu, 9 Jan 2020 13:34:09 -0500 Received: by smtp.corp.redhat.com (Postfix) id 442351059162; Thu, 9 Jan 2020 18:34:09 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3E03B1069F5E for ; Thu, 9 Jan 2020 18:34:06 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B93C48E3898 for ; Thu, 9 Jan 2020 18:34:06 +0000 (UTC) Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-39-bG68ucV5PLaDojyOz10Vaw-1; Thu, 09 Jan 2020 13:33:59 -0500 Received: by mail-qt1-f193.google.com with SMTP id k40so6684332qtk.8 for ; Thu, 09 Jan 2020 10:33:59 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:541e:7a5e:37ad:989b:4530]) by smtp.gmail.com with ESMTPSA id g52sm3902267qta.58.2020.01.09.10.33.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2020 10:33:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578594864; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=BkA81KShkU/wnKmzZFRY5mGjU0iYAlteCYWWyxKOHx4=; b=KOxQ1UyNIiAFkN52+mMteRpTXpUqxfYj/yNMDcidYfeHC43Zcjbd+zYEE0uCN+G+8CQ2+f 1fEud7YvW3EOWFi4lXJEFgdHzSm65eSUjvXUBbkrW3TBlR9/0EWT00D3HtpeL56/Sp0SEY 1s6m2AkGbOZ2MozzZ3yEwGLhz/G9CXg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AU7StpGqAPIE6Oo+BkUdhBVMKr34y64rXlVF93JJBY0=; b=sNUmJ05yTYCWw/KCGMmgDPW537f9lXd3uGrOH//7s3ZyyoNRZ9QOSx9GGvsYStllBa I2CK2uF+L3StUkQX/gQFDm67p99lZli+wa7Bm7OetkeN2/yKLHAITziYtpG+z/9YTpnj pLWP6oOMZzePwu+/qlv4Zh3PF/yuH1YBiJW0u2Cjye2xOxBCGTWT8QZuPHLRfVj1m+vn RIGzHwEmKL+3cukR+q9b3rogVTW/RQShwwZR3X5RT2P4pDSX0w1ONURQuiGfhxNd/33I +GVxIbgk7pKsuHbSqE9RGObhqM1feh17P9tKf1yFlehzM3+oziCjSRhdCY5l9wScB9h1 IRoA== X-Gm-Message-State: APjAAAUI/t3/VBpad2AsM+tOSvZb4hs1IWzA37fSXPGdPV/VpeWFrYxr CG/T3Y+/WCidwd1A3jIrKlDOlZR/ X-Google-Smtp-Source: APXvYqyBm15Sx7wks+QyN/xRrHYopVaO6enKmgVd1Vy6U3Al6ATm7+NTcCat6/uzVGXR1GnkN6Sl3g== X-Received: by 2002:ac8:2c7d:: with SMTP id e58mr9294743qta.196.1578594838340; Thu, 09 Jan 2020 10:33:58 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Thu, 9 Jan 2020 15:33:42 -0300 Message-Id: <20200109183348.1362138-3-danielhb413@gmail.com> In-Reply-To: <20200109183348.1362138-1-danielhb413@gmail.com> References: <20200109183348.1362138-1-danielhb413@gmail.com> MIME-Version: 1.0 X-MC-Unique: bG68ucV5PLaDojyOz10Vaw-1 X-MC-Unique: WYU_r474MXeFQ8lPdzsLEw-1 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 009IY9fJ019859 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 2/8] conf/domain_addr.c: remove unneeded 'cleanup' labels 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: , 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-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Previous patch used 'g_autofree' to eliminate instances of VIR_FREE(), making some cleanup labels obsolete. This patch removes them. Signed-off-by: Daniel Henrique Barboza --- src/conf/domain_addr.c | 98 +++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 64 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index ee4dcf1d3b..0dd4b15225 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -829,30 +829,29 @@ virDomainPCIAddressReserveAddrInternal(virDomainPCIAd= dressSetPtr addrs, unsigned int isolationGroup, bool fromConfig) { - int ret =3D -1; g_autofree char *addrStr =3D NULL; virDomainPCIAddressBusPtr bus; virErrorNumber errType =3D (fromConfig ? VIR_ERR_XML_ERROR : VIR_ERR_INTERNAL_ERROR= ); =20 if (!(addrStr =3D virPCIDeviceAddressAsString(addr))) - goto cleanup; + return -1; =20 /* Add an extra bus if necessary */ if (addrs->dryRun && virDomainPCIAddressSetGrow(addrs, addr, flags) < = 0) - goto cleanup; + return -1; /* Check that the requested bus exists, is the correct type, and we * are asking for a valid slot */ if (!virDomainPCIAddressValidate(addrs, addr, addrStr, flags, fromConf= ig)) - goto cleanup; + return -1; =20 bus =3D &addrs->buses[addr->bus]; =20 if (bus->slot[addr->slot].functions & (1 << addr->function)) { virReportError(errType, _("Attempted double use of PCI Address %s"), addrSt= r); - goto cleanup; + return -1; } =20 /* if this is the first function to be reserved on this slot, and @@ -889,9 +888,7 @@ virDomainPCIAddressReserveAddrInternal(virDomainPCIAddr= essSetPtr addrs, VIR_DEBUG("Reserving PCI address %s (aggregate=3D'%s')", addrStr, bus->slot[addr->slot].aggregate ? "true" : "false"); =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -910,7 +907,6 @@ virDomainPCIAddressEnsureAddr(virDomainPCIAddressSetPtr= addrs, virDomainDeviceInfoPtr dev, virDomainPCIConnectFlags flags) { - int ret =3D -1; g_autofree char *addrStr =3D NULL; =20 /* if flags is 0, the particular model of this device on this @@ -920,7 +916,7 @@ virDomainPCIAddressEnsureAddr(virDomainPCIAddressSetPtr= addrs, return 0; =20 if (!(addrStr =3D virPCIDeviceAddressAsString(&dev->addr.pci))) - goto cleanup; + return -1; =20 if (virDeviceInfoPCIAddressIsPresent(dev)) { /* We do not support hotplug multi-function PCI device now, so we = should @@ -930,31 +926,28 @@ virDomainPCIAddressEnsureAddr(virDomainPCIAddressSetP= tr addrs, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Only PCI device addresses with function=3D0" " are supported")); - goto cleanup; + return -1; } =20 if (!virDomainPCIAddressValidate(addrs, &dev->addr.pci, addrStr, flags, true)) - goto cleanup; + return -1; =20 if (virDomainPCIAddressReserveAddrInternal(addrs, &dev->addr.pci, flags, dev->isolationGr= oup, true) < 0) { - goto cleanup; + return -1; } } else { if (virDomainPCIAddressReserveNextAddr(addrs, dev, flags, -1) < 0) - goto cleanup; + return -1; } =20 dev->addr.pci.extFlags =3D dev->pciAddrExtFlags; if (virDomainPCIAddressExtensionEnsureAddr(addrs, &dev->addr.pci) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -1102,13 +1095,12 @@ virDomainPCIAddressFindUnusedFunctionOnBus(virDomai= nPCIAddressBusPtr bus, virDomainPCIConnectFlags flags, bool *found) { - int ret =3D -1; g_autofree char *addrStr =3D NULL; =20 *found =3D false; =20 if (!(addrStr =3D virPCIDeviceAddressAsString(searchAddr))) - goto cleanup; + return -1; =20 if (!virDomainPCIAddressFlagsCompatible(searchAddr, addrStr, bus->flag= s, flags, false, false)) { @@ -1154,10 +1146,7 @@ virDomainPCIAddressFindUnusedFunctionOnBus(virDomain= PCIAddressBusPtr bus, } } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -1410,7 +1399,6 @@ virDomainCCWAddressAssign(virDomainDeviceInfoPtr dev, virDomainCCWAddressSetPtr addrs, bool autoassign) { - int ret =3D -1; g_autofree char *addr =3D NULL; =20 if (dev->type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) @@ -1418,27 +1406,27 @@ virDomainCCWAddressAssign(virDomainDeviceInfoPtr de= v, =20 if (!autoassign && dev->addr.ccw.assigned) { if (!(addr =3D virDomainCCWAddressAsString(&dev->addr.ccw))) - goto cleanup; + return -1; =20 if (virHashLookup(addrs->defined, addr)) { virReportError(VIR_ERR_XML_ERROR, _("The CCW devno '%s' is in use already "), addr); - goto cleanup; + return -1; } } else if (autoassign && !dev->addr.ccw.assigned) { if (!(addr =3D virDomainCCWAddressAsString(&addrs->next))) - goto cleanup; + return -1; =20 while (virHashLookup(addrs->defined, addr)) { if (virDomainCCWAddressIncrement(&addrs->next) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("There are no more free CCW devnos.")); - goto cleanup; + return -1; } VIR_FREE(addr); if (!(addr =3D virDomainCCWAddressAsString(&addrs->next))) - goto cleanup; + return -1; } dev->addr.ccw =3D addrs->next; dev->addr.ccw.assigned =3D true; @@ -1447,14 +1435,11 @@ virDomainCCWAddressAssign(virDomainDeviceInfoPtr de= v, } =20 if (virHashAddEntry(addrs->defined, addr, addr) < 0) - goto cleanup; + return -1; else addr =3D NULL; /* memory will be freed by hash table */ =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 static int ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) @@ -1683,7 +1668,6 @@ virDomainVirtioSerialAddrReserve(virDomainDefPtr def = G_GNUC_UNUSED, void *data) { virDomainVirtioSerialAddrSetPtr addrs =3D data; - int ret =3D -1; virBitmapPtr map =3D NULL; bool b; ssize_t i; @@ -1699,7 +1683,7 @@ virDomainVirtioSerialAddrReserve(virDomainDefPtr def = G_GNUC_UNUSED, virReportError(VIR_ERR_XML_ERROR, _("virtio serial controller %u is missing"), info->addr.vioserial.controller); - goto cleanup; + return -1; } =20 map =3D addrs->controllers[i]->ports; @@ -1708,7 +1692,7 @@ virDomainVirtioSerialAddrReserve(virDomainDefPtr def = G_GNUC_UNUSED, _("virtio serial controller %u does not have port %= u"), info->addr.vioserial.controller, info->addr.vioserial.port); - goto cleanup; + return -1; } =20 if (b) { @@ -1716,15 +1700,12 @@ virDomainVirtioSerialAddrReserve(virDomainDefPtr de= f G_GNUC_UNUSED, _("virtio serial port %u on controller %u is alread= y occupied"), info->addr.vioserial.port, info->addr.vioserial.controller); - goto cleanup; + return -1; } =20 ignore_value(virBitmapSetBit(map, info->addr.vioserial.port)); =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 /* virDomainVirtioSerialAddrSetCreateFromDomain @@ -2343,7 +2324,6 @@ virDomainUSBAddressAssignFromBus(virDomainUSBAddressS= etPtr addrs, unsigned int portpath[VIR_DOMAIN_DEVICE_USB_MAX_PORT_DEPTH] =3D { 0 }; virDomainUSBAddressHubPtr hub =3D addrs->buses[bus]; g_autofree char *portStr =3D NULL; - int ret =3D -1; =20 if (!hub) return -2; @@ -2353,7 +2333,7 @@ virDomainUSBAddressAssignFromBus(virDomainUSBAddressS= etPtr addrs, =20 /* we found a free port */ if (!(portStr =3D virDomainUSBAddressPortFormat(portpath))) - goto cleanup; + return -1; =20 info->type =3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB; info->addr.usb.bus =3D bus; @@ -2361,11 +2341,9 @@ virDomainUSBAddressAssignFromBus(virDomainUSBAddress= SetPtr addrs, VIR_DEBUG("Assigning USB addr bus=3D%u port=3D%s", info->addr.usb.bus, portStr); if (virDomainUSBAddressReserve(info, addrs) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -2421,7 +2399,6 @@ virDomainUSBAddressReserve(virDomainDeviceInfoPtr inf= o, virDomainUSBAddressSetPtr addrs =3D data; virDomainUSBAddressHubPtr targetHub =3D NULL; g_autofree char *portStr =3D NULL; - int ret =3D -1; int targetPort; =20 if (info->type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB) @@ -2432,26 +2409,23 @@ virDomainUSBAddressReserve(virDomainDeviceInfoPtr i= nfo, =20 portStr =3D virDomainUSBAddressPortFormat(info->addr.usb.port); if (!portStr) - goto cleanup; + return -1; VIR_DEBUG("Reserving USB address bus=3D%u port=3D%s", info->addr.usb.b= us, portStr); =20 if (!(targetHub =3D virDomainUSBAddressFindPort(addrs, info, &targetPo= rt, portStr))) - goto cleanup; + return -1; =20 if (virBitmapIsBitSet(targetHub->portmap, targetPort)) { virReportError(VIR_ERR_XML_ERROR, _("Duplicate USB address bus %u port %s"), info->addr.usb.bus, portStr); - goto cleanup; + return -1; } =20 ignore_value(virBitmapSetBit(targetHub->portmap, targetPort)); =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -2483,7 +2457,6 @@ virDomainUSBAddressRelease(virDomainUSBAddressSetPtr = addrs, virDomainUSBAddressHubPtr targetHub =3D NULL; g_autofree char *portStr =3D NULL; int targetPort; - int ret =3D -1; =20 if (!addrs || info->type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB || !virDomainUSBAddressPortIsValid(info->addr.usb.port)) @@ -2494,12 +2467,9 @@ virDomainUSBAddressRelease(virDomainUSBAddressSetPtr= addrs, =20 if (!(targetHub =3D virDomainUSBAddressFindPort(addrs, info, &targetPo= rt, portStr))) - goto cleanup; + return -1; =20 ignore_value(virBitmapClearBit(targetHub->portmap, targetPort)); =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list