From nobody Thu May 9 02:14:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 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=1571737017; cv=none; d=zoho.com; s=zohoarc; b=cKoeBme/tVLXsd1w8Q+WbqAGJ5IaHYlseyEEKs0eDvs+nKJAMpBuAv/Bt//QUVt/MrGgXkVG7Ll67p84lqMvYQ1RqcI+Xu3ieG7PetgXe0Q5CA9aaw9sZHKM2/rZCLmY+hDt0DIzPd8JaALBJx0zRT2QVK3m1sPo6BQn6rsfsjY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571737017; 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=mtbioWTEgIZmdCN5bVam6L43o5Xd8XGSufL/GK7lrXk=; b=IscRogstTSbpxQixUFlssKDKZzwOK8hVTos7vyYaB7Kr9G5m38eKeYX5i7ojwVrVXTpxF3Ijry+FfijylaFuaMyW3olbrrn6WTdjAi0MPOKBx6dsXK3ii+qCFsuK8KetUNueiAGRMH7A5+H0NmTSGEEyNWKq2XQJb2Z57gm++T8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 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-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1571737017196870.1777060075782; Tue, 22 Oct 2019 02:36:57 -0700 (PDT) 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-9-bKlSP2eCPgqA7WNK3buRqg-1; Tue, 22 Oct 2019 05:36:54 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CAEF8107AD33; Tue, 22 Oct 2019 09:36:49 +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 6C02810027A4; Tue, 22 Oct 2019 09:36:49 +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 025FA1818255; Tue, 22 Oct 2019 09:36:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9LIJcIR000565 for ; Mon, 21 Oct 2019 14:19:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id C81B454569; Mon, 21 Oct 2019 18:19:37 +0000 (UTC) Received: from mx1.redhat.com (ext-mx22.extmail.prod.ext.phx2.redhat.com [10.5.110.63]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1B2C8BEA7C for ; Mon, 21 Oct 2019 18:19:28 +0000 (UTC) Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9E78318CB8E2 for ; Mon, 21 Oct 2019 18:19:25 +0000 (UTC) Received: by mail-qt1-f175.google.com with SMTP id d17so7870214qto.3 for ; Mon, 21 Oct 2019 11:19:25 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:7979:d16f:4e5e:8e8d:1141]) by smtp.gmail.com with ESMTPSA id d205sm9248741qke.96.2019.10.21.11.19.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 11:19:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571737016; 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=mtbioWTEgIZmdCN5bVam6L43o5Xd8XGSufL/GK7lrXk=; b=gE2wH7G2yjdWUGxPGzLp0D7DOZ3D1McOcXiikr+wHRhMqVsp4LHXKku2ycHALDUDyJGtz0 IHWO1ZsP5Gis5epjBNEyohZAeIfRjRy+4G9rad9GFfFyYwrCDi5mLjvyRtd30xZP2YZ7Ag r1U6uCJIhYOrAmqcte9h6BlosOtxWJA= 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=PwDhlsC17UAYJQSRwHxhEDX/hJrmCSLjclO+klR2NBw=; b=jiMLPV0j2JFcCNV15FfUJL7fimwE9nfuCuH5vnNK48fnsJF8t143AO50+SkNDER3WN I4PSz1d9yVO3GRE/KLpMXya2LmXA7pl2ZVXcCBraFquN6POnqR1UV3dA1XZkVzwYGore 7NTpiR3LLkt37xO3+Dg8wCCYBOrWjKDYkjId7ixMpUMsJ1YG8Uzcb15ZkiuDcbsu06zl YBBBh+IlaoxzUyDTqtN3q8I1RiWCHdkB3kVkFs+aEu6E90pIooRA1W8P21xS7+1YMuIu YRWrnlLelyIr1/cOdPurh16I3H98D3HNvFiurl3HwQtdJXR7r16Ci27+Xqj4fnbKx2HM VCuA== X-Gm-Message-State: APjAAAUcwmzk42/8EXHbtxz33UW6cHnQYo8YvYrocHV1ZwyaWJTBQQFz Fb3bFA21B5IJf0c9Y2+Y5E4AJq6D X-Google-Smtp-Source: APXvYqwho8ZmA35qSVQLx15G5AKUMdMFxXf6jKkRQVNTFl20i+0ghlbZoVXP0hcE2nbD7QjbweuY2A== X-Received: by 2002:ac8:4a86:: with SMTP id l6mr19755762qtq.371.1571681963634; Mon, 21 Oct 2019 11:19:23 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 15:18:51 -0300 Message-Id: <20191021181911.14986-2-danielhb413@gmail.com> In-Reply-To: <20191021181911.14986-1-danielhb413@gmail.com> References: <20191021181911.14986-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.63]); Mon, 21 Oct 2019 18:19:26 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.63]); Mon, 21 Oct 2019 18:19:26 +0000 (UTC) for IP:'209.85.160.175' DOMAIN:'mail-qt1-f175.google.com' HELO:'mail-qt1-f175.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.15 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS) 209.85.160.175 mail-qt1-f175.google.com 209.85.160.175 mail-qt1-f175.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.63 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 01/21] conf: 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.84 on 10.5.11.22 X-MC-Unique: bKlSP2eCPgqA7WNK3buRqg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_addr.c | 23 +-- src/conf/domain_capabilities.c | 21 +- src/conf/domain_conf.c | 334 +++++++++++-------------------- src/conf/netdev_bandwidth_conf.c | 17 +- src/conf/network_conf.c | 25 +-- src/conf/node_device_conf.c | 28 +-- src/conf/numa_conf.c | 25 +-- src/conf/nwfilter_conf.c | 4 +- src/conf/storage_conf.c | 7 +- src/conf/virnetworkobj.c | 14 +- src/conf/virsecretobj.c | 5 +- 11 files changed, 180 insertions(+), 323 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index dd8e04576a..0e505b19c0 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1789,7 +1789,6 @@ virDomainVirtioSerialAddrNext(virDomainDefPtr def, virDomainDeviceVirtioSerialAddress *addr, bool allowZero) { - int ret =3D -1; ssize_t port, startPort =3D 0; ssize_t i; unsigned int controller; @@ -1801,7 +1800,7 @@ virDomainVirtioSerialAddrNext(virDomainDefPtr def, if (addrs->ncontrollers =3D=3D 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no virtio-serial controllers are available")); - goto cleanup; + return -1; } =20 for (i =3D 0; i < addrs->ncontrollers; i++) { @@ -1818,7 +1817,7 @@ virDomainVirtioSerialAddrNext(virDomainDefPtr def, =20 if (idx =3D=3D -1) { if (virDomainVirtioSerialAddrSetAutoaddController(def, add= rs, i) < 0) - goto cleanup; + return -1; controller =3D i; port =3D startPort + 1; goto success; @@ -1829,8 +1828,7 @@ virDomainVirtioSerialAddrNext(virDomainDefPtr def, virReportError(VIR_ERR_XML_ERROR, "%s", _("Unable to find a free virtio-serial port")); =20 - cleanup: - return ret; + return -1; =20 success: addr->bus =3D 0; @@ -1838,8 +1836,7 @@ virDomainVirtioSerialAddrNext(virDomainDefPtr def, addr->controller =3D controller; VIR_DEBUG("Found free virtio serial controller %u port %u", addr->cont= roller, addr->port); - ret =3D 0; - goto cleanup; + return 0; } =20 static int @@ -1880,7 +1877,6 @@ virDomainVirtioSerialAddrAssign(virDomainDefPtr def, bool allowZero, bool portOnly) { - int ret =3D -1; virDomainDeviceInfo nfo =3D { 0 }; virDomainDeviceInfoPtr ptr =3D allowZero ? &nfo : info; =20 @@ -1889,20 +1885,17 @@ virDomainVirtioSerialAddrAssign(virDomainDefPtr def, if (portOnly) { if (virDomainVirtioSerialAddrNextFromController(addrs, &ptr->addr.vioseri= al) < 0) - goto cleanup; + return -1; } else { if (virDomainVirtioSerialAddrNext(def, addrs, &ptr->addr.vioserial, allowZero) < 0) - goto cleanup; + return -1; } =20 if (virDomainVirtioSerialAddrReserve(NULL, NULL, ptr, addrs) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 /* virDomainVirtioSerialAddrAutoAssign diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index 3c4c7fd6d1..03d6ff141c 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -288,7 +288,6 @@ virDomainCapsEnumSet(virDomainCapsEnumPtr capsEnum, size_t nvalues, unsigned int *values) { - int ret =3D -1; size_t i; =20 for (i =3D 0; i < nvalues; i++) { @@ -300,15 +299,13 @@ virDomainCapsEnumSet(virDomainCapsEnumPtr capsEnum, _("integer overflow on %s. Please contact the " "libvirt development team at libvir-list@redh= at.com"), capsEnumName); - goto cleanup; + return -1; } =20 capsEnum->values |=3D val; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -325,19 +322,15 @@ virDomainCapsEnumFormat(virBufferPtr buf, const char *capsEnumName, virDomainCapsValToStr valToStr) { - int ret =3D -1; size_t i; =20 - if (!capsEnum->report) { - ret =3D 0; - goto cleanup; - } + if (!capsEnum->report) + return 0; =20 virBufferAsprintf(buf, "values) { virBufferAddLit(buf, "/>\n"); - ret =3D 0; - goto cleanup; + return 0; } virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); @@ -354,9 +347,7 @@ virDomainCapsEnumFormat(virBufferPtr buf, virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "\n"); =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 80e19a15df..c3d5dc46f6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7072,7 +7072,6 @@ virDomainDeviceInfoFormat(virBufferPtr buf, { g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; - int ret =3D -1; =20 if ((flags & VIR_DOMAIN_DEF_FORMAT_ALLOW_BOOT) && info->bootIndex) { virBufferAsprintf(buf, "bootIndex); @@ -7115,11 +7114,9 @@ virDomainDeviceInfoFormat(virBufferPtr buf, } =20 if (info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE || - info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390) { + info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390) /* We're done here */ - ret =3D 0; - goto cleanup; - } + return 0; =20 virBufferAsprintf(&attrBuf, " type=3D'%s'", virDomainDeviceAddressTypeToString(info->type)); @@ -7214,12 +7211,9 @@ virDomainDeviceInfoFormat(virBufferPtr buf, } =20 if (virXMLFormatElement(buf, "address", &attrBuf, &childBuf) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 static int @@ -8396,10 +8390,10 @@ virDomainNetDefCoalesceParseXML(xmlNodePtr node, =20 str =3D virXPathString("string(./rx/frames/@max)", ctxt); if (!str) - goto cleanup; + return NULL; =20 if (VIR_ALLOC(ret) < 0) - goto cleanup; + return NULL; =20 if (virStrToLong_ullp(str, NULL, 10, &tmp) < 0) { virReportError(VIR_ERR_XML_DETAIL, @@ -8417,12 +8411,11 @@ virDomainNetDefCoalesceParseXML(xmlNodePtr node, } ret->rx_max_coalesced_frames =3D tmp; =20 - cleanup: return ret; =20 error: VIR_FREE(ret); - goto cleanup; + return NULL; } =20 static void @@ -9837,7 +9830,6 @@ virDomainDiskDefParsePrivateData(xmlXPathContextPtr c= txt, { xmlNodePtr private_node =3D virXPathNode("./privateData", ctxt); VIR_XPATH_NODE_AUTORESTORE(ctxt); - int ret =3D -1; =20 if (!xmlopt || !xmlopt->privateData.diskParse || @@ -9847,12 +9839,9 @@ virDomainDiskDefParsePrivateData(xmlXPathContextPtr = ctxt, ctxt->node =3D private_node; =20 if (xmlopt->privateData.diskParse(ctxt, disk) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -11309,7 +11298,6 @@ virDomainChrSourceReconnectDefParseXML(virDomainChr= SourceReconnectDefPtr def, xmlNodePtr node, xmlXPathContextPtr ctxt) { - int ret =3D -1; int tmpVal; VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr cur; @@ -11323,7 +11311,7 @@ virDomainChrSourceReconnectDefParseXML(virDomainChr= SourceReconnectDefPtr def, virReportError(VIR_ERR_XML_ERROR, _("invalid reconnect enabled value: '%s'"), tmp); - goto cleanup; + return -1; } def->enabled =3D tmpVal; VIR_FREE(tmp); @@ -11335,20 +11323,18 @@ virDomainChrSourceReconnectDefParseXML(virDomainC= hrSourceReconnectDefPtr def, virReportError(VIR_ERR_XML_ERROR, _("invalid reconnect timeout value: '%s= '"), tmp); - goto cleanup; + return -1; } } else { virReportError(VIR_ERR_XML_ERROR, "%s", _("missing timeout for chardev with " "reconnect enabled")); - goto cleanup; + return -1; } } } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -12570,7 +12556,6 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef= Ptr def, virSecurityLabelDefPtr* vmSeclabels, int nvmSeclabels) { - int ret =3D -1; bool logParsed =3D false; bool protocolParsed =3D false; int sourceParsed =3D 0; @@ -12685,13 +12670,11 @@ virDomainChrSourceDefParseXML(virDomainChrSourceD= efPtr def, } } =20 - ret =3D 0; - cleanup: - return ret; + return 0; =20 error: virDomainChrSourceDefClear(def); - goto cleanup; + return -1; } =20 =20 @@ -13886,7 +13869,6 @@ virDomainGraphicsDefParseXMLSDL(virDomainGraphicsDe= fPtr def, VIR_XPATH_NODE_AUTORESTORE(ctxt); int enableVal; xmlNodePtr glNode; - int ret =3D -1; g_autofree char *fullscreen =3D virXMLPropString(node, "fullscreen"); g_autofree char *enable =3D NULL; =20 @@ -13896,7 +13878,7 @@ virDomainGraphicsDefParseXMLSDL(virDomainGraphicsDe= fPtr def, if (virStringParseYesNo(fullscreen, &def->data.sdl.fullscreen) < 0= ) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unknown fullscreen value '%s'"), fullscreen); - goto cleanup; + return -1; } } else { def->data.sdl.fullscreen =3D false; @@ -13911,21 +13893,19 @@ virDomainGraphicsDefParseXMLSDL(virDomainGraphics= DefPtr def, if (!enable) { virReportError(VIR_ERR_XML_ERROR, "%s", _("sdl gl element missing enable")); - goto cleanup; + return -1; } =20 enableVal =3D virTristateBoolTypeFromString(enable); if (enableVal < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown enable value '%s'"), enable); - goto cleanup; + return -1; } def->data.sdl.gl =3D enableVal; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -14961,7 +14941,6 @@ virSysinfoBaseBoardParseXML(xmlXPathContextPtr ctxt, virSysinfoBaseBoardDefPtr *baseBoard, size_t *nbaseBoard) { - int ret =3D -1; size_t i, nboards =3D 0; VIR_XPATH_NODE_AUTORESTORE(ctxt); int n; @@ -14969,10 +14948,10 @@ virSysinfoBaseBoardParseXML(xmlXPathContextPtr ct= xt, g_autofree xmlNodePtr *nodes =3D NULL; =20 if ((n =3D virXPathNodeSet("./baseBoard", ctxt, &nodes)) < 0) - return ret; + return -1; =20 if (n && VIR_ALLOC_N(boards, n) < 0) - goto cleanup; + return -1; =20 for (i =3D 0; i < n; i++) { virSysinfoBaseBoardDefPtr def =3D boards + nboards; @@ -15002,9 +14981,8 @@ virSysinfoBaseBoardParseXML(xmlXPathContextPtr ctxt, =20 *baseBoard =3D g_steal_pointer(&boards); *nbaseBoard =3D nboards; - ret =3D 0; - cleanup: - return ret; + + return 0; } =20 =20 @@ -15941,7 +15919,6 @@ virDomainMemorySourceDefParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, virDomainMemoryDefPtr def) { - int ret =3D -1; VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node =3D node; g_autofree char *nodemask =3D NULL; @@ -15950,17 +15927,17 @@ virDomainMemorySourceDefParseXML(xmlNodePtr node, case VIR_DOMAIN_MEMORY_MODEL_DIMM: if (virDomainParseMemory("./pagesize", "./pagesize/@unit", ctxt, &def->pagesize, false, false) < 0) - goto cleanup; + return -1; =20 if ((nodemask =3D virXPathString("string(./nodemask)", ctxt))) { if (virBitmapParse(nodemask, &def->sourceNodes, VIR_DOMAIN_CPUMASK_LEN) < 0) - goto cleanup; + return -1; =20 if (virBitmapIsAllClear(def->sourceNodes)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid value of 'nodemask': %s"), nodem= ask); - goto cleanup; + return -1; } } break; @@ -15969,12 +15946,12 @@ virDomainMemorySourceDefParseXML(xmlNodePtr node, if (!(def->nvdimmPath =3D virXPathString("string(./path)", ctxt)))= { virReportError(VIR_ERR_XML_DETAIL, "%s", _("path is required for model 'nvdimm'")); - goto cleanup; + return -1; } =20 if (virDomainParseMemory("./alignsize", "./alignsize/@unit", ctxt, &def->alignsize, false, false) < 0) - goto cleanup; + return -1; =20 if (virXPathBoolean("boolean(./pmem)", ctxt)) def->nvdimmPmem =3D true; @@ -15986,10 +15963,7 @@ virDomainMemorySourceDefParseXML(xmlNodePtr node, break; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -15998,7 +15972,6 @@ virDomainMemoryTargetDefParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, virDomainMemoryDefPtr def) { - int ret =3D -1; VIR_XPATH_NODE_AUTORESTORE(ctxt); ctxt->node =3D node; int rv; @@ -16010,38 +15983,35 @@ virDomainMemoryTargetDefParseXML(xmlNodePtr node, (rv =3D=3D 0 && def->targetNode < 0)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("invalid value of memory device node")); - goto cleanup; + return -1; } =20 if (virDomainParseMemory("./size", "./size/@unit", ctxt, &def->size, true, false) < 0) - goto cleanup; + return -1; =20 if (def->model =3D=3D VIR_DOMAIN_MEMORY_MODEL_NVDIMM) { if (virDomainParseMemory("./label/size", "./label/size/@unit", ctx= t, &def->labelsize, false, false) < 0) - goto cleanup; + return -1; =20 if (def->labelsize && def->labelsize < 128) { virReportError(VIR_ERR_XML_ERROR, "%s", _("nvdimm label must be at least 128KiB")); - goto cleanup; + return -1; } =20 if (def->labelsize >=3D def->size) { virReportError(VIR_ERR_XML_ERROR, "%s", _("label size must be smaller than NVDIMM size"= )); - goto cleanup; + return -1; } =20 if (virXPathBoolean("boolean(./readonly)", ctxt)) def->readonly =3D true; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -16192,7 +16162,6 @@ static virDomainIOMMUDefPtr virDomainIOMMUDefParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt) { - virDomainIOMMUDefPtr ret =3D NULL; VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr driver; int val; @@ -16202,17 +16171,17 @@ virDomainIOMMUDefParseXML(xmlNodePtr node, ctxt->node =3D node; =20 if (VIR_ALLOC(iommu) < 0) - goto cleanup; + return NULL; =20 if (!(tmp =3D virXMLPropString(node, "model"))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("missing model for IOMMU device")); - goto cleanup; + return NULL; } =20 if ((val =3D virDomainIOMMUModelTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_XML_ERROR, _("unknown IOMMU model: %s"), tm= p); - goto cleanup; + return NULL; } =20 iommu->model =3D val; @@ -16222,7 +16191,7 @@ virDomainIOMMUDefParseXML(xmlNodePtr node, if ((tmp =3D virXMLPropString(driver, "intremap"))) { if ((val =3D virTristateSwitchTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_XML_ERROR, _("unknown intremap valu= e: %s"), tmp); - goto cleanup; + return NULL; } iommu->intremap =3D val; } @@ -16231,7 +16200,7 @@ virDomainIOMMUDefParseXML(xmlNodePtr node, if ((tmp =3D virXMLPropString(driver, "caching_mode"))) { if ((val =3D virTristateSwitchTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_XML_ERROR, _("unknown caching_mode = value: %s"), tmp); - goto cleanup; + return NULL; } iommu->caching_mode =3D val; } @@ -16239,7 +16208,7 @@ virDomainIOMMUDefParseXML(xmlNodePtr node, if ((tmp =3D virXMLPropString(driver, "iotlb"))) { if ((val =3D virTristateSwitchTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_XML_ERROR, _("unknown iotlb value: = %s"), tmp); - goto cleanup; + return NULL; } iommu->iotlb =3D val; } @@ -16248,16 +16217,13 @@ virDomainIOMMUDefParseXML(xmlNodePtr node, if ((tmp =3D virXMLPropString(driver, "eim"))) { if ((val =3D virTristateSwitchTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_XML_ERROR, _("unknown eim value: %s= "), tmp); - goto cleanup; + return NULL; } iommu->eim =3D val; } } =20 - ret =3D g_steal_pointer(&iommu); - - cleanup: - return ret; + return g_steal_pointer(&iommu); } =20 =20 @@ -16267,7 +16233,6 @@ virDomainVsockDefParseXML(virDomainXMLOptionPtr xml= opt, xmlXPathContextPtr ctxt, unsigned int flags) { - virDomainVsockDefPtr ret =3D NULL; VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr cid; int val; @@ -16277,12 +16242,12 @@ virDomainVsockDefParseXML(virDomainXMLOptionPtr x= mlopt, ctxt->node =3D node; =20 if (!(vsock =3D virDomainVsockDefNew(xmlopt))) - goto cleanup; + return NULL; =20 if ((tmp =3D virXMLPropString(node, "model"))) { if ((val =3D virDomainVsockModelTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_XML_ERROR, _("unknown vsock model: %s")= , tmp); - goto cleanup; + return NULL; } vsock->model =3D val; } @@ -16297,7 +16262,7 @@ virDomainVsockDefParseXML(virDomainXMLOptionPtr xml= opt, virReportError(VIR_ERR_XML_DETAIL, _("'cid' attribute must be a positive numbe= r: %s"), tmp); - goto cleanup; + return NULL; } } =20 @@ -16308,19 +16273,16 @@ virDomainVsockDefParseXML(virDomainXMLOptionPtr x= mlopt, virReportError(VIR_ERR_XML_DETAIL, _("'auto' attribute can be 'yes' or 'no': %= s"), tmp); - goto cleanup; + return NULL; } vsock->auto_cid =3D val; } } =20 if (virDomainDeviceInfoParseXML(xmlopt, node, &vsock->info, flags) < 0) - goto cleanup; - - ret =3D g_steal_pointer(&vsock); + return NULL; =20 - cleanup: - return ret; + return g_steal_pointer(&vsock); } =20 virDomainDeviceDefPtr @@ -18480,7 +18442,6 @@ virDomainHugepagesParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, virDomainHugePagePtr hugepage) { - int ret =3D -1; VIR_XPATH_NODE_AUTORESTORE(ctxt); g_autofree char *nodeset =3D NULL; =20 @@ -18488,29 +18449,27 @@ virDomainHugepagesParseXML(xmlNodePtr node, =20 if (virDomainParseMemory("./@size", "./@unit", ctxt, &hugepage->size, true, false) < 0) - goto cleanup; + return -1; =20 if (!hugepage->size) { virReportError(VIR_ERR_XML_DETAIL, "%s", _("hugepage size can't be zero")); - goto cleanup; + return -1; } =20 if ((nodeset =3D virXMLPropString(node, "nodeset"))) { if (virBitmapParse(nodeset, &hugepage->nodemask, VIR_DOMAIN_CPUMASK_LEN) < 0) - goto cleanup; + return -1; =20 if (virBitmapIsAllClear(hugepage->nodemask)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid value of 'nodeset': %s"), nodeset); - goto cleanup; + return -1; } } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -19159,7 +19118,6 @@ virDomainCachetuneDefParseCache(xmlXPathContextPtr = ctxt, unsigned int cache; int type; unsigned long long size; - int ret =3D -1; g_autofree char *tmp =3D NULL; =20 ctxt->node =3D node; @@ -19168,13 +19126,13 @@ virDomainCachetuneDefParseCache(xmlXPathContextPt= r ctxt, if (!tmp) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Missing cachetune attribute 'id'")); - goto cleanup; + return -1; } if (virStrToLong_uip(tmp, NULL, 10, &cache) < 0) { virReportError(VIR_ERR_XML_ERROR, _("Invalid cachetune attribute 'id' value '%s'"), tmp); - goto cleanup; + return -1; } VIR_FREE(tmp); =20 @@ -19182,13 +19140,13 @@ virDomainCachetuneDefParseCache(xmlXPathContextPt= r ctxt, if (!tmp) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Missing cachetune attribute 'level'")); - goto cleanup; + return -1; } if (virStrToLong_uip(tmp, NULL, 10, &level) < 0) { virReportError(VIR_ERR_XML_ERROR, _("Invalid cachetune attribute 'level' value '%s'"), tmp); - goto cleanup; + return -1; } VIR_FREE(tmp); =20 @@ -19196,27 +19154,25 @@ virDomainCachetuneDefParseCache(xmlXPathContextPt= r ctxt, if (!tmp) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Missing cachetune attribute 'type'")); - goto cleanup; + return -1; } type =3D virCacheTypeFromString(tmp); if (type < 0) { virReportError(VIR_ERR_XML_ERROR, _("Invalid cachetune attribute 'type' value '%s'"), tmp); - goto cleanup; + return -1; } =20 if (virDomainParseScaledValue("./@size", "./@unit", ctxt, &size, 1024, ULLONG_MAX, true) < 0) - goto cleanup; + return -1; =20 if (virResctrlAllocSetCacheSize(alloc, level, type, cache, size) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -19611,7 +19567,6 @@ virDomainMemorytuneDefParseMemory(xmlXPathContextPt= r ctxt, VIR_XPATH_NODE_AUTORESTORE(ctxt); unsigned int id; unsigned int bandwidth; - int ret =3D -1; g_autofree char *tmp =3D NULL; =20 ctxt->node =3D node; @@ -19620,13 +19575,13 @@ virDomainMemorytuneDefParseMemory(xmlXPathContext= Ptr ctxt, if (!tmp) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Missing memorytune attribute 'id'")); - goto cleanup; + return -1; } if (virStrToLong_uip(tmp, NULL, 10, &id) < 0) { virReportError(VIR_ERR_XML_ERROR, _("Invalid memorytune attribute 'id' value '%s'"), tmp); - goto cleanup; + return -1; } VIR_FREE(tmp); =20 @@ -19634,20 +19589,18 @@ virDomainMemorytuneDefParseMemory(xmlXPathContext= Ptr ctxt, if (!tmp) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Missing memorytune attribute 'bandwidth'")); - goto cleanup; + return -1; } if (virStrToLong_uip(tmp, NULL, 10, &bandwidth) < 0) { virReportError(VIR_ERR_XML_ERROR, _("Invalid memorytune attribute 'bandwidth' value '= %s'"), tmp); - goto cleanup; + return -1; } if (virResctrlAllocSetMemoryBandwidth(alloc, id, bandwidth) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -24074,7 +24027,6 @@ virDomainDiskSourceFormatPrivateData(virBufferPtr b= uf, virDomainXMLOptionPtr xmlopt) { g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; - int ret =3D -1; =20 if (!(flags & VIR_DOMAIN_DEF_FORMAT_STATUS) || !xmlopt || !xmlopt->privateData.storageFormat) @@ -24083,15 +24035,12 @@ virDomainDiskSourceFormatPrivateData(virBufferPtr= buf, virBufferSetChildIndent(&childBuf, buf); =20 if (xmlopt->privateData.storageFormat(src, &childBuf) < 0) - goto cleanup; + return -1; =20 if (virXMLFormatElement(buf, "privateData", NULL, &childBuf) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -24774,18 +24723,17 @@ virDomainFSDefFormat(virBufferPtr buf, const char *wrpolicy =3D virDomainFSWrpolicyTypeToString(def->wrpolicy= ); const char *src =3D def->src->path; g_auto(virBuffer) driverBuf =3D VIR_BUFFER_INITIALIZER; - int ret =3D -1; =20 if (!type) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected filesystem type %d"), def->type); - goto cleanup; + return -1; } =20 if (!accessmode) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected accessmode %d"), def->accessmode); - goto cleanup; + return -1; } =20 virBufferAsprintf(buf, @@ -24814,7 +24762,7 @@ virDomainFSDefFormat(virBufferPtr buf, virDomainVirtioOptionsFormat(&driverBuf, def->virtio); =20 if (virBufferCheckError(&driverBuf) < 0) - goto cleanup; + return -1; =20 if (virBufferUse(&driverBuf)) { virBufferAddLit(buf, "\n"); =20 if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) - goto cleanup; + return -1; =20 if (def->space_hard_limit) virBufferAsprintf(buf, "" @@ -24876,10 +24824,7 @@ virDomainFSDefFormat(virBufferPtr buf, virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "\n"); =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -26006,14 +25951,13 @@ virDomainSmartcardDefFormat(virBufferPtr buf, const char *mode =3D virDomainSmartcardTypeToString(def->type); g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; size_t i; - int ret =3D -1; =20 virBufferSetChildIndent(&childBuf, buf); =20 if (!mode) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected smartcard type %d"), def->type); - goto cleanup; + return -1; } =20 switch (def->type) { @@ -26031,24 +25975,24 @@ virDomainSmartcardDefFormat(virBufferPtr buf, =20 case VIR_DOMAIN_SMARTCARD_TYPE_PASSTHROUGH: if (virDomainChrSourceDefFormat(&childBuf, def->data.passthru, fla= gs) < 0) - goto cleanup; + return -1; break; =20 default: virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected smartcard type %d"), def->type); - goto cleanup; + return -1; } if (virDomainDeviceInfoFormat(&childBuf, &def->info, flags) < 0) - goto cleanup; + return -1; =20 if (virBufferCheckError(&childBuf) < 0) - goto cleanup; + return -1; =20 virBufferAsprintf(buf, "type =3D=3D VIR_DOMAIN_SMARTCARD_TYPE_PASSTHROUGH && virDomainChrAttrsDefFormat(buf, def->data.passthru, false) < 0) { - goto cleanup; + return -1; } =20 if (virBufferUse(&childBuf)) { @@ -26059,10 +26003,7 @@ virDomainSmartcardDefFormat(virBufferPtr buf, virBufferAddLit(buf, "/>\n"); } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 static int @@ -26139,24 +26080,23 @@ virDomainSoundDefFormat(virBufferPtr buf, const char *model =3D virDomainSoundModelTypeToString(def->model); g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; size_t i; - int ret =3D -1; =20 virBufferSetChildIndent(&childBuf, buf); =20 if (!model) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected sound model %d"), def->model); - goto cleanup; + return -1; } =20 for (i =3D 0; i < def->ncodecs; i++) virDomainSoundCodecDefFormat(&childBuf, def->codecs[i]); =20 if (virDomainDeviceInfoFormat(&childBuf, &def->info, flags) < 0) - goto cleanup; + return -1; =20 if (virBufferCheckError(&childBuf) < 0) - goto cleanup; + return -1; =20 virBufferAsprintf(buf, "\n"); } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -26532,19 +26469,18 @@ virDomainVideoDefFormat(virBufferPtr buf, { const char *model =3D virDomainVideoTypeToString(def->type); g_auto(virBuffer) driverBuf =3D VIR_BUFFER_INITIALIZER; - int ret =3D -1; =20 if (!model) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected video model %d"), def->type); - goto cleanup; + return -1; } =20 virBufferAddLit(buf, "\n"); =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 static int @@ -27606,40 +27539,37 @@ virDomainCachetuneDefFormat(virBufferPtr buf, { g_auto(virBuffer) childrenBuf =3D VIR_BUFFER_INITIALIZER; size_t i =3D 0; - int ret =3D -1; g_autofree char *vcpus =3D NULL; =20 virBufferSetChildIndent(&childrenBuf, buf); if (virResctrlAllocForeachCache(resctrl->alloc, virDomainCachetuneDefFormatHelper, &childrenBuf) < 0) - goto cleanup; + return -1; =20 for (i =3D 0; i < resctrl->nmonitors; i++) { if (virDomainResctrlMonDefFormatHelper(resctrl->monitors[i], VIR_RESCTRL_MONITOR_TYPE_CA= CHE, &childrenBuf) < 0) - goto cleanup; + return -1; } =20 if (virBufferCheckError(&childrenBuf) < 0) - goto cleanup; + return -1; =20 - if (!virBufferUse(&childrenBuf)) { - ret =3D 0; - goto cleanup; - } + if (!virBufferUse(&childrenBuf)) + return 0; =20 vcpus =3D virBitmapFormat(resctrl->vcpus); if (!vcpus) - goto cleanup; + return -1; =20 virBufferAsprintf(buf, "alloc); if (!alloc_id) - goto cleanup; + return -1; =20 virBufferAsprintf(buf, " id=3D'%s'", alloc_id); } @@ -27648,9 +27578,7 @@ virDomainCachetuneDefFormat(virBufferPtr buf, virBufferAddBuffer(buf, &childrenBuf); virBufferAddLit(buf, "\n"); =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -27674,33 +27602,30 @@ virDomainMemorytuneDefFormat(virBufferPtr buf, unsigned int flags) { g_auto(virBuffer) childrenBuf =3D VIR_BUFFER_INITIALIZER; - int ret =3D -1; g_autofree char *vcpus =3D NULL; =20 virBufferSetChildIndent(&childrenBuf, buf); if (virResctrlAllocForeachMemory(resctrl->alloc, virDomainMemorytuneDefFormatHelper, &childrenBuf) < 0) - goto cleanup; + return -1; =20 if (virBufferCheckError(&childrenBuf) < 0) - goto cleanup; + return -1; =20 - if (!virBufferUse(&childrenBuf)) { - ret =3D 0; - goto cleanup; - } + if (!virBufferUse(&childrenBuf)) + return 0; =20 vcpus =3D virBitmapFormat(resctrl->vcpus); if (!vcpus) - goto cleanup; + return -1; =20 virBufferAsprintf(buf, "alloc); if (!alloc_id) - goto cleanup; + return -1; =20 virBufferAsprintf(buf, " id=3D'%s'", alloc_id); } @@ -27709,9 +27634,7 @@ virDomainMemorytuneDefFormat(virBufferPtr buf, virBufferAddBuffer(buf, &childrenBuf); virBufferAddLit(buf, "\n"); =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 static int @@ -27721,7 +27644,6 @@ virDomainCputuneDefFormat(virBufferPtr buf, { size_t i; g_auto(virBuffer) childrenBuf =3D VIR_BUFFER_INITIALIZER; - int ret =3D -1; =20 virBufferSetChildIndent(&childrenBuf, buf); =20 @@ -27769,7 +27691,7 @@ virDomainCputuneDefFormat(virBufferPtr buf, continue; =20 if (!(cpumask =3D virBitmapFormat(vcpu->cpumask))) - goto cleanup; + return -1; =20 virBufferAsprintf(&childrenBuf, "\n", i, cp= umask); @@ -27782,7 +27704,7 @@ virDomainCputuneDefFormat(virBufferPtr buf, virBufferAddLit(&childrenBuf, "cputune.emulatorpin))) - goto cleanup; + return -1; =20 virBufferAsprintf(&childrenBuf, "cpuset=3D'%s'/>\n", cpumask); VIR_FREE(cpumask); @@ -27799,7 +27721,7 @@ virDomainCputuneDefFormat(virBufferPtr buf, def->iothreadids[i]->iothread_id); =20 if (!(cpumask =3D virBitmapFormat(def->iothreadids[i]->cpumask))) - goto cleanup; + return -1; =20 virBufferAsprintf(&childrenBuf, "cpuset=3D'%s'/>\n", cpumask); VIR_FREE(cpumask); @@ -27837,10 +27759,7 @@ virDomainCputuneDefFormat(virBufferPtr buf, virBufferAddLit(buf, "\n"); } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -27911,7 +27830,6 @@ virDomainIOMMUDefFormat(virBufferPtr buf, g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; g_auto(virBuffer) driverAttrBuf =3D VIR_BUFFER_INITIALIZER; - int ret =3D -1; =20 virBufferSetChildIndent(&childBuf, buf); =20 @@ -27933,18 +27851,15 @@ virDomainIOMMUDefFormat(virBufferPtr buf, } =20 if (virXMLFormatElement(&childBuf, "driver", &driverAttrBuf, NULL) < 0) - goto cleanup; + return -1; =20 virBufferAsprintf(&attrBuf, " model=3D'%s'", virDomainIOMMUModelTypeToString(iommu->model)); =20 if (virXMLFormatElement(buf, "iommu", &attrBuf, &childBuf) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -27953,7 +27868,6 @@ virDomainMemtuneFormat(virBufferPtr buf, const virDomainMemtune *mem) { g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; - int ret =3D -1; =20 virBufferSetChildIndent(&childBuf, buf); =20 @@ -27979,7 +27893,7 @@ virDomainMemtuneFormat(virBufferPtr buf, } =20 if (virXMLFormatElement(buf, "memtune", NULL, &childBuf) < 0) - goto cleanup; + return -1; =20 virBufferSetChildIndent(&childBuf, buf); =20 @@ -28002,11 +27916,9 @@ virDomainMemtuneFormat(virBufferPtr buf, virBufferAddLit(&childBuf, "\n"); =20 if (virXMLFormatElement(buf, "memoryBacking", NULL, &childBuf) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -28017,7 +27929,6 @@ virDomainVsockDefFormat(virBufferPtr buf, g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; g_auto(virBuffer) cidAttrBuf =3D VIR_BUFFER_INITIALIZER; - int ret =3D -1; =20 if (vsock->model) { virBufferAsprintf(&attrBuf, " model=3D'%s'", @@ -28033,18 +27944,15 @@ virDomainVsockDefFormat(virBufferPtr buf, if (vsock->guest_cid !=3D 0) virBufferAsprintf(&cidAttrBuf, " address=3D'%u'", vsock->guest_cid= ); if (virXMLFormatElement(&childBuf, "cid", &cidAttrBuf, NULL) < 0) - goto cleanup; + return -1; =20 if (virDomainDeviceInfoFormat(&childBuf, &vsock->info, 0) < 0) - goto cleanup; + return -1; =20 if (virXMLFormatElement(buf, "vsock", &attrBuf, &childBuf) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_c= onf.c index 9af2173b7b..dd1a63a5cf 100644 --- a/src/conf/netdev_bandwidth_conf.c +++ b/src/conf/netdev_bandwidth_conf.c @@ -264,15 +264,11 @@ virNetDevBandwidthFormat(virNetDevBandwidthPtr def, unsigned int class_id, virBufferPtr buf) { - int ret =3D -1; - if (!buf) - goto cleanup; + return -1; =20 - if (!def) { - ret =3D 0; - goto cleanup; - } + if (!def) + return 0; =20 virBufferAddLit(buf, "in, buf, "inbound") < 0 || virNetDevBandwidthRateFormat(def->out, buf, "outbound") < 0) - goto cleanup; + return -1; virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "\n"); =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 void diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 7f8e43b25c..5d62231b0f 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -3062,18 +3062,17 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, unsigned int fflags G_GNUC_UNUSED) { size_t i; - int ret =3D -1; virNetworkIPDefPtr ipdef =3D virNetworkIPDefByIndex(def, parentIndex); virSocketAddrRange range; =20 memset(&range, 0, sizeof(range)); =20 if (virNetworkDefUpdateCheckElementName(def, ctxt->node, "range") < 0) - goto cleanup; + return -1; =20 /* ipdef is the ip element that needs its range array updated */ if (!ipdef) - goto cleanup; + return -1; =20 /* parse the xml into a virSocketAddrRange */ if (command =3D=3D VIR_NETWORK_UPDATE_COMMAND_MODIFY) { @@ -3081,18 +3080,18 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("dhcp ranges cannot be modified, " "only added or deleted")); - goto cleanup; + return -1; } =20 if (virSocketAddrRangeParseXML(def->name, ipdef, ctxt->node, &range) <= 0) - goto cleanup; + return -1; =20 if (VIR_SOCKET_ADDR_FAMILY(&ipdef->address) !=3D VIR_SOCKET_ADDR_FAMILY(&range.start)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("the address family of a dhcp range must match " "the address family of the dhcp element's parent"= )); - goto cleanup; + return -1; } =20 /* check if an entry with same name/address/ip already exists */ @@ -3107,7 +3106,7 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, (command =3D=3D VIR_NETWORK_UPDATE_COMMAND_ADD_LAST)) { =20 if (virNetworkDefUpdateCheckMultiDHCP(def, ipdef) < 0) - goto cleanup; + return -1; =20 if (i < ipdef->nranges) { char *startip =3D virSocketAddrFormat(&range.start); @@ -3122,7 +3121,7 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, endip ? endip : "unknown"); VIR_FREE(startip); VIR_FREE(endip); - goto cleanup; + return -1; } =20 /* add to beginning/end of list */ @@ -3130,14 +3129,14 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, command =3D=3D VIR_NETWORK_UPDATE_COMMAND_A= DD_FIRST ? 0 : ipdef->nranges, ipdef->nranges, range) < 0) - goto cleanup; + return -1; } else if (command =3D=3D VIR_NETWORK_UPDATE_COMMAND_DELETE) { =20 if (i =3D=3D ipdef->nranges) { virReportError(VIR_ERR_OPERATION_INVALID, _("couldn't locate a matching dhcp range entry " "in network '%s'"), def->name); - goto cleanup; + return -1; } =20 /* remove it */ @@ -3146,12 +3145,10 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, =20 } else { virNetworkDefUpdateUnknownCommand(command); - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 7eb52dbf85..5ced615f1f 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2115,7 +2115,6 @@ virNodeDeviceGetWWNs(virNodeDeviceDefPtr def, char **wwpn) { virNodeDevCapsDefPtr cap =3D NULL; - int ret =3D -1; =20 cap =3D def->caps; while (cap !=3D NULL) { @@ -2132,12 +2131,10 @@ virNodeDeviceGetWWNs(virNodeDeviceDefPtr def, if (cap =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Device is not a fibre channel HBA")); - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -2504,7 +2501,7 @@ virNodeDeviceGetPCISRIOVCaps(const char *sysfsPath, ret =3D virPCIGetPhysicalFunction(sysfsPath, &pci_dev->physical_function); if (ret < 0) - goto cleanup; + return ret; =20 if (pci_dev->physical_function) pci_dev->flags |=3D VIR_NODE_DEV_CAP_FLAG_PCI_PHYSICAL_FUNCTION; @@ -2513,13 +2510,12 @@ virNodeDeviceGetPCISRIOVCaps(const char *sysfsPath, &pci_dev->num_virtual_functions, &pci_dev->max_virtual_functions); if (ret < 0) - goto cleanup; + return ret; =20 if (pci_dev->num_virtual_functions > 0 || pci_dev->max_virtual_functions > 0) pci_dev->flags |=3D VIR_NODE_DEV_CAP_FLAG_PCI_VIRTUAL_FUNCTION; =20 - cleanup: return ret; } =20 @@ -2528,7 +2524,7 @@ static int virNodeDeviceGetPCIIOMMUGroupCaps(virNodeDevCapPCIDevPtr pci_dev) { size_t i; - int tmpGroup, ret =3D -1; + int tmpGroup; virPCIDeviceAddress addr; =20 /* this could be a refresh, so clear out the old data */ @@ -2545,23 +2541,19 @@ virNodeDeviceGetPCIIOMMUGroupCaps(virNodeDevCapPCID= evPtr pci_dev) tmpGroup =3D virPCIDeviceAddressGetIOMMUGroupNum(&addr); if (tmpGroup =3D=3D -1) { /* error was already reported */ - goto cleanup; + return -1; } - if (tmpGroup =3D=3D -2) { + if (tmpGroup =3D=3D -2) /* -2 return means there is no iommu_group data */ - ret =3D 0; - goto cleanup; - } + return 0; if (tmpGroup >=3D 0) { if (virPCIDeviceAddressGetIOMMUGroupAddresses(&addr, &pci_dev->iom= muGroupDevices, &pci_dev->nIommuGrou= pDevices) < 0) - goto cleanup; + return -1; pci_dev->iommuGroupNumber =3D tmpGroup; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index 6720d5620d..4bc22ec7d9 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -390,24 +390,22 @@ int virDomainNumatuneGetMode(virDomainNumaPtr numatun= e, int cellid, virDomainNumatuneMemMode *mode) { - int ret =3D -1; virDomainNumatuneMemMode tmp_mode; =20 if (!numatune) - return ret; + return -1; =20 if (virDomainNumatuneNodeSpecified(numatune, cellid)) tmp_mode =3D numatune->mem_nodes[cellid].mode; else if (numatune->memory.specified) tmp_mode =3D numatune->memory.mode; else - goto cleanup; + return -1; =20 if (mode) *mode =3D tmp_mode; - ret =3D 0; - cleanup: - return ret; + + return 0; } =20 virBitmapPtr @@ -498,8 +496,6 @@ virDomainNumatuneSet(virDomainNumaPtr numa, int mode, virBitmapPtr nodeset) { - int ret =3D -1; - /* No need to do anything in this case */ if (mode =3D=3D -1 && placement =3D=3D -1 && !nodeset) return 0; @@ -517,7 +513,7 @@ virDomainNumatuneSet(virDomainNumaPtr numa, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported numatune mode '%d'"), mode); - goto cleanup; + return -1; } =20 if (placement !=3D -1 && @@ -525,7 +521,7 @@ virDomainNumatuneSet(virDomainNumaPtr numa, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported numatune placement '%d'"), mode); - goto cleanup; + return -1; } =20 if (mode !=3D -1) @@ -534,7 +530,7 @@ virDomainNumatuneSet(virDomainNumaPtr numa, if (nodeset) { virBitmapFree(numa->memory.nodeset); if (!(numa->memory.nodeset =3D virBitmapNewCopy(nodeset))) - goto cleanup; + return -1; if (placement =3D=3D -1) placement =3D VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC; } @@ -551,7 +547,7 @@ virDomainNumatuneSet(virDomainNumaPtr numa, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("nodeset for NUMA memory tuning must be set " "if 'placement' is 'static'")); - goto cleanup; + return -1; } =20 /* setting nodeset when placement auto is invalid */ @@ -566,10 +562,7 @@ virDomainNumatuneSet(virDomainNumaPtr numa, =20 numa->memory.specified =3D true; =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 static bool diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index cd97eb87ac..5c9d6ee811 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2087,13 +2087,11 @@ virNWFilterIncludeParse(xmlNodePtr cur) if (!ret->params) goto err_exit; =20 - cleanup: return ret; =20 err_exit: virNWFilterIncludeDefFree(ret); - ret =3D NULL; - goto cleanup; + return NULL; } =20 =20 diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index f212eefe25..58ce29c101 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -343,17 +343,14 @@ int virStoragePoolOptionsPoolTypeSetXMLNamespace(int type, virXMLNamespacePtr ns) { - int ret =3D -1; virStoragePoolTypeInfoPtr backend =3D virStoragePoolTypeInfoLookup(typ= e); =20 if (!backend) - goto cleanup; + return -1; =20 backend->poolOptions.ns =3D *ns; - ret =3D 0; =20 - cleanup: - return ret; + return 0; } =20 =20 diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index e7017bffa9..c958c678ce 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -766,14 +766,13 @@ virNetworkObjConfigChangeSetup(virNetworkObjPtr obj, unsigned int flags) { bool isActive; - int ret =3D -1; =20 isActive =3D virNetworkObjIsActive(obj); =20 if (!isActive && (flags & VIR_NETWORK_UPDATE_AFFECT_LIVE)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("network is not running")); - goto cleanup; + return -1; } =20 if (flags & VIR_NETWORK_UPDATE_AFFECT_CONFIG) { @@ -781,18 +780,16 @@ virNetworkObjConfigChangeSetup(virNetworkObjPtr obj, virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot change persistent config of a " "transient network")); - goto cleanup; + return -1; } /* this should already have been done by the driver, but do it * anyway just in case. */ if (isActive && (virNetworkObjSetDefTransient(obj, false, xmlopt) = < 0)) - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -1676,10 +1673,9 @@ virNetworkObjLookupPort(virNetworkObjPtr net, virReportError(VIR_ERR_NO_NETWORK_PORT, _("Network port with UUID %s does not exist"), uuidstr); - goto cleanup; + return NULL; } =20 - cleanup: return ret; } =20 diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index ebf6ca7680..81c9f2c346 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -732,14 +732,13 @@ virSecretObjGetValue(virSecretObjPtr obj) virUUIDFormat(def->uuid, uuidstr); virReportError(VIR_ERR_NO_SECRET, _("secret '%s' does not have a value"), uuidstr); - goto cleanup; + return NULL; } =20 if (VIR_ALLOC_N(ret, obj->value_size) < 0) - goto cleanup; + return NULL; memcpy(ret, obj->value, obj->value_size); =20 - cleanup: return ret; } =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 9 02:14:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 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=1571737214; cv=none; d=zoho.com; s=zohoarc; b=BxePM9XrpcASCiwG8Snkz8VRaEQl2gmz5IJ4WwsCV4Odi3Dj841GT2vy+wwgbPQ8HvPlhMoDw6fBVq1PMubIKLaji6anBvSKxgC45ikl0VrgPKr2V5h0dMZeORUteAHQKtQOsId88Wfn1eA24G/fVL3d/MPPAIna5Uvnyocyzd8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571737214; 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=bSEJFhWsPrmkvgoPH55xllD3MKA2jPp3ufqdA8PuH/s=; b=ePPkYEVsM9/RjQCHhhtifDcUp400Dv1K1iMfbYEjyBrqXyxrFinSn3rxFJF9E5z+qt0KSmnzYj+k7ViHlM9QBDNK+oj9Sz0khlzDNfGYe2jgIvxEOnmu5J/HWxbX290Gw6wS0W+77c1C/950kqOTGh2eXTlShnRfqIHgNJFfXKI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571737214412457.5926246494407; Tue, 22 Oct 2019 02:40:14 -0700 (PDT) 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-158-maRfFs03MQGyxn_cpQBmXg-1; Tue, 22 Oct 2019 05:40:11 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id BD6781800E02; Tue, 22 Oct 2019 09:40:06 +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 77EDD60C4E; Tue, 22 Oct 2019 09:40:06 +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 0BA3C83559; Tue, 22 Oct 2019 09:40:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9LIJYUA000544 for ; Mon, 21 Oct 2019 14:19:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id F056313ACE; Mon, 21 Oct 2019 18:19:34 +0000 (UTC) Received: from mx1.redhat.com (ext-mx02.extmail.prod.ext.phx2.redhat.com [10.5.110.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DAD0E5DD79 for ; Mon, 21 Oct 2019 18:19:27 +0000 (UTC) Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 327D48665D for ; Mon, 21 Oct 2019 18:19:26 +0000 (UTC) Received: by mail-qk1-f175.google.com with SMTP id e66so13549081qkf.13 for ; Mon, 21 Oct 2019 11:19:26 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:7979:d16f:4e5e:8e8d:1141]) by smtp.gmail.com with ESMTPSA id d205sm9248741qke.96.2019.10.21.11.19.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 11:19:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571737213; 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=bSEJFhWsPrmkvgoPH55xllD3MKA2jPp3ufqdA8PuH/s=; b=fp7z0dq+JQXkQafKloVKX9WuMnkrRp6IsweBDItD+tGU+tXDybe/J+wf6EGIEq4+5tX5YC GdbUqob2VlO/rr0OSwz2lA4nb0xZq2J2B/9a85ZDupxb5xcCcxBhbQCz1qJw3r9AuYZvfq QJRok2cL2eigekV67GW0RpUVutSXbKU= 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=hZPJLGavrZI8mKJN7/Sjr/vIvI0YouNIVnWrFBwBFvQ=; b=RTnctN4LvQDAu55Pw9WYuB3l4iGnfvHU3DGpFx3nr9tQpMk9Md115SY/Lm/kwjlZxh HYExrYOz0BasckAe6KOLA6P8Bv7f9S1Zm1y9Tyy6CzzncQ0riUtuqpDkTLlICylQWEJa aQYl2eYpybwCji72pI5djIEBYXwGxJupnc35DEZyZHNM6AGQZe13/AkYYty5HnerjUQd xeDO3yc0jFvK+255T/gbZszX0oDQ2jsNTi4ZJMS7x1UVc6t5wPHIALWwTZtj9WbBsq49 8z3NmaPW9WNsrgpUOZONorHQLZs/9EHB/VnqfTWhjRmJx5bwbf59NCenL9Mzl/xy2CLJ u/ww== X-Gm-Message-State: APjAAAUVMtNs48oQhODgApqbjIoxfxHNoLb/P8KPiEDWihqo7nUMbdci n7sQnmNE3bfgy/Ra2lY869hRwqxE X-Google-Smtp-Source: APXvYqzdKQehNgi9G6Ke3hT5HbqKJEA3v5zxkcvsAajYXNH813exXbwpqBJ86DSwXV3lcsqwgZsRIA== X-Received: by 2002:ae9:f44d:: with SMTP id z13mr23511797qkl.90.1571681965061; Mon, 21 Oct 2019 11:19:25 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 15:18:52 -0300 Message-Id: <20191021181911.14986-3-danielhb413@gmail.com> In-Reply-To: <20191021181911.14986-1-danielhb413@gmail.com> References: <20191021181911.14986-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 21 Oct 2019 18:19:26 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 21 Oct 2019 18:19:26 +0000 (UTC) for IP:'209.85.222.175' DOMAIN:'mail-qk1-f175.google.com' HELO:'mail-qk1-f175.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.15 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS) 209.85.222.175 mail-qk1-f175.google.com 209.85.222.175 mail-qk1-f175.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.26 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 02/21] storage: 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.12 X-MC-Unique: maRfFs03MQGyxn_cpQBmXg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza Reviewed-by: J=C3=A1n Tomko --- src/storage/storage_backend_fs.c | 13 +++---- src/storage/storage_backend_rbd.c | 58 ++++++++++--------------------- src/storage/storage_backend_zfs.c | 21 ++++------- src/storage/storage_driver.c | 38 +++++++------------- src/storage/storage_util.c | 18 ++++------ 5 files changed, 50 insertions(+), 98 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend= _fs.c index 02b824867a..2b180c3b31 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -58,36 +58,33 @@ virStorageBackendFileSystemNetFindPoolSourcesFunc(char = **const groups, virNetfsDiscoverState *state =3D data; const char *name, *path; virStoragePoolSource *src =3D NULL; - int ret =3D -1; =20 path =3D groups[0]; =20 if (!(name =3D strrchr(path, '/'))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("invalid netfs path (no /): %s"), path); - goto cleanup; + return -1; } name +=3D 1; if (*name =3D=3D '\0') { virReportError(VIR_ERR_INTERNAL_ERROR, _("invalid netfs path (ends in /): %s"), path); - goto cleanup; + return -1; } =20 if (!(src =3D virStoragePoolSourceListNewSource(&state->list))) - goto cleanup; + return -1; =20 if (VIR_ALLOC_N(src->hosts, 1) < 0) - goto cleanup; + return -1; src->nhost =3D 1; =20 src->hosts[0].name =3D g_strdup(state->host); src->dir =3D g_strdup(path); src->format =3D VIR_STORAGE_POOL_NETFS_NFS; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backen= d_rbd.c index 1c59c18b0d..7341a40f6c 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -411,17 +411,15 @@ volStorageBackendRBDGetFeatures(rbd_image_t image, const char *volname, uint64_t *features) { - int r, ret =3D -1; + int r; =20 if ((r =3D rbd_get_features(image, features)) < 0) { virReportSystemError(-r, _("failed to get the features of RBD imag= e " "%s"), volname); - goto cleanup; + return -1; } - ret =3D 0; =20 - cleanup: - return ret; + return 0; } =20 #if LIBRBD_VERSION_CODE > 265 @@ -467,7 +465,7 @@ virStorageBackendRBDSetAllocation(virStorageVolDefPtr v= ol, rbd_image_t *image, rbd_image_info_t *info) { - int r, ret =3D -1; + int r; size_t allocation =3D 0; =20 if ((r =3D rbd_diff_iterate2(image, NULL, 0, info->size, 0, 1, @@ -475,17 +473,15 @@ virStorageBackendRBDSetAllocation(virStorageVolDefPtr= vol, &allocation)) < 0) { virReportSystemError(-r, _("failed to iterate RBD image '%s'"), vol->name); - goto cleanup; + return -1; } =20 VIR_DEBUG("Found %zu bytes allocated for RBD image %s", allocation, vol->name); =20 vol->target.allocation =3D allocation; - ret =3D 0; =20 - cleanup: - return ret; + return 0; } =20 #else @@ -971,14 +967,13 @@ virStorageBackendRBDImageInfo(rbd_image_t image, uint64_t *stripe_unit, uint64_t *stripe_count) { - int ret =3D -1; int r =3D 0; uint8_t oldformat; =20 if ((r =3D rbd_get_old_format(image, &oldformat)) < 0) { virReportSystemError(-r, _("failed to get the format of RBD image = %s"), volname); - goto cleanup; + return -1; } =20 if (oldformat !=3D 0) { @@ -986,28 +981,25 @@ virStorageBackendRBDImageInfo(rbd_image_t image, _("RBD image %s is old format. Does not support " "extended features and striping"), volname); - goto cleanup; + return -1; } =20 if (volStorageBackendRBDGetFeatures(image, volname, features) < 0) - goto cleanup; + return -1; =20 if ((r =3D rbd_get_stripe_unit(image, stripe_unit)) < 0) { virReportSystemError(-r, _("failed to get the stripe unit of RBD i= mage %s"), volname); - goto cleanup; + return -1; } =20 if ((r =3D rbd_get_stripe_count(image, stripe_count)) < 0) { virReportSystemError(-r, _("failed to get the stripe count of RBD = image %s"), volname); - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 /* Callback function for rbd_diff_iterate() */ @@ -1122,7 +1114,6 @@ virStorageBackendRBDSnapshotCreate(rbd_image_t image, char *imgname, char *snapname) { - int ret =3D -1; int r =3D -1; =20 VIR_DEBUG("Creating RBD snapshot %s@%s", imgname, snapname); @@ -1130,13 +1121,10 @@ virStorageBackendRBDSnapshotCreate(rbd_image_t imag= e, if ((r =3D rbd_snap_create(image, snapname)) < 0) { virReportSystemError(-r, _("failed to create RBD snapshot %s@%s"), imgname, snapname); - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 static int @@ -1145,7 +1133,6 @@ virStorageBackendRBDSnapshotProtect(rbd_image_t image, char *snapname) { int r =3D -1; - int ret =3D -1; int protected; =20 VIR_DEBUG("Querying if RBD snapshot %s@%s is protected", imgname, snap= name); @@ -1153,7 +1140,7 @@ virStorageBackendRBDSnapshotProtect(rbd_image_t image, if ((r =3D rbd_snap_is_protected(image, snapname, &protected)) < 0) { virReportSystemError(-r, _("failed to verify if RBD snapshot %s@%s= " "is protected"), imgname, snapname); - goto cleanup; + return -1; } =20 if (protected =3D=3D 0) { @@ -1163,16 +1150,13 @@ virStorageBackendRBDSnapshotProtect(rbd_image_t ima= ge, if ((r =3D rbd_snap_protect(image, snapname)) < 0) { virReportSystemError(-r, _("failed to protect RBD snapshot %s@= %s"), imgname, snapname); - goto cleanup; + return -1; } } else { VIR_DEBUG("RBD Snapshot %s@%s is already protected", imgname, snap= name); } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 static int @@ -1392,7 +1376,6 @@ virStorageBackendRBDVolWipeDiscard(rbd_image_t image, uint64_t stripe_count) { int r =3D -1; - int ret =3D -1; unsigned long long offset =3D 0; unsigned long long length; =20 @@ -1405,7 +1388,7 @@ virStorageBackendRBDVolWipeDiscard(rbd_image_t image, virReportSystemError(-r, _("discarding %llu bytes failed on " "RBD image %s at offset %llu"), length, imgname, offset); - goto cleanup; + return -1; } =20 VIR_DEBUG("Discarded %llu bytes of RBD image %s at offset %llu", @@ -1414,10 +1397,7 @@ virStorageBackendRBDVolWipeDiscard(rbd_image_t image, offset +=3D length; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 static int diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backen= d_zfs.c index c3057fede6..448616abe5 100644 --- a/src/storage/storage_backend_zfs.c +++ b/src/storage/storage_backend_zfs.c @@ -68,16 +68,13 @@ virStorageBackendZFSVolModeNeeded(void) if ((ret < 0) || (exit_code !=3D 2)) { VIR_WARN("Command 'zfs get' either failed " "to run or exited with unexpected status"); - goto cleanup; + return ret; } =20 if (strstr(error, " volmode ")) - ret =3D 1; + return 1; else - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 static int @@ -294,7 +291,6 @@ virStorageBackendZFSCreateVol(virStoragePoolObjPtr pool, virStorageVolDefPtr vol) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); - int ret =3D -1; int volmode_needed =3D -1; g_autoptr(virCommand) cmd =3D NULL; =20 @@ -316,7 +312,7 @@ virStorageBackendZFSCreateVol(virStoragePoolObjPtr pool, =20 volmode_needed =3D virStorageBackendZFSVolModeNeeded(); if (volmode_needed < 0) - goto cleanup; + return -1; /** * $ zfs create -o volmode=3Ddev -V 10240K test/volname * $ zfs create -o volmode=3Ddev -s -V 10240K test/volname @@ -347,15 +343,12 @@ virStorageBackendZFSCreateVol(virStoragePoolObjPtr po= ol, virCommandAddArgFormat(cmd, "%s/%s", def->source.name, vol->name); =20 if (virCommandRun(cmd, NULL) < 0) - goto cleanup; + return -1; =20 if (virStorageBackendZFSFindVols(pool, vol) < 0) - goto cleanup; - - ret =3D 0; - cleanup: - return ret; + return -1; =20 + return 0; } =20 static int diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 3b8332af01..6b18ca71d0 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -625,7 +625,6 @@ storageConnectFindStoragePoolSources(virConnectPtr conn, { int backend_type; virStorageBackendPtr backend; - char *ret =3D NULL; =20 if (virConnectFindStoragePoolSourcesEnsureACL(conn) < 0) return NULL; @@ -634,24 +633,21 @@ storageConnectFindStoragePoolSources(virConnectPtr co= nn, if (backend_type < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unknown storage pool type %s"), type); - goto cleanup; + return NULL; } =20 backend =3D virStorageBackendForType(backend_type); if (backend =3D=3D NULL) - goto cleanup; + return NULL; =20 if (!backend->findPoolSources) { virReportError(VIR_ERR_NO_SUPPORT, _("pool type '%s' does not support source " "discovery"), type); - goto cleanup; + return NULL; } =20 - ret =3D backend->findPoolSources(srcSpec, flags); - - cleanup: - return ret; + return backend->findPoolSources(srcSpec, flags); } =20 =20 @@ -1775,25 +1771,22 @@ storageVolDeleteInternal(virStorageBackendPtr backe= nd, bool updateMeta) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(obj); - int ret =3D -1; =20 if (!backend->deleteVol) { virReportError(VIR_ERR_NO_SUPPORT, "%s", _("storage pool does not support vol deletion= ")); =20 - goto cleanup; + return -1; } =20 if (backend->deleteVol(obj, voldef, flags) < 0) - goto cleanup; + return -1; =20 /* The disk backend updated the pool data including removing the * voldef from the pool (for both the deleteVol and the createVol * failure path. */ - if (def->type =3D=3D VIR_STORAGE_POOL_DISK) { - ret =3D 0; - goto cleanup; - } + if (def->type =3D=3D VIR_STORAGE_POOL_DISK) + return 0; =20 /* Update pool metadata - don't update meta data from error paths * in this module since the allocation/available weren't adjusted yet. @@ -1805,10 +1798,8 @@ storageVolDeleteInternal(virStorageBackendPtr backen= d, } =20 virStoragePoolObjRemoveVol(obj, voldef); - ret =3D 0; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -2802,20 +2793,15 @@ static int storageConnectStoragePoolEventDeregisterAny(virConnectPtr conn, int callbackID) { - int ret =3D -1; - if (virConnectStoragePoolEventDeregisterAnyEnsureACL(conn) < 0) - goto cleanup; + return -1; =20 if (virObjectEventStateDeregisterID(conn, driver->storageEventState, callbackID, true) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 7b934b61e0..0cbdfcefd7 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -336,7 +336,7 @@ createRawFile(int fd, virStorageVolDefPtr vol, virReportSystemError(errno, _("cannot extend file '%s'"), vol->target.path); - goto cleanup; + return ret; } =20 /* Avoid issues with older kernel's namespace pollution. */ @@ -356,7 +356,7 @@ createRawFile(int fd, virStorageVolDefPtr vol, virReportSystemError(errno, _("cannot allocate %llu bytes in file '%s= '"), vol->target.allocation, vol->target.path); - goto cleanup; + return ret; } } #endif @@ -368,7 +368,7 @@ createRawFile(int fd, virStorageVolDefPtr vol, * been able to allocate the required space. */ if ((ret =3D virStorageBackendCopyToFD(vol, inputvol, fd, &remain, !need_alloc, reflink_copy)) <= 0) - goto cleanup; + return ret; =20 /* If the new allocation is greater than the original capacity, * but fallocate failed, fill the rest with zeroes. @@ -381,7 +381,7 @@ createRawFile(int fd, virStorageVolDefPtr vol, ret =3D -errno; virReportSystemError(errno, _("cannot fill file '%s'"), vol->target.path); - goto cleanup; + return ret; } } =20 @@ -389,10 +389,9 @@ createRawFile(int fd, virStorageVolDefPtr vol, ret =3D -errno; virReportSystemError(errno, _("cannot sync data to file '%s'"), vol->target.path); - goto cleanup; + return ret; } =20 - cleanup: return ret; } =20 @@ -3784,7 +3783,6 @@ getOldStyleBlockDevice(const char *lun_path G_GNUC_UN= USED, char **block_device) { char *blockp =3D NULL; - int retval =3D -1; =20 /* old-style; just parse out the sd */ if (!(blockp =3D strrchr(block_name, ':'))) { @@ -3792,7 +3790,7 @@ getOldStyleBlockDevice(const char *lun_path G_GNUC_UN= USED, virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to parse block name %s"), block_name); - goto cleanup; + return -1; } else { blockp++; *block_device =3D g_strdup(blockp); @@ -3800,9 +3798,7 @@ getOldStyleBlockDevice(const char *lun_path G_GNUC_UN= USED, VIR_DEBUG("Block device is '%s'", *block_device); } =20 - retval =3D 0; - cleanup: - return retval; + return 0; } =20 =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 9 02:14:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1571737053; cv=none; d=zoho.com; s=zohoarc; b=BSlQ8cnvZepy55wOVncnWd6eVlg5AhnvjrpyLd3lZ6Hxm5k3RHe01OzmkiPCShzpa2oyisX5R/AnbIKwJAQJmbsOGpMeTlw8Yz8kfUL+IUYwFEKE0wFledh45tVusuXuIf3VHJ8dYL/jIaCkiJxCH+hp9frpaEoVAjLU7Qn9cdg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571737053; 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=p3mQLv8EzRxp5JRvsKn5CLb4KtaQhrPhoCtHsr4r/hY=; b=JsHwMg5p7IEgvygkwFA+qObNBC2RACkbGcXtLgZigcs4BtIM3TsC0fQhN1dCeWpPuSSUCu2Bg3d10igaWbG6SaB4pMWbM6QzMHh1CAPMy/8qiQx3QxDidgkw2keFb+r44Jes2r/y9GT6PNVC5OEiZRTCMf7dDTKBZ/K49QbBKdg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.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 1571737053158638.3295035677684; Tue, 22 Oct 2019 02:37:33 -0700 (PDT) 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-34-LeVMlHBANyOoJXBaxLj7fg-1; Tue, 22 Oct 2019 05:37:30 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D199E801E5C; Tue, 22 Oct 2019 09:37:25 +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 A78A01001B35; Tue, 22 Oct 2019 09:37: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 69FF71A50A; Tue, 22 Oct 2019 09:37:25 +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 x9LIJoog000679 for ; Mon, 21 Oct 2019 14:19:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id D0B738E7E2; Mon, 21 Oct 2019 18:19:50 +0000 (UTC) Received: from mx1.redhat.com (ext-mx18.extmail.prod.ext.phx2.redhat.com [10.5.110.47]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CA0ED605AD for ; Mon, 21 Oct 2019 18:19:29 +0000 (UTC) Received: from mail-qt1-f181.google.com (mail-qt1-f181.google.com [209.85.160.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ED2F1300CB0E for ; Mon, 21 Oct 2019 18:19:27 +0000 (UTC) Received: by mail-qt1-f181.google.com with SMTP id o49so14637000qta.7 for ; Mon, 21 Oct 2019 11:19:27 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:7979:d16f:4e5e:8e8d:1141]) by smtp.gmail.com with ESMTPSA id d205sm9248741qke.96.2019.10.21.11.19.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 11:19:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571737052; 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=p3mQLv8EzRxp5JRvsKn5CLb4KtaQhrPhoCtHsr4r/hY=; b=Tm5sDVRjzbBOjIT2ch0lUGtpEZzMkA75knbxJOjKkedJ2KmVJwqzXAiIlnNgOOE4ElSubL 6gN4orzuzXic+/8Y7OywgWc81y7vAy9Ta9Frlw7VcShps6YK0hyuSuC2In+4870rJWl1yB +3ote/sWYYOibvGGdGHFcHiAyMpEkec= 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=as2lkIrp1EJ8HfC5+amk1N13PGBltmb+cptnUSCpAEg=; b=XEzhNfl+hllas/Semxl83veW3TPNAGsNTVHw9srzv7qwWzwr8YLH4JV/LJu+mPle8X vXIh6aJjcIuEHqI9s/8R/jle/m3rdHhUdDldFqht/Ke36JcoXg2JDcPa3jwgmhbL0w7o vaWTfb15V/h2nWh9if46Mkhf77rl2/Rah22z7iGZZZmnt/Rw3gOn2J4cNTeYgAiWwQWL dtiSAc3+MyGUV3qy84jslrpaJEzp97tblqZLw1U5LA/neZ4apsgMlVoVWDbgZkXl5Ibh LSEW1LNTExM7trt0fvilQXcXN9cfNN8EaMI3Hs4JPMB4GPqvYKQkhYL+pabpBvxXwvf3 txEA== X-Gm-Message-State: APjAAAVlNtXssb9G2scKe5YPrx/YGAHiDfTN4B5nB6C3YoN7D+BEKkKX P8URiN/mI50ytNFqZMzDjig1x4czoDA= X-Google-Smtp-Source: APXvYqz2HuG+l8LhbwHp0rsR4W0qcDJAMzZ7IJOEOTuDv1tEEQhQQTTpU9GgsegFJBr7y92j08EiJg== X-Received: by 2002:ac8:7a97:: with SMTP id x23mr16198560qtr.38.1571681966646; Mon, 21 Oct 2019 11:19:26 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 15:18:53 -0300 Message-Id: <20191021181911.14986-4-danielhb413@gmail.com> In-Reply-To: <20191021181911.14986-1-danielhb413@gmail.com> References: <20191021181911.14986-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Mon, 21 Oct 2019 18:19:28 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Mon, 21 Oct 2019 18:19:28 +0000 (UTC) for IP:'209.85.160.181' DOMAIN:'mail-qt1-f181.google.com' HELO:'mail-qt1-f181.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.131 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS) 209.85.160.181 mail-qt1-f181.google.com 209.85.160.181 mail-qt1-f181.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.47 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 03/21] nwfilter: 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.84 on 10.5.11.22 X-MC-Unique: LeVMlHBANyOoJXBaxLj7fg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza Reviewed-by: J=C3=A1n Tomko --- src/nwfilter/nwfilter_ebiptables_driver.c | 132 +++++++++------------- 1 file changed, 56 insertions(+), 76 deletions(-) diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfil= ter_ebiptables_driver.c index 50db150151..70743983ef 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -367,13 +367,12 @@ ebtablesHandleEthHdr(virFirewallPtr fw, { char macaddr[VIR_MAC_STRING_BUFLEN]; char macmask[VIR_MAC_STRING_BUFLEN]; - int ret =3D -1; =20 if (HAS_ENTRY_ITEM(ðHdr->dataSrcMACAddr)) { if (printDataType(vars, macaddr, sizeof(macaddr), ðHdr->dataSrcMACAddr) < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgList(fw, fwrule, reverse ? "-d" : "-s", @@ -385,7 +384,7 @@ ebtablesHandleEthHdr(virFirewallPtr fw, if (printDataType(vars, macmask, sizeof(macmask), ðHdr->dataSrcMACMask) < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgFormat(fw, fwrule, "%s/%s", macaddr, macmask); @@ -398,7 +397,7 @@ ebtablesHandleEthHdr(virFirewallPtr fw, if (printDataType(vars, macaddr, sizeof(macaddr), ðHdr->dataDstMACAddr) < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgList(fw, fwrule, reverse ? "-s" : "-d", @@ -410,7 +409,7 @@ ebtablesHandleEthHdr(virFirewallPtr fw, if (printDataType(vars, macmask, sizeof(macmask), ðHdr->dataDstMACMask) < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgFormat(fw, fwrule, "%s/%s", macaddr, macmask); @@ -419,9 +418,7 @@ ebtablesHandleEthHdr(virFirewallPtr fw, } } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -789,7 +786,6 @@ iptablesHandleSrcMacAddr(virFirewallPtr fw, bool *srcmacskipped) { char macaddr[VIR_MAC_STRING_BUFLEN]; - int ret =3D -1; =20 *srcmacskipped =3D false; =20 @@ -802,7 +798,7 @@ iptablesHandleSrcMacAddr(virFirewallPtr fw, if (printDataType(vars, macaddr, sizeof(macaddr), srcMacAddr) < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgList(fw, fwrule, "-m", "mac", @@ -815,9 +811,7 @@ iptablesHandleSrcMacAddr(virFirewallPtr fw, NULL); } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -837,7 +831,6 @@ iptablesHandleIPHdr(virFirewallPtr fw, const char *dst =3D "--destination"; const char *srcrange =3D "--src-range"; const char *dstrange =3D "--dst-range"; - int ret =3D -1; =20 if (directionIn) { src =3D "--destination"; @@ -850,7 +843,7 @@ iptablesHandleIPHdr(virFirewallPtr fw, if (printDataType(vars, ipaddr, sizeof(ipaddr), &ipHdr->dataSrcIPAddr) < 0) - goto cleanup; + return -1; =20 if (ENTRY_WANT_NEG_SIGN(&ipHdr->dataSrcIPAddr)) virFirewallRuleAddArg(fw, fwrule, "!"); @@ -861,7 +854,7 @@ iptablesHandleIPHdr(virFirewallPtr fw, if (printDataType(vars, number, sizeof(number), &ipHdr->dataSrcIPMask) < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgFormat(fw, fwrule, "%s/%s", ipaddr, number); @@ -872,7 +865,7 @@ iptablesHandleIPHdr(virFirewallPtr fw, if (printDataType(vars, ipaddr, sizeof(ipaddr), &ipHdr->dataSrcIPFrom) < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgList(fw, fwrule, "-m", "iprange", @@ -886,7 +879,7 @@ iptablesHandleIPHdr(virFirewallPtr fw, if (printDataType(vars, ipaddralt, sizeof(ipaddralt), &ipHdr->dataSrcIPTo) < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgFormat(fw, fwrule, "%s-%s", ipaddr, ipaddralt); @@ -899,7 +892,7 @@ iptablesHandleIPHdr(virFirewallPtr fw, if (printDataType(vars, ipaddr, sizeof(ipaddr), &ipHdr->dataDstIPAddr) < 0) - goto cleanup; + return -1; =20 if (ENTRY_WANT_NEG_SIGN(&ipHdr->dataDstIPAddr)) virFirewallRuleAddArg(fw, fwrule, "!"); @@ -909,7 +902,7 @@ iptablesHandleIPHdr(virFirewallPtr fw, if (printDataType(vars, number, sizeof(number), &ipHdr->dataDstIPMask) < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgFormat(fw, fwrule, "%s/%s", ipaddr, number); @@ -920,7 +913,7 @@ iptablesHandleIPHdr(virFirewallPtr fw, if (printDataType(vars, ipaddr, sizeof(ipaddr), &ipHdr->dataDstIPFrom) < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgList(fw, fwrule, "-m", "iprange", @@ -933,7 +926,7 @@ iptablesHandleIPHdr(virFirewallPtr fw, if (printDataType(vars, ipaddralt, sizeof(ipaddralt), &ipHdr->dataDstIPTo) < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgFormat(fw, fwrule, "%s-%s", ipaddr, ipaddralt); @@ -946,7 +939,7 @@ iptablesHandleIPHdr(virFirewallPtr fw, if (printDataType(vars, number, sizeof(number), &ipHdr->dataDSCP) < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgList(fw, fwrule, "-m", "dscp", @@ -967,9 +960,7 @@ iptablesHandleIPHdr(virFirewallPtr fw, } } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -983,7 +974,6 @@ iptablesHandleIPHdrAfterStateMatch(virFirewallPtr fw, char number[MAX(INT_BUFSIZE_BOUND(uint32_t), INT_BUFSIZE_BOUND(int))]; char str[MAX_IPSET_NAME_LENGTH]; - int ret =3D -1; =20 if (HAS_ENTRY_ITEM(&ipHdr->dataIPSet) && HAS_ENTRY_ITEM(&ipHdr->dataIPSetFlags)) { @@ -991,7 +981,7 @@ iptablesHandleIPHdrAfterStateMatch(virFirewallPtr fw, if (printDataType(vars, str, sizeof(str), &ipHdr->dataIPSet) < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgList(fw, fwrule, "-m", "set", @@ -1001,7 +991,7 @@ iptablesHandleIPHdrAfterStateMatch(virFirewallPtr fw, if (printDataTypeDirection(vars, str, sizeof(str), &ipHdr->dataIPSetFlags, directionIn) < = 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArg(fw, fwrule, str); } @@ -1011,7 +1001,7 @@ iptablesHandleIPHdrAfterStateMatch(virFirewallPtr fw, if (printDataType(vars, number, sizeof(number), &ipHdr->dataConnlimitAbove) < 0) - goto cleanup; + return -1; =20 /* place connlimit after potential -m state --state ... since this is the most useful order */ @@ -1035,9 +1025,7 @@ iptablesHandleIPHdrAfterStateMatch(virFirewallPtr fw, NULL); } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -1181,7 +1169,6 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, bool hasICMPType =3D false; virFirewallRulePtr fwrule; size_t fwruleargs; - int ret =3D -1; =20 PRINT_IPT_ROOT_CHAIN(chain, chainPrefix, ifname); =20 @@ -1200,14 +1187,14 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &rule->p.tcpHdrFilter.dataSrcMACAddr, directionIn, &srcMacSkipped) < 0) - goto cleanup; + return -1; =20 if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.tcpHdrFilter.ipHdr, directionIn, &skipRule, &skipMatch) < 0) - goto cleanup; + return -1; =20 if (HAS_ENTRY_ITEM(&rule->p.tcpHdrFilter.dataTCPFlags)) { char *flags; @@ -1216,11 +1203,11 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, virFirewallRuleAddArg(fw, fwrule, "--tcp-flags"); =20 if (!(flags =3D virNWFilterPrintTCPFlags(rule->p.tcpHdrFilter.= dataTCPFlags.u.tcpFlags.mask))) - goto cleanup; + return -1; virFirewallRuleAddArg(fw, fwrule, flags); VIR_FREE(flags); if (!(flags =3D virNWFilterPrintTCPFlags(rule->p.tcpHdrFilter.= dataTCPFlags.u.tcpFlags.flags))) - goto cleanup; + return -1; virFirewallRuleAddArg(fw, fwrule, flags); VIR_FREE(flags); } @@ -1229,13 +1216,13 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, vars, &rule->p.tcpHdrFilter.portData, directionIn) < 0) - goto cleanup; + return -1; =20 if (HAS_ENTRY_ITEM(&rule->p.tcpHdrFilter.dataTCPOption)) { if (printDataType(vars, number, sizeof(number), &rule->p.tcpHdrFilter.dataTCPOption) < 0) - goto cleanup; + return -1; =20 if (ENTRY_WANT_NEG_SIGN(&rule->p.tcpHdrFilter.dataTCPOption)) virFirewallRuleAddArg(fw, fwrule, "!"); @@ -1259,20 +1246,20 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &rule->p.udpHdrFilter.dataSrcMACAddr, directionIn, &srcMacSkipped) < 0) - goto cleanup; + return -1; =20 if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.udpHdrFilter.ipHdr, directionIn, &skipRule, &skipMatch) < 0) - goto cleanup; + return -1; =20 if (iptablesHandlePortData(fw, fwrule, vars, &rule->p.udpHdrFilter.portData, directionIn) < 0) - goto cleanup; + return -1; break; =20 case VIR_NWFILTER_RULE_PROTOCOL_UDPLITE: @@ -1289,14 +1276,14 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &rule->p.udpliteHdrFilter.dataSrcMACA= ddr, directionIn, &srcMacSkipped) < 0) - goto cleanup; + return -1; =20 if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.udpliteHdrFilter.ipHdr, directionIn, &skipRule, &skipMatch) < 0) - goto cleanup; + return -1; =20 break; =20 @@ -1314,14 +1301,14 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &rule->p.espHdrFilter.dataSrcMACAddr, directionIn, &srcMacSkipped) < 0) - goto cleanup; + return -1; =20 if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.espHdrFilter.ipHdr, directionIn, &skipRule, &skipMatch) < 0) - goto cleanup; + return -1; =20 break; =20 @@ -1339,14 +1326,14 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &rule->p.ahHdrFilter.dataSrcMACAddr, directionIn, &srcMacSkipped) < 0) - goto cleanup; + return -1; =20 if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.ahHdrFilter.ipHdr, directionIn, &skipRule, &skipMatch) < 0) - goto cleanup; + return -1; =20 break; =20 @@ -1364,20 +1351,20 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &rule->p.sctpHdrFilter.dataSrcMACAddr, directionIn, &srcMacSkipped) < 0) - goto cleanup; + return -1; =20 if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.sctpHdrFilter.ipHdr, directionIn, &skipRule, &skipMatch) < 0) - goto cleanup; + return -1; =20 if (iptablesHandlePortData(fw, fwrule, vars, &rule->p.sctpHdrFilter.portData, directionIn) < 0) - goto cleanup; + return -1; break; =20 case VIR_NWFILTER_RULE_PROTOCOL_ICMP: @@ -1400,14 +1387,14 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &rule->p.icmpHdrFilter.dataSrcMACAddr, directionIn, &srcMacSkipped) < 0) - goto cleanup; + return -1; =20 if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.icmpHdrFilter.ipHdr, directionIn, &skipRule, &skipMatch) < 0) - goto cleanup; + return -1; =20 if (HAS_ENTRY_ITEM(&rule->p.icmpHdrFilter.dataICMPType)) { const char *parm; @@ -1416,8 +1403,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, =20 if (maySkipICMP) { virFirewallRemoveRule(fw, fwrule); - ret =3D 0; - goto cleanup; + return 0; } =20 if (rule->prtclType =3D=3D VIR_NWFILTER_RULE_PROTOCOL_ICMP) @@ -1428,7 +1414,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, if (printDataType(vars, number, sizeof(number), &rule->p.icmpHdrFilter.dataICMPType) < 0) - goto cleanup; + return -1; =20 if (ENTRY_WANT_NEG_SIGN(&rule->p.icmpHdrFilter.dataICMPType)) virFirewallRuleAddArg(fw, fwrule, "!"); @@ -1438,7 +1424,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, if (printDataType(vars, numberalt, sizeof(numberalt), &rule->p.icmpHdrFilter.dataICMPCode) < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgFormat(fw, fwrule, "%s/%s", number, numberalt); @@ -1461,14 +1447,14 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &rule->p.igmpHdrFilter.dataSrcMACAddr, directionIn, &srcMacSkipped) < 0) - goto cleanup; + return -1; =20 if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.igmpHdrFilter.ipHdr, directionIn, &skipRule, &skipMatch) < 0) - goto cleanup; + return -1; =20 break; =20 @@ -1486,14 +1472,14 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, &rule->p.allHdrFilter.dataSrcMACAddr, directionIn, &srcMacSkipped) < 0) - goto cleanup; + return -1; =20 if (iptablesHandleIPHdr(fw, fwrule, vars, &rule->p.allHdrFilter.ipHdr, directionIn, &skipRule, &skipMatch) < 0) - goto cleanup; + return -1; =20 break; =20 @@ -1501,7 +1487,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected protocol %d"), rule->prtclType); - goto cleanup; + return -1; } =20 if ((srcMacSkipped && @@ -1540,14 +1526,12 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, vars, &rule->p.allHdrFilter.ipHdr, directionIn) < 0) - goto cleanup; + return -1; =20 virFirewallRuleAddArgList(fw, fwrule, "-j", target, NULL); =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -2483,8 +2467,6 @@ ebiptablesCreateRuleInstance(virFirewallPtr fw, const char *ifname, virNWFilterVarCombIterPtr vars) { - int ret =3D -1; - if (virNWFilterRuleIsProtocolEthernet(rule)) { if (rule->tt =3D=3D VIR_NWFILTER_RULE_DIRECTION_OUT || rule->tt =3D=3D VIR_NWFILTER_RULE_DIRECTION_INOUT) { @@ -2495,7 +2477,7 @@ ebiptablesCreateRuleInstance(virFirewallPtr fw, ifname, vars, rule->tt =3D=3D VIR_NWFILTER_RU= LE_DIRECTION_INOUT) < 0) - goto cleanup; + return -1; } =20 if (rule->tt =3D=3D VIR_NWFILTER_RULE_DIRECTION_IN || @@ -2507,7 +2489,7 @@ ebiptablesCreateRuleInstance(virFirewallPtr fw, ifname, vars, false) < 0) - goto cleanup; + return -1; } } else { virFirewallLayer layer; @@ -2518,7 +2500,7 @@ ebiptablesCreateRuleInstance(virFirewallPtr fw, } else { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("unexpected protocol type")); - goto cleanup; + return -1; } =20 if (iptablesCreateRuleInstance(fw, @@ -2526,12 +2508,10 @@ ebiptablesCreateRuleInstance(virFirewallPtr fw, rule, ifname, vars) < 0) - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 9 02:14:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 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=1571737208; cv=none; d=zoho.com; s=zohoarc; b=g4Jw77FCpBs1SDK0CNxl5KVZozdH30Oc09oTTlG6ZAcosnCC+UQs7pLDo0GFEmtHCMSqg98sTAf7UjTnEnZM7RvwiobN4vHvmgM7HybM41BOKsJcJikVcQr2fNOc1Kg/mK+T8ci5UDHQ7DqDh4tJJI1FdvhrhMk5Nnhf5KRI0IQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571737208; 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=Y3aGvWr+A/Mtd31HGT0H3gszqwJ+24e4m0as7IPhlxE=; b=Ao5XVJ3uhPPSF9dLPt/TJECRVW6Q726ATWMmGeTGLAsx+NSz47FZS72WTq8Kv/yy12tJsoiUpyY1irI4M7khe/bVFdezfbSekmp4M5v8SRpKLnJWRcbbg/EaXQcH3srUkQLLcDAfrEbf+VzHE6s0yCZuKdf3yWGC+TxCs+ACS68= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571737208706273.14164358795756; Tue, 22 Oct 2019 02:40:08 -0700 (PDT) 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-162-37icQlULMhqfS6ypLisv9Q-1; Tue, 22 Oct 2019 05:40:06 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2D70E107AD34; Tue, 22 Oct 2019 09:40:01 +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 EFF7E5C3FD; Tue, 22 Oct 2019 09:40:00 +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 B299E8354D; Tue, 22 Oct 2019 09:40:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9LIJY8q000543 for ; Mon, 21 Oct 2019 14:19:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id EC3EF5DE5C; Mon, 21 Oct 2019 18:19:34 +0000 (UTC) Received: from mx1.redhat.com (ext-mx30.extmail.prod.ext.phx2.redhat.com [10.5.110.71]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DB78D5DE5B for ; Mon, 21 Oct 2019 18:19:30 +0000 (UTC) Received: from mail-qt1-f172.google.com (mail-qt1-f172.google.com [209.85.160.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7ACDF2B91 for ; Mon, 21 Oct 2019 18:19:29 +0000 (UTC) Received: by mail-qt1-f172.google.com with SMTP id o49so14637136qta.7 for ; Mon, 21 Oct 2019 11:19:29 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:7979:d16f:4e5e:8e8d:1141]) by smtp.gmail.com with ESMTPSA id d205sm9248741qke.96.2019.10.21.11.19.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 11:19:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571737207; 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=Y3aGvWr+A/Mtd31HGT0H3gszqwJ+24e4m0as7IPhlxE=; b=KRVKMbm2oBiGL6V3eQMm7uHccX1JbWTRo6/1bjgSYpaInToOzVWIQjF7+8t+xAVbijdEP7 eMuBAoUApY6voIfWtbMuQCSZHFx1nkKBRJA/r7lU8yP/syr6Ud8tG7ANwC1bcYuoZbc3No YAq4inS49Scjz5EXPU/Yfo/vnOkPG2I= 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=FAN8U7JVe8RpxFhSWkACnAn/pKCa4NG9CNREweSE/5k=; b=j8hQwUYBD+f9MRuEg8bCCdblmdfh1716qZgPiKhD2bbTDAkhGrW8/2i9vmC7Ug9CNr NOuI8Ki6Tq93C+PwNnYdfJ8yYMKvSLYcwx7NOdw1llylG2HwLJifgo9h8uP6dBUxyBxp 7kRuCz/Wac4WE4/8lNTnPj1HyPGvRUaAPs9r2uK0v7SRm1uUJFxRtIl1p6Yfc/uz8QT2 cEEsleefMbodKaGHpLYAXgbvI06Q2GvScJ1bU3qNJiDhmbXxtP0Cb75MIZDDvoHfrzMS 5jDrnGpc+39bjSgfjEi7GmIphdFWfH5C7lXcF0zAD9tAViRaZVw17fu5+cgt0ntAHM8B TIxg== X-Gm-Message-State: APjAAAVJq8mlnF1CiQcEW6sxJsTr/8lyIazdfOiLcz6PymUjpPoln8JS YJvKZLM0A9FiECe4uJvdT5MUWg6iB6Y= X-Google-Smtp-Source: APXvYqzZSqK/KufdE5GjQKSEep0O+eH+tBBz06jTvA0JqtJtanqd7aA0GOjo/JhsyMQkV5fNU0BPAA== X-Received: by 2002:ac8:730c:: with SMTP id x12mr14095822qto.193.1571681968275; Mon, 21 Oct 2019 11:19:28 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 15:18:54 -0300 Message-Id: <20191021181911.14986-5-danielhb413@gmail.com> In-Reply-To: <20191021181911.14986-1-danielhb413@gmail.com> References: <20191021181911.14986-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.71]); Mon, 21 Oct 2019 18:19:29 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.71]); Mon, 21 Oct 2019 18:19:29 +0000 (UTC) for IP:'209.85.160.172' DOMAIN:'mail-qt1-f172.google.com' HELO:'mail-qt1-f172.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.15 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS) 209.85.160.172 mail-qt1-f172.google.com 209.85.160.172 mail-qt1-f172.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.71 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 04/21] remote: 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.16 X-MC-Unique: 37icQlULMhqfS6ypLisv9Q-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza Reviewed-by: J=C3=A1n Tomko --- src/remote/remote_daemon.c | 38 +++++++++++++++++--------------------- src/remote/remote_driver.c | 15 +++++---------- 2 files changed, 22 insertions(+), 31 deletions(-) diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 7e63e18034..346415e96b 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -399,7 +399,6 @@ daemonSetupNetworking(virNetServerPtr srv, int unix_sock_ro_mask =3D 0; int unix_sock_rw_mask =3D 0; int unix_sock_adm_mask =3D 0; - int ret =3D -1; g_autoptr(virSystemdActivation) act =3D NULL; virSystemdActivationMap actmap[] =3D { { .name =3D DAEMON_NAME ".socket", .family =3D AF_UNIX, .path =3D = sock_path }, @@ -453,22 +452,22 @@ daemonSetupNetworking(virNetServerPtr srv, =20 if (config->unix_sock_group) { if (virGetGroupID(config->unix_sock_group, &unix_sock_gid) < 0) - return ret; + return -1; } =20 if (virStrToLong_i(config->unix_sock_ro_perms, NULL, 8, &unix_sock_ro_= mask) !=3D 0) { VIR_ERROR(_("Failed to parse mode '%s'"), config->unix_sock_ro_per= ms); - goto cleanup; + return -1; } =20 if (virStrToLong_i(config->unix_sock_admin_perms, NULL, 8, &unix_sock_= adm_mask) !=3D 0) { VIR_ERROR(_("Failed to parse mode '%s'"), config->unix_sock_admin_= perms); - goto cleanup; + return -1; } =20 if (virStrToLong_i(config->unix_sock_rw_perms, NULL, 8, &unix_sock_rw_= mask) !=3D 0) { VIR_ERROR(_("Failed to parse mode '%s'"), config->unix_sock_rw_per= ms); - goto cleanup; + return -1; } =20 if (virNetServerAddServiceUNIX(srv, @@ -482,7 +481,7 @@ daemonSetupNetworking(virNetServerPtr srv, false, config->max_queued_clients, config->max_client_requests) < 0) - goto cleanup; + return -1; if (sock_path_ro && virNetServerAddServiceUNIX(srv, act, @@ -495,7 +494,7 @@ daemonSetupNetworking(virNetServerPtr srv, true, config->max_queued_clients, config->max_client_requests) < 0) - goto cleanup; + return -1; =20 if (sock_path_adm && virNetServerAddServiceUNIX(srvAdm, @@ -509,7 +508,7 @@ daemonSetupNetworking(virNetServerPtr srv, false, config->admin_max_queued_clients, config->admin_max_client_requests) < 0) - goto cleanup; + return -1; =20 #ifdef WITH_IP if (((ipsock && config->listen_tcp) || act) && @@ -524,7 +523,7 @@ daemonSetupNetworking(virNetServerPtr srv, false, config->max_queued_clients, config->max_client_requests) < 0) - goto cleanup; + return -1; =20 if (((ipsock && config->listen_tls) || (act && virSystemdActivationHas= Name(act, DAEMON_NAME "-tls.socket")))) { virNetTLSContextPtr ctxt =3D NULL; @@ -535,17 +534,17 @@ daemonSetupNetworking(virNetServerPtr srv, if (!config->ca_file) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("No CA certificate path set to match serv= er key/cert")); - goto cleanup; + return -1; } if (!config->cert_file) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("No server certificate path set to match = server key")); - goto cleanup; + return -1; } if (!config->key_file) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("No server key path set to match server c= ert")); - goto cleanup; + return -1; } VIR_DEBUG("Using CA=3D'%s' cert=3D'%s' key=3D'%s'", config->ca_file, config->cert_file, config->key_file= ); @@ -557,7 +556,7 @@ daemonSetupNetworking(virNetServerPtr srv, config->tls_priority, config->tls_no_sanity_c= ertificate ? false : true, config->tls_no_verify_c= ertificate ? false : true))) - goto cleanup; + return -1; } else { if (!(ctxt =3D virNetTLSContextNewServerPath(NULL, !privileged, @@ -565,7 +564,7 @@ daemonSetupNetworking(virNetServerPtr srv, config->tls_priorit= y, config->tls_no_sani= ty_certificate ? false : true, config->tls_no_veri= fy_certificate ? false : true))) - goto cleanup; + return -1; } =20 VIR_DEBUG("Registering TLS socket %s:%s", @@ -582,7 +581,7 @@ daemonSetupNetworking(virNetServerPtr srv, config->max_queued_clients, config->max_client_requests) < 0) { virObjectUnref(ctxt); - goto cleanup; + return -1; } virObjectUnref(ctxt); } @@ -590,19 +589,16 @@ daemonSetupNetworking(virNetServerPtr srv, =20 if (act && virSystemdActivationComplete(act) < 0) - goto cleanup; + return -1; =20 #if WITH_SASL if (virNetServerNeedsAuth(srv, REMOTE_AUTH_SASL) && !(saslCtxt =3D virNetSASLContextNewServer( (const char *const*)config->sasl_allowed_username_list))) - goto cleanup; + return -1; #endif =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 83477243fc..67ae0fe286 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -4182,20 +4182,18 @@ static int remoteAuthInteract(virConnectPtr conn, struct remoteAuthInteractState *state, virConnectAuthPtr auth) { - int ret =3D -1; - VIR_DEBUG("Starting SASL interaction"); remoteAuthInteractStateClear(state, false); =20 /* Fills state->interact with any values from the auth config file */ if (remoteAuthFillFromConfig(conn, state) < 0) - goto cleanup; + return -1; =20 /* Populates state->cred for anything not found in the auth config */ if (remoteAuthMakeCredentials(state->interact, &state->cred, &state->n= cred) < 0) { virReportError(VIR_ERR_AUTH_FAILED, "%s", _("Failed to make auth credentials")); - goto cleanup; + return -1; } =20 /* If there was anything not in the auth config, we need to @@ -4206,13 +4204,13 @@ static int remoteAuthInteract(virConnectPtr conn, if (!auth || !auth->cb) { virReportError(VIR_ERR_AUTH_FAILED, "%s", _("No authentication callback available")); - goto cleanup; + return -1; } =20 if ((*(auth->cb))(state->cred, state->ncred, auth->cbdata) < 0) { virReportError(VIR_ERR_AUTH_FAILED, "%s", _("Failed to collect auth credentials")); - goto cleanup; + return -1; } =20 /* Copy user's responses from cred into interact */ @@ -4227,10 +4225,7 @@ static int remoteAuthInteract(virConnectPtr conn, * of this method, rather than the end. */ =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 9 02:14:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 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=1571737218; cv=none; d=zoho.com; s=zohoarc; b=OhZ1WBe1zzzgI3mLIXg+GnvV7FNUVj9gyOSl0OV3vtR6nr8k9feO54Tdpf6DsqjJo00mf3QjE20lFQ7L0xawaknQWaXpzQ+2riY4lBQgPdAmX9yuZwHV2QkwX1PqGSCFOYrgxF3mk+NwonPqbkIquDnNTQIjcIKdjgOQ/a1sE1g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571737218; 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=H5ou6TS2I8chIgfVXkl5hj7bDwCduFZ0Y8q0au0UQ3g=; b=cFUnUmSR7rWnucezgNUAdmcxtRmXinX1+oPSnpZDami3YdVHWyEWs/pY52yRK/hPbzw+EbCGRZO8YBt6vEWXsk8EU6ujyQxMUPdg0ukGB0stZ8WDvthi1vLNRA8wY5s/vSVSdxT/lzwh5Wknf9yVnhzZazE5lF6xCbj4sVhjDNc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 15717372187101023.3058074476985; Tue, 22 Oct 2019 02:40:18 -0700 (PDT) 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-351-rzAoRwCqMVm876PxBzg2_w-1; Tue, 22 Oct 2019 05:40:15 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4F5E3107AD37; Tue, 22 Oct 2019 09:40:11 +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 183023DB4; Tue, 22 Oct 2019 09:40:11 +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 C3883181A72D; Tue, 22 Oct 2019 09:40:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9LIJgf9000600 for ; Mon, 21 Oct 2019 14:19:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6248E6CE50; Mon, 21 Oct 2019 18:19:42 +0000 (UTC) Received: from mx1.redhat.com (ext-mx17.extmail.prod.ext.phx2.redhat.com [10.5.110.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4D93B5E9C3 for ; Mon, 21 Oct 2019 18:19:32 +0000 (UTC) Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F03513082E1E for ; Mon, 21 Oct 2019 18:19:30 +0000 (UTC) Received: by mail-qt1-f193.google.com with SMTP id o49so14637282qta.7 for ; Mon, 21 Oct 2019 11:19:30 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:7979:d16f:4e5e:8e8d:1141]) by smtp.gmail.com with ESMTPSA id d205sm9248741qke.96.2019.10.21.11.19.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 11:19:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571737217; 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=H5ou6TS2I8chIgfVXkl5hj7bDwCduFZ0Y8q0au0UQ3g=; b=QuUkj9L7kHLNSHT8sfq9/YeDJnQSeftiiHnEO7QdR4cThR6Nfy8y1D52RlNWxy78R9xP0i BTN2b4vJOY3mTY0bbL+iIujJ0o6NuIToJ4BwrDHI53WkOzuFXMudTA1MItw5xxbgIk7uWh klJNU+kNX0UCv6zvwTa9ohRhuvnOVUE= 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=74tkpwucs9Yh6eL9v/iqq5aoMyH4kYiMGQzhxgxVJ5Y=; b=PIhlmKRuXn9O9dzcAUKm4N976NxPUrZSYG9HlPBj98ytOB4HOwYaluUsnDI7anskMD IxGcPXgMLYMocU/cLJ0sn0fqWkI2qJ6+j2s8mA8ZqP9Xz5T3VM4ZMNBL1bcfAz4kN9Ko Biwo5y3WXNERmHapgDnZFikv0XeodTNiw1NQSVqUuMLvnsU5qv1kdNoOmSpO4syC+yME N+CoHdKZhYUNG7hOvye9uAfQPCaz20pkbIpajMJZyRGONrjroTWmn3QyLVwkhgYnL0Dd ndj2qMQiuDHG3C/AgO5Wj+6NsThZJSQVz7qQhhy/6Ob9QxuChFgEmtlk8IUEAsAx1Y5v dRiA== X-Gm-Message-State: APjAAAVDoovJsRqaehZjl3ji/IJhLzOJ2CZjmOiOc6GTH5jhDd+Wtk9s 50rmqWPwfGUS0v8JFhgy9z6fvD5NqhE= X-Google-Smtp-Source: APXvYqwCfIi5dvlaIKAMFSAEXei0fQWs98sqtbsXYq7qXLTTPLVxrzoZea4HEfvcZEbF4zqtU8kczw== X-Received: by 2002:aed:2371:: with SMTP id i46mr25903990qtc.72.1571681969702; Mon, 21 Oct 2019 11:19:29 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 15:18:55 -0300 Message-Id: <20191021181911.14986-6-danielhb413@gmail.com> In-Reply-To: <20191021181911.14986-1-danielhb413@gmail.com> References: <20191021181911.14986-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Mon, 21 Oct 2019 18:19:31 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Mon, 21 Oct 2019 18:19:31 +0000 (UTC) for IP:'209.85.160.193' DOMAIN:'mail-qt1-f193.google.com' HELO:'mail-qt1-f193.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.131 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS) 209.85.160.193 mail-qt1-f193.google.com 209.85.160.193 mail-qt1-f193.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.46 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 05/21] lxc: 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.84 on 10.5.11.23 X-MC-Unique: rzAoRwCqMVm876PxBzg2_w-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza Reviewed-by: J=C3=A1n Tomko --- src/lxc/lxc_cgroup.c | 70 ++++++++++++++++------------------------ src/lxc/lxc_container.c | 17 ++++------ src/lxc/lxc_controller.c | 44 +++++++++++-------------- src/lxc/lxc_driver.c | 39 +++++++++------------- src/lxc/lxc_process.c | 34 ++++++++----------- 5 files changed, 81 insertions(+), 123 deletions(-) diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index 5efb495b56..549595f538 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -38,29 +38,25 @@ VIR_LOG_INIT("lxc.lxc_cgroup"); static int virLXCCgroupSetupCpuTune(virDomainDefPtr def, virCgroupPtr cgroup) { - int ret =3D -1; - if (def->cputune.sharesSpecified) { unsigned long long val; if (virCgroupSetCpuShares(cgroup, def->cputune.shares) < 0) - goto cleanup; + return -1; =20 if (virCgroupGetCpuShares(cgroup, &val) < 0) - goto cleanup; + return -1; def->cputune.shares =3D val; } =20 if (def->cputune.quota !=3D 0 && virCgroupSetCpuCfsQuota(cgroup, def->cputune.quota) < 0) - goto cleanup; + return -1; =20 if (def->cputune.period !=3D 0 && virCgroupSetCpuCfsPeriod(cgroup, def->cputune.period) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -160,26 +156,22 @@ static int virLXCCgroupSetupBlkioTune(virDomainDefPtr= def, static int virLXCCgroupSetupMemTune(virDomainDefPtr def, virCgroupPtr cgroup) { - int ret =3D -1; - if (virCgroupSetMemory(cgroup, virDomainDefGetMemoryInitial(def)) < 0) - goto cleanup; + return -1; =20 if (virMemoryLimitIsSet(def->mem.hard_limit)) if (virCgroupSetMemoryHardLimit(cgroup, def->mem.hard_limit) < 0) - goto cleanup; + return -1; =20 if (virMemoryLimitIsSet(def->mem.soft_limit)) if (virCgroupSetMemorySoftLimit(cgroup, def->mem.soft_limit) < 0) - goto cleanup; + return -1; =20 if (virMemoryLimitIsSet(def->mem.swap_hard_limit)) if (virCgroupSetMemSwapHardLimit(cgroup, def->mem.swap_hard_limit)= < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -307,7 +299,6 @@ static int virLXCCgroupSetupDeviceACL(virDomainDefPtr d= ef, virCgroupPtr cgroup) { int capMknod =3D def->caps_features[VIR_DOMAIN_CAPS_FEATURE_MKNOD]; - int ret =3D -1; size_t i; static virLXCCgroupDevicePolicy devices[] =3D { {'c', LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_NULL}, @@ -321,13 +312,13 @@ static int virLXCCgroupSetupDeviceACL(virDomainDefPtr= def, {0, 0, 0}}; =20 if (virCgroupDenyAllDevices(cgroup) < 0) - goto cleanup; + return -1; =20 /* white list mknod if CAP_MKNOD has to be kept */ if (capMknod =3D=3D VIR_TRISTATE_SWITCH_ON) { if (virCgroupAllowAllDevices(cgroup, VIR_CGROUP_DEVICE_MKNOD) < 0) - goto cleanup; + return -1; } =20 for (i =3D 0; devices[i].type !=3D 0; i++) { @@ -337,7 +328,7 @@ static int virLXCCgroupSetupDeviceACL(virDomainDefPtr d= ef, dev->major, dev->minor, VIR_CGROUP_DEVICE_RWM) < 0) - goto cleanup; + return -1; } =20 VIR_DEBUG("Allowing any disk block devs"); @@ -352,7 +343,7 @@ static int virLXCCgroupSetupDeviceACL(virDomainDefPtr d= ef, VIR_CGROUP_DEVICE_READ : VIR_CGROUP_DEVICE_RW) | VIR_CGROUP_DEVICE_MKNOD, false) < 0) - goto cleanup; + return -1; } =20 VIR_DEBUG("Allowing any filesystem block devs"); @@ -365,7 +356,7 @@ static int virLXCCgroupSetupDeviceACL(virDomainDefPtr d= ef, def->fss[i]->readonly ? VIR_CGROUP_DEVICE_READ : VIR_CGROUP_DEVICE_RW, false) < 0) - goto cleanup; + return -1; } =20 VIR_DEBUG("Allowing any hostdev block devs"); @@ -383,12 +374,12 @@ static int virLXCCgroupSetupDeviceACL(virDomainDefPtr= def, =20 if ((usb =3D virUSBDeviceNew(usbsrc->bus, usbsrc->device, NULL)) =3D=3D NULL) - goto cleanup; + return -1; =20 if (virUSBDeviceFileIterate(usb, virLXCSetupHostUSBDeviceCgrou= p, cgroup) < 0) { virUSBDeviceFree(usb); - goto cleanup; + return -1; } virUSBDeviceFree(usb); break; @@ -399,14 +390,14 @@ static int virLXCCgroupSetupDeviceACL(virDomainDefPtr= def, hostdev->source.caps.u.storag= e.block, VIR_CGROUP_DEVICE_RW | VIR_CGROUP_DEVICE_MKNOD, fals= e) < 0) - goto cleanup; + return -1; break; case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_MISC: if (virCgroupAllowDevicePath(cgroup, hostdev->source.caps.u.misc.c= hardev, VIR_CGROUP_DEVICE_RW | VIR_CGROUP_DEVICE_MKNOD, fals= e) < 0) - goto cleanup; + return -1; break; default: break; @@ -418,13 +409,11 @@ static int virLXCCgroupSetupDeviceACL(virDomainDefPtr= def, =20 if (virCgroupAllowDevice(cgroup, 'c', LXC_DEV_MAJ_PTY, -1, VIR_CGROUP_DEVICE_RWM) < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("Device whitelist complete"); =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -482,25 +471,20 @@ int virLXCCgroupSetup(virDomainDefPtr def, virCgroupPtr cgroup, virBitmapPtr nodemask) { - int ret =3D -1; - if (virLXCCgroupSetupCpuTune(def, cgroup) < 0) - goto cleanup; + return -1; =20 if (virLXCCgroupSetupCpusetTune(def, cgroup, nodemask) < 0) - goto cleanup; + return -1; =20 if (virLXCCgroupSetupBlkioTune(def, cgroup) < 0) - goto cleanup; + return -1; =20 if (virLXCCgroupSetupMemTune(def, cgroup) < 0) - goto cleanup; + return -1; =20 if (virLXCCgroupSetupDeviceACL(def, cgroup) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 88dc2e2bdf..61b4622d7b 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -488,7 +488,6 @@ lxcContainerRenameAndEnableInterfaces(virDomainDefPtr v= mDef, size_t nveths, char **veths) { - int ret =3D -1; size_t i; const char *newname; virDomainNetDefPtr netDef; @@ -497,18 +496,18 @@ lxcContainerRenameAndEnableInterfaces(virDomainDefPtr= vmDef, =20 for (i =3D 0; i < nveths; i++) { if (!(netDef =3D lxcContainerGetNetDef(vmDef, veths[i]))) - goto cleanup; + return -1; =20 newname =3D netDef->ifname_guest; if (!newname) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing device name for container-side veth"= )); - goto cleanup; + return -1; } =20 VIR_DEBUG("Renaming %s to %s", veths[i], newname); if (virNetDevSetName(veths[i], newname) < 0) - goto cleanup; + return -1; =20 /* Only enable this device if there is a reason to do so (either * at least one IP was specified, or link state was set to up in @@ -518,22 +517,20 @@ lxcContainerRenameAndEnableInterfaces(virDomainDefPtr= vmDef, netDef->linkstate =3D=3D VIR_DOMAIN_NET_INTERFACE_LINK_STATE_U= P) { VIR_DEBUG("Enabling %s", newname); if (virNetDevSetOnline(newname, true) < 0) - goto cleanup; + return -1; } =20 /* set IP addresses and routes */ if (virNetDevIPInfoAddToDev(newname, &netDef->guestIP) < 0) - goto cleanup; + return -1; } =20 /* enable lo device only if there were other net devices */ if ((veths || privNet) && virNetDevSetOnline("lo", true) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 0c5b9e713d..dda7b375cb 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -358,7 +358,6 @@ static int virLXCControllerValidateNICs(virLXCControlle= rPtr ctrl) static int virLXCControllerGetNICIndexes(virLXCControllerPtr ctrl) { size_t i; - int ret =3D -1; =20 /* Gather the ifindexes of the "parent" veths for all interfaces * implemented with a veth pair. These will be used when calling @@ -383,11 +382,11 @@ static int virLXCControllerGetNICIndexes(virLXCContro= llerPtr ctrl) continue; if (virNetDevGetIndex(ctrl->def->nets[i]->ifname, &nicindex) < 0) - goto cleanup; + return -1; if (VIR_EXPAND_N(ctrl->nicindexes, ctrl->nnicindexes, 1) < 0) - goto cleanup; + return -1; VIR_DEBUG("Index %d for %s", nicindex, ctrl->def->nets[i]->ifname); ctrl->nicindexes[ctrl->nnicindexes-1] =3D nicindex; @@ -407,17 +406,15 @@ static int virLXCControllerGetNICIndexes(virLXCContro= llerPtr ctrl) virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported net type %s"), virDomainNetTypeToString(actualType)); - goto cleanup; + return -1; case VIR_DOMAIN_NET_TYPE_LAST: default: virReportEnumRangeError(virDomainNetType, actualType); - goto cleanup; + return -1; } } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -605,7 +602,6 @@ static int virLXCControllerAppendNBDPids(virLXCControll= erPtr ctrl, static int virLXCControllerSetupLoopDevices(virLXCControllerPtr ctrl) { size_t i; - int ret =3D -1; =20 VIR_DEBUG("Setting up loop devices for filesystems"); =20 @@ -630,33 +626,33 @@ static int virLXCControllerSetupLoopDevices(virLXCCon= trollerPtr ctrl) virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("fs format %s is not supported"), virStorageFileFormatTypeToString(fs->format= )); - goto cleanup; + return -1; } =20 fd =3D virLXCControllerSetupLoopDeviceFS(fs); if (fd < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("Saving loop fd %d", fd); if (VIR_EXPAND_N(ctrl->loopDevFds, ctrl->nloopDevs, 1) < 0) { VIR_FORCE_CLOSE(fd); - goto cleanup; + return -1; } ctrl->loopDevFds[ctrl->nloopDevs - 1] =3D fd; } else if (fs->fsdriver =3D=3D VIR_DOMAIN_FS_DRIVER_TYPE_NBD) { if (virLXCControllerSetupNBDDeviceFS(fs) < 0) - goto cleanup; + return -1; =20 /* The NBD device will be cleaned up while the cgroup will end. * For this we need to remember the qemu-nbd pid and add it to * the cgroup*/ if (virLXCControllerAppendNBDPids(ctrl, fs->src->path) < 0) - goto cleanup; + return -1; } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("fs driver %s is not supported"), virDomainFSDriverTypeToString(fs->fsdriver)); - goto cleanup; + return -1; } } =20 @@ -684,7 +680,7 @@ static int virLXCControllerSetupLoopDevices(virLXCContr= ollerPtr ctrl) virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("disk format %s is not supported"), virStorageFileFormatTypeToString(format)); - goto cleanup; + return -1; } =20 /* We treat 'none' as meaning 'raw' since we @@ -693,12 +689,12 @@ static int virLXCControllerSetupLoopDevices(virLXCCon= trollerPtr ctrl) */ fd =3D virLXCControllerSetupLoopDeviceDisk(disk); if (fd < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("Saving loop fd %d", fd); if (VIR_EXPAND_N(ctrl->loopDevFds, ctrl->nloopDevs, 1) < 0) { VIR_FORCE_CLOSE(fd); - goto cleanup; + return -1; } ctrl->loopDevFds[ctrl->nloopDevs - 1] =3D fd; } else if (!driver || STREQ(driver, "nbd")) { @@ -707,29 +703,27 @@ static int virLXCControllerSetupLoopDevices(virLXCCon= trollerPtr ctrl) virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Disk cache mode %s is not supported"), virDomainDiskCacheTypeToString(disk->cachem= ode)); - goto cleanup; + return -1; } if (virLXCControllerSetupNBDDeviceDisk(disk) < 0) - goto cleanup; + return -1; =20 /* The NBD device will be cleaned up while the cgroup will end. * For this we need to remember the qemu-nbd pid and add it to * the cgroup*/ if (virLXCControllerAppendNBDPids(ctrl, virDomainDiskGetSource= (disk)) < 0) - goto cleanup; + return -1; } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("disk driver %s is not supported"), driver); - goto cleanup; + return -1; } } =20 VIR_DEBUG("Setup all loop devices"); - ret =3D 0; =20 - cleanup: - return ret; + return 0; } =20 =20 diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 41a6a446bd..5caef1a472 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3440,7 +3440,7 @@ lxcDomainAttachDeviceConfig(virDomainDefPtr vmdef, case VIR_DOMAIN_DEVICE_NET: net =3D dev->data.net; if (virDomainNetInsert(vmdef, net) < 0) - goto cleanup; + return ret; dev->data.net =3D NULL; ret =3D 0; break; @@ -3464,7 +3464,6 @@ lxcDomainAttachDeviceConfig(virDomainDefPtr vmdef, break; } =20 - cleanup: return ret; } =20 @@ -3482,7 +3481,7 @@ lxcDomainUpdateDeviceConfig(virDomainDefPtr vmdef, case VIR_DOMAIN_DEVICE_NET: net =3D dev->data.net; if ((idx =3D virDomainNetFindIdx(vmdef, net)) < 0) - goto cleanup; + return -1; =20 oldDev.data.net =3D vmdef->nets[idx]; if (virDomainDefCompatibleDevice(vmdef, dev, &oldDev, @@ -3505,7 +3504,6 @@ lxcDomainUpdateDeviceConfig(virDomainDefPtr vmdef, break; } =20 - cleanup: return ret; } =20 @@ -3535,7 +3533,7 @@ lxcDomainDetachDeviceConfig(virDomainDefPtr vmdef, case VIR_DOMAIN_DEVICE_NET: net =3D dev->data.net; if ((idx =3D virDomainNetFindIdx(vmdef, net)) < 0) - goto cleanup; + return ret; =20 /* this is guaranteed to succeed */ virDomainNetDefFree(virDomainNetRemove(vmdef, idx)); @@ -3561,7 +3559,6 @@ lxcDomainDetachDeviceConfig(virDomainDefPtr vmdef, break; } =20 - cleanup: return ret; } =20 @@ -4499,12 +4496,12 @@ lxcDomainDetachDeviceHostdevStorageLive(virDomainOb= jPtr vm, { virLXCDomainObjPrivatePtr priv =3D vm->privateData; virDomainHostdevDefPtr def =3D NULL; - int idx, ret =3D -1; + int idx; =20 if (!priv->initpid) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Cannot attach disk until init PID is known")); - goto cleanup; + return -1; } =20 if ((idx =3D virDomainHostdevFind(vm->def, @@ -4513,18 +4510,18 @@ lxcDomainDetachDeviceHostdevStorageLive(virDomainOb= jPtr vm, virReportError(VIR_ERR_OPERATION_FAILED, _("hostdev %s not found"), dev->data.hostdev->source.caps.u.storage.block); - goto cleanup; + return -1; } =20 if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICE= S)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("devices cgroup isn't mounted")); - goto cleanup; + return -1; } =20 if (lxcDomainAttachDeviceUnlink(vm, def->source.caps.u.storage.block) = < 0) { virDomainAuditHostdev(vm, def, "detach", false); - goto cleanup; + return -1; } virDomainAuditHostdev(vm, def, "detach", true); =20 @@ -4536,10 +4533,7 @@ lxcDomainDetachDeviceHostdevStorageLive(virDomainObj= Ptr vm, virDomainHostdevRemove(vm->def, idx); virDomainHostdevDefFree(def); =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -4549,12 +4543,12 @@ lxcDomainDetachDeviceHostdevMiscLive(virDomainObjPt= r vm, { virLXCDomainObjPrivatePtr priv =3D vm->privateData; virDomainHostdevDefPtr def =3D NULL; - int idx, ret =3D -1; + int idx; =20 if (!priv->initpid) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Cannot attach disk until init PID is known")); - goto cleanup; + return -1; } =20 if ((idx =3D virDomainHostdevFind(vm->def, @@ -4563,18 +4557,18 @@ lxcDomainDetachDeviceHostdevMiscLive(virDomainObjPt= r vm, virReportError(VIR_ERR_OPERATION_FAILED, _("hostdev %s not found"), dev->data.hostdev->source.caps.u.misc.chardev); - goto cleanup; + return -1; } =20 if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICE= S)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("devices cgroup isn't mounted")); - goto cleanup; + return -1; } =20 if (lxcDomainAttachDeviceUnlink(vm, def->source.caps.u.misc.chardev) <= 0) { virDomainAuditHostdev(vm, def, "detach", false); - goto cleanup; + return -1; } virDomainAuditHostdev(vm, def, "detach", true); =20 @@ -4586,10 +4580,7 @@ lxcDomainDetachDeviceHostdevMiscLive(virDomainObjPtr= vm, virDomainHostdevRemove(vm->def, idx); virDomainHostdevDefFree(def); =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 450053d163..9549b70372 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -281,7 +281,6 @@ virLXCProcessSetupInterfaceTap(virDomainDefPtr vm, virDomainNetDefPtr net, const char *brname) { - char *ret =3D NULL; char *parentVeth; char *containerVeth =3D NULL; virNetDevVPortProfilePtr vport =3D virDomainNetGetActualVirtPortProfil= e(net); @@ -289,45 +288,42 @@ virLXCProcessSetupInterfaceTap(virDomainDefPtr vm, VIR_DEBUG("calling vethCreate()"); parentVeth =3D net->ifname; if (virNetDevVethCreate(&parentVeth, &containerVeth) < 0) - goto cleanup; + return NULL; VIR_DEBUG("parentVeth: %s, containerVeth: %s", parentVeth, containerVe= th); =20 if (net->ifname =3D=3D NULL) net->ifname =3D parentVeth; =20 if (virNetDevSetMAC(containerVeth, &net->mac) < 0) - goto cleanup; + return NULL; =20 if (brname) { if (vport && vport->virtPortType =3D=3D VIR_NETDEV_VPORT_PROFILE_O= PENVSWITCH) { if (virNetDevOpenvswitchAddPort(brname, parentVeth, &net->mac,= vm->uuid, vport, virDomainNetGetActualVl= an(net)) < 0) - goto cleanup; + return NULL; } else { if (virNetDevBridgeAddPort(brname, parentVeth) < 0) - goto cleanup; + return NULL; } } =20 if (virNetDevSetOnline(parentVeth, true) < 0) - goto cleanup; + return NULL; =20 if (virDomainNetGetActualType(net) =3D=3D VIR_DOMAIN_NET_TYPE_ETHERNET= ) { /* Set IP info for the host side, but only if the type is * 'ethernet'. */ if (virNetDevIPInfoAddToDev(parentVeth, &net->hostIP) < 0) - goto cleanup; + return NULL; } =20 if (net->filter && virDomainConfNWFilterInstantiate(vm->name, vm->uuid, net, false) <= 0) - goto cleanup; - - ret =3D containerVeth; + return NULL; =20 - cleanup: - return ret; + return containerVeth; } =20 =20 @@ -1044,7 +1040,6 @@ virLXCProcessReadLogOutputData(virDomainObjPtr vm, { int retries =3D 10; int got =3D 0; - int ret =3D -1; char *filter_next =3D buf; =20 buf[0] =3D '\0'; @@ -1064,7 +1059,7 @@ virLXCProcessReadLogOutputData(virDomainObjPtr vm, if (bytes < 0) { virReportSystemError(errno, "%s", _("Failure while reading log output")); - goto cleanup; + return -1; } =20 got +=3D bytes; @@ -1086,13 +1081,11 @@ virLXCProcessReadLogOutputData(virDomainObjPtr vm, virReportError(VIR_ERR_INTERNAL_ERROR, _("Out of space while reading log output: %s"), buf); - goto cleanup; + return -1; } =20 - if (isdead) { - ret =3D got; - goto cleanup; - } + if (isdead) + return got; =20 g_usleep(100*1000); retries--; @@ -1102,8 +1095,7 @@ virLXCProcessReadLogOutputData(virDomainObjPtr vm, _("Timed out while reading log output: %s"), buf); =20 - cleanup: - return ret; + return -1; } =20 =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 9 02:14:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 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=1571737179; cv=none; d=zoho.com; s=zohoarc; b=OhIwkGVUftZbPawwkRsLXn5mAfkToeALN2WTlaFbtqx2Dy0F6IfdHbxEpP4QUHzHBb0SA/Ui0E+P+kdZK0T2HbeI/wfQX6/Xy+Tg3zUDduLkrJXSG5zbYQMvUGHyVcP4ffvdAdLvUqErFnRn7zBQRWCUBxG86Q5OLWAychFH7Zs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571737179; 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=2gfrf2iJfSu4LdTN96fHg5czNpqljbkPIwQds3y6dbA=; b=juq+63H7xQqtBbGDSJ7jOu7IILgcf7syHJPYSJH4UTvh3xu8Yxz6dj278FT/+j7fPQIJfP3kVBWXe20zWdWqpLAED3pTEZzdZoqJfmqlm9ZOokz+NEp9wSnmDUJ28WWI0Pt7pnIMiGaOWnkMrelUkRvsxliWezn9YhJ+tydSEq8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571737179813162.1355042280236; Tue, 22 Oct 2019 02:39:39 -0700 (PDT) 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-222-RPp0Ux_PNF6FeanbmpjxlA-1; Tue, 22 Oct 2019 05:39:36 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 36CCA107AD34; Tue, 22 Oct 2019 09:39:31 +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 06EA05D6A9; Tue, 22 Oct 2019 09:39:31 +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 B9EB018198EE; Tue, 22 Oct 2019 09:39:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9LIJemO000587 for ; Mon, 21 Oct 2019 14:19:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id AFCCD614CB; Mon, 21 Oct 2019 18:19:40 +0000 (UTC) Received: from mx1.redhat.com (ext-mx19.extmail.prod.ext.phx2.redhat.com [10.5.110.48]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9E79360623 for ; Mon, 21 Oct 2019 18:19:33 +0000 (UTC) Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 60FAA307D871 for ; Mon, 21 Oct 2019 18:19:32 +0000 (UTC) Received: by mail-qk1-f180.google.com with SMTP id a194so9488052qkg.10 for ; Mon, 21 Oct 2019 11:19:32 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:7979:d16f:4e5e:8e8d:1141]) by smtp.gmail.com with ESMTPSA id d205sm9248741qke.96.2019.10.21.11.19.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 11:19:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571737177; 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=2gfrf2iJfSu4LdTN96fHg5czNpqljbkPIwQds3y6dbA=; b=PYt33UyE6At5+q0GYWs373ExtuYaf0VTeeTbZo10pQuGJK4sSn9AF/pa0iluB4AaVBPp/y 1adt3U2Po9zivJ2RxGnzkWGUA58TPYzc67PGq7q7QtUu7p1Heomv3d4Akp0dBc7st5hBEn V+bAKDDqx1i9rlrAYhfufJj3I1ekgi0= 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=Xrgc/gh55gvcXDPpQIejtPlcTdi9RGshJVH4cevu1vk=; b=S/OJzvTH+aUcMIq7CRCGlzizYjE9Sl82XlFknTnUEQeRjy0qyfnv5ziP1s1W8ug3Cl OcQJo+0JmU3jPGA/qOwD9kiUkhcPkqyJYdNBHCcLLxwkrDAYqj2xLvb7v6YymtVV9lWK nEHMBY6Xneqaa5OT9z1weRAm5SlT9Rnx3jdyTpyWfofDAeoSmsV/9xmczof02KU4GR+t Gi+zweQS3xgx/OsNk0TJ9rIcNl9iYEbPysfSeyR3/ubZRiy7qZYgXVdK6GOHuyIiEX8X mJMI5xAe2H156G3q3Hl3fPfo0HJBBEW10TDqkH9lKWBBYfVtWN+vgpH0VXK50rjqVYRz Fkjw== X-Gm-Message-State: APjAAAXqYKVOxw20sSG1Ua84GouCGdKzQJyweLw8zyladJhuYPMpStpy 3nCwxOrL9wIxg3DffVKmFIF5oCY9hjE= X-Google-Smtp-Source: APXvYqxRfg+GXNPOly1jIuydQkIyNDCrQjwTs/9hVvKe/GVNW/PUdJsymAt52Edb0p928EEsFbn8AA== X-Received: by 2002:a37:a1c7:: with SMTP id k190mr24733649qke.167.1571681971491; Mon, 21 Oct 2019 11:19:31 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 15:18:56 -0300 Message-Id: <20191021181911.14986-7-danielhb413@gmail.com> In-Reply-To: <20191021181911.14986-1-danielhb413@gmail.com> References: <20191021181911.14986-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Mon, 21 Oct 2019 18:19:32 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Mon, 21 Oct 2019 18:19:32 +0000 (UTC) for IP:'209.85.222.180' DOMAIN:'mail-qk1-f180.google.com' HELO:'mail-qk1-f180.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.15 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS) 209.85.222.180 mail-qk1-f180.google.com 209.85.222.180 mail-qk1-f180.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.48 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 06/21] node_device: 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.15 X-MC-Unique: RPp0Ux_PNF6FeanbmpjxlA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza Reviewed-by: J=C3=A1n Tomko --- src/node_device/node_device_driver.c | 11 +++-------- src/node_device/node_device_udev.c | 8 ++------ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_de= vice_driver.c index 7ef55f45e9..38a4da0b9b 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -588,20 +588,15 @@ int nodeConnectNodeDeviceEventDeregisterAny(virConnectPtr conn, int callbackID) { - int ret =3D -1; - if (virConnectNodeDeviceEventDeregisterAnyEnsureACL(conn) < 0) - goto cleanup; + return -1; =20 if (virObjectEventStateDeregisterID(conn, driver->nodeDeviceEventState, callbackID, true) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 int diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_devi= ce_udev.c index 525e71f80c..0ebf4bebeb 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1264,7 +1264,6 @@ udevSetParent(struct udev_device *device, const char *parent_sysfs_path =3D NULL; virNodeDeviceObjPtr obj =3D NULL; virNodeDeviceDefPtr objdef; - int ret =3D -1; =20 parent_device =3D device; do { @@ -1278,7 +1277,7 @@ udevSetParent(struct udev_device *device, virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not get syspath for parent of '%s'"), udev_device_get_syspath(parent_device)); - goto cleanup; + return -1; } =20 if ((obj =3D virNodeDeviceObjListFindBySysfsPath(driver->devs, @@ -1295,10 +1294,7 @@ udevSetParent(struct udev_device *device, if (!def->parent) def->parent =3D g_strdup("computer"); =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 9 02:14:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 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=1571737043; cv=none; d=zoho.com; s=zohoarc; b=S19nRlQ8+SCZ0aM6WxEgoPSXXJnO9jNVnqrdmDXLrEqXv8wOV8276vBiMflFepQ7BHTmsK5sofKnVN4/8tB5FtGyCRqtFRziUgbrYyQk+9/1wKFj8qQrebYoljtxMDlYgkwBKVVQzmIYAs9qfIsLmitAuNYAjuOmBU1HTd6nslg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571737043; 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=3IuM5I6IbaTGE9nbJDqLjk+Jx9zQbVPywNxZshmJU+E=; b=QGa9y2GJBVxZVB0/A5g1B8woeFT8pXZi29tVLUkxpkxd2ZTgD1H1Grmqs8FY7KavNOAIOSK4Do+EeGFht3CwzZpFzjVJoSYyBcN0oDQEOCiLpaOX+jYdPY5c55aP+rLaUF1AA0qPMBIsDFF8iApOeCDLxXoGp6/f7F0/brXPYas= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571737043149153.8917884489847; Tue, 22 Oct 2019 02:37:23 -0700 (PDT) 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-362-mYAAI3R_OQqhwenq7ytrmA-1; Tue, 22 Oct 2019 05:37:18 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E0481800D53; Tue, 22 Oct 2019 09:37:10 +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 A90B35D6B0; Tue, 22 Oct 2019 09:37:10 +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 63DE718198EC; Tue, 22 Oct 2019 09:37:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9LIJjl9000633 for ; Mon, 21 Oct 2019 14:19:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 45A58196AE; Mon, 21 Oct 2019 18:19:45 +0000 (UTC) Received: from mx1.redhat.com (ext-mx10.extmail.prod.ext.phx2.redhat.com [10.5.110.39]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4024D8088 for ; Mon, 21 Oct 2019 18:19:34 +0000 (UTC) Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C93E75117D for ; Mon, 21 Oct 2019 18:19:33 +0000 (UTC) Received: by mail-qk1-f172.google.com with SMTP id u22so13544802qkk.11 for ; Mon, 21 Oct 2019 11:19:33 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:7979:d16f:4e5e:8e8d:1141]) by smtp.gmail.com with ESMTPSA id d205sm9248741qke.96.2019.10.21.11.19.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 11:19:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571737042; 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=3IuM5I6IbaTGE9nbJDqLjk+Jx9zQbVPywNxZshmJU+E=; b=VnHRWVJYY+srwVMaAf3qw7bfoOEyv2NKmYpKgbHdO/G87L5u74sJ6C3RH6IvkuJp9NE6VZ Ivtyrq07iRtGBTMCN6YVhA/bHKDb7IDoIKqk0UuzcmKcZAMlOFQ5Of/5VSot8nl/+7WjmL cMpEJ1hFAbBCTmJadmv7nu9AR1rvXLw= 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=nAiYKD6bbmo4S/7ZYfK6RLqPiLc7NQOaXTaxcjPq4qM=; b=K6hTYUzHIzXU0r8JQGkH8xjBKPaiuBCSCn9jEjpWaj3PFRES1RDkEqYDV5cVu7SGWd M8LyTjA9TGlsHqRODHuLo4k+Tg17xs3C3qKCXJYV/VwR98UPYIOXOm5qQ1ZdfrDuE2ln 3gosbXvl+l02IJpN1Nsx21W/PhfBy6RMXPRj+alO3Qn0jVroB+AXzhPhVzTl/6a7Skff Ep0F94fUgcIYWogXh7pMFhjjsL9ZbNcSTM1QmiiCAGyuYDfP/RBls7MscIxUju1uHd7y 4ntSK/l/Hg4/Alqt3LXm9vPamoJAl4XF0DZFeP9IBxumZxkJfFBURuXmIS+1l0nQOKaR +tDA== X-Gm-Message-State: APjAAAX7e56wM9JHUM0RTFd8ckDCrkycK1WNPb3YrSCdikEb5a4nkrrg nAxbPFvq8nk2MbfffIfOkHwLvjB1ZJY= X-Google-Smtp-Source: APXvYqyH4pFN6VXa1ZdTXrAeqZzN1wy+mlOGd07yktjXfXMlNfVXBPr3R4SA9XrevfHOPneLD5+IaQ== X-Received: by 2002:a37:4ed1:: with SMTP id c200mr21636093qkb.304.1571681972961; Mon, 21 Oct 2019 11:19:32 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 15:18:57 -0300 Message-Id: <20191021181911.14986-8-danielhb413@gmail.com> In-Reply-To: <20191021181911.14986-1-danielhb413@gmail.com> References: <20191021181911.14986-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 21 Oct 2019 18:19:33 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 21 Oct 2019 18:19:33 +0000 (UTC) for IP:'209.85.222.172' DOMAIN:'mail-qk1-f172.google.com' HELO:'mail-qk1-f172.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.15 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS) 209.85.222.172 mail-qk1-f172.google.com 209.85.222.172 mail-qk1-f172.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.39 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 07/21] secret_driver.c: remove unneeded cleanup label 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.15 X-MC-Unique: mYAAI3R_OQqhwenq7ytrmA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza Reviewed-by: J=C3=A1n Tomko --- src/secret/secret_driver.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 6d2844f3b7..2989a3acff 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -614,20 +614,15 @@ static int secretConnectSecretEventDeregisterAny(virConnectPtr conn, int callbackID) { - int ret =3D -1; - if (virConnectSecretEventDeregisterAnyEnsureACL(conn) < 0) - goto cleanup; + return -1; =20 if (virObjectEventStateDeregisterID(conn, driver->secretEventState, callbackID, true) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 9 02:14:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 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=1571737173; cv=none; d=zoho.com; s=zohoarc; b=eY2WM69+MftVVgIFg+7OB7VVQk68D8PzO7LJJaDDl1KiA5jlonfIMOrPEjtt/nfansUUUgjBx+f5fUxNh71wjnf5LU3qyxj5nXwP2GyspWtwwtw3t/PSBf5yx+JCHAeJCAlLfQjKDLY9cuFGd93WQtgdHY28ArcUhNzLpN7BoRA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571737173; 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=v9o3PLgWPIhPbSp3hKDReINWhL4kBVkEgVTNyDuR3Fk=; b=XeNf95klf+SxL/1d+I/H2lYDAScrlByuDZ1yszPgApqy/Onb5aWzmFJRHTWA+KJXQd4XqiydFNgkvTBlZh8Dihvtddwa+F9oKnAQbN4eog2rvXv/d9nOCUCSIF7RnEgr2N9CjVGaAwaqUcfHJWEAsWlsCVKCUk9LKv155R1lLwc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1571737173009490.32060154278304; Tue, 22 Oct 2019 02:39:33 -0700 (PDT) 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-339-0tlSqcn4NWGTkgg_Y3IeGg-1; Tue, 22 Oct 2019 05:39:30 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AAADB1800E01; Tue, 22 Oct 2019 09:39:25 +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 842535D6B2; Tue, 22 Oct 2019 09:39: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 463081A507; Tue, 22 Oct 2019 09:39:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9LIJcur000570 for ; Mon, 21 Oct 2019 14:19:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id 29C5561F44; Mon, 21 Oct 2019 18:19:38 +0000 (UTC) Received: from mx1.redhat.com (ext-mx13.extmail.prod.ext.phx2.redhat.com [10.5.110.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1E70E62A7C for ; Mon, 21 Oct 2019 18:19:36 +0000 (UTC) Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9EF253082135 for ; Mon, 21 Oct 2019 18:19:35 +0000 (UTC) Received: by mail-qk1-f175.google.com with SMTP id y189so13591594qkc.3 for ; Mon, 21 Oct 2019 11:19:35 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:7979:d16f:4e5e:8e8d:1141]) by smtp.gmail.com with ESMTPSA id d205sm9248741qke.96.2019.10.21.11.19.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 11:19:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571737172; 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=v9o3PLgWPIhPbSp3hKDReINWhL4kBVkEgVTNyDuR3Fk=; b=ghw0q9cXbjeBfCoNRQWgLnJrEZP7Dgi2ntaWewED6cw3KK1feVyyeCDFMvS9gC7GRcpRYr UnEyX5ZckAS5PO5jNAeuyJNCxT2+vIQzYPgrPDa0p+aWrHFON2GtVJtB6qKZ4/A9uYkg2f yMINAMFU16x4qFRCShsCiNJPeOAq5AE= 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=1DMKmtt0uW4LSZhHNgl1qsdVkqxE7aSijWIQdFaViAg=; b=dOTKt4tIOyEv5Iw+w37g08GQvPHGk4Qet3W4/0pt2rg0RWaF8H/uxq3EAKuIKsQLAC /TTdun+qW/DPNPwZey3txAyzjlZZgg+ehjbl7ftovOUFquHce6HWj2510X5bmT7cAG0J 0f8mXWob0nq7JqRhFVfp4HmZzgA1cV+SHH3fSX09YbdEthP23rTNhGtF3JfqkUFvu7or ABP2NUIY43pwR3nAN4iozG4DYmwfaEY1f3l1KNaOfoVSpBr5vWp6HouiVRSqjLDTurdx /wiXSTg/ZLYhZbgQZ7vZtzjZB/sL7QmsTQywbuOKG6LzJlPapc6qN/9Nf+Y2Dh+o1qXT IGGg== X-Gm-Message-State: APjAAAUTD1YNgXCBLPwOPkWQS8Z0Woqi4InhyMNU5cSRWZ56HZ/5GTVA BF2keBLaPr4fRbHEtFKtbrJlwy3cGxw= X-Google-Smtp-Source: APXvYqyCzivcKkxqnTbDWUz0EmRYeUe7I0CL3CaiConx9fJ6uWKkqUn/yRL4OfbgGakys5weswHSag== X-Received: by 2002:a37:9e16:: with SMTP id h22mr19156800qke.374.1571681974798; Mon, 21 Oct 2019 11:19:34 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 15:18:58 -0300 Message-Id: <20191021181911.14986-9-danielhb413@gmail.com> In-Reply-To: <20191021181911.14986-1-danielhb413@gmail.com> References: <20191021181911.14986-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Mon, 21 Oct 2019 18:19:35 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Mon, 21 Oct 2019 18:19:35 +0000 (UTC) for IP:'209.85.222.175' DOMAIN:'mail-qk1-f175.google.com' HELO:'mail-qk1-f175.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.15 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS) 209.85.222.175 mail-qk1-f175.google.com 209.85.222.175 mail-qk1-f175.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.42 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 08/21] openvz_conf.c: remove unneeded cleanup label 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.15 X-MC-Unique: 0tlSqcn4NWGTkgg_Y3IeGg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza --- src/openvz/openvz_conf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 4646308c48..f12c91aa88 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -873,12 +873,11 @@ openvzLocateConfDir(void) while (conf_dir_list[i]) { if (virFileExists(conf_dir_list[i])) { ret =3D g_strdup(conf_dir_list[i]); - goto cleanup; + return ret; } i++; } =20 - cleanup: return ret; } =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 9 02:14:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 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=1571737023; cv=none; d=zoho.com; s=zohoarc; b=BlG24BOBPlGf0UV3trJXDgT5t+eMEywQLu7IRAGThV3iMSlIe5uglJ8TgUe4dyIowtGeSujVFVEpiMmeP+LIAJaEaGivbn05IXr+F+KNP8RYfhpiirAS+b2j6Epy0U7YDYTFxtkiKBDZhKloQi9wze7IKEqgp4F4o6websCMMUY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571737023; 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=5rhoLMw7yFguYWEPpf30np3a97FgejzwqIjLYbWP5T4=; b=jdoXNnSdOK+cbI2iF488EnsM0a0MJjpYaRZWzHKnngT5HYUBJ6qdAzu1Y5i1cRcU3Ry75flxtr56q6NvWzhgyTnJklwd+yP562RdaYw4lNL/+X3tOPOQK0MC/xQNbq1rIk03Lua5pbw6lFmhSGj/krEzIKtTJzZOAbO6QUPoDV4= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571737023501829.811578448138; Tue, 22 Oct 2019 02:37:03 -0700 (PDT) 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-102-PGtMjvkbPcmV4HPrgPMt0g-1; Tue, 22 Oct 2019 05:37:01 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id A1DEF1005512; Tue, 22 Oct 2019 09:36:55 +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 73BA460657; Tue, 22 Oct 2019 09:36:55 +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 2151418184A4; Tue, 22 Oct 2019 09:36:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9LIJdgb000576 for ; Mon, 21 Oct 2019 14:19:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id 84CF552FCF; Mon, 21 Oct 2019 18:19:38 +0000 (UTC) Received: from mx1.redhat.com (ext-mx24.extmail.prod.ext.phx2.redhat.com [10.5.110.65]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 24CA15B69A for ; Mon, 21 Oct 2019 18:19:38 +0000 (UTC) Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EF62210CC1F0 for ; Mon, 21 Oct 2019 18:19:36 +0000 (UTC) Received: by mail-qt1-f194.google.com with SMTP id c21so22432097qtj.12 for ; Mon, 21 Oct 2019 11:19:36 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:7979:d16f:4e5e:8e8d:1141]) by smtp.gmail.com with ESMTPSA id d205sm9248741qke.96.2019.10.21.11.19.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 11:19:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571737022; 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=5rhoLMw7yFguYWEPpf30np3a97FgejzwqIjLYbWP5T4=; b=hb3OyufU47bBZOln5UnffPR/gps4NkIHYdqX+0+ewEpPz/oG/hY2UJMmB6jCtiBOwCkvNY VqmlDAf0IOm1REHrpFC+kYUPAHSjfFshpsnYRjOtHrwOTvdVXQreNx/gM53dErhGCDvMNG Ricj8AoyBwys5s6dcSIvJNiv2efilqw= 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=eDQ5vjDjTZ9Dhaz1iYf+KZtB7skmoZYb4V1IJkAxi3w=; b=hGqfoQW3YrN6THn7J4t8wtz4dgqhnfSX8B9rSwL5s0SLsTlUWXrLDwbBsL5w9wQtJr Eq0tYXNU+SeXPbe0e74VM3tBoF8uZaWHSz2dUmOVIMIviwVckV37N/ER2gnEK1dUa065 49X4iej7/DypYYv4x3xgDyaRQOcsvdU2jmW7BdKKSxzvWMdPFxe02Gfm2g8ObwgSqZQl rnVbVSKvyEg6CWOicfaZAYIgKfg4iZbMVtnXZIZ+Hbx7gb1/xmJqFZWn9A90WPjZmAL7 wwHkOFbroFBeaqwuaJp+bGaGCLF+hzk0DWqlZ2N2zj4HMPH1Lv7UIuXnepxFKo3CMXba 0FMw== X-Gm-Message-State: APjAAAVnoJUSQzOsBUhjCZJyc5hY6jgYjuZrEMCc05pFIqbnsfVr7/lW 0lrhRcnlhvvshTVOSIMCbrAmHmYOLsk= X-Google-Smtp-Source: APXvYqwHQJIrgI7ugE8AbaVPqL0pZ1vu6E7dW0bipXtUaLHCoYxRk/KuTRISu9DcKf8M7QBxKctWZw== X-Received: by 2002:ac8:3ac6:: with SMTP id x64mr25676909qte.51.1571681976002; Mon, 21 Oct 2019 11:19:36 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 15:18:59 -0300 Message-Id: <20191021181911.14986-10-danielhb413@gmail.com> In-Reply-To: <20191021181911.14986-1-danielhb413@gmail.com> References: <20191021181911.14986-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.65]); Mon, 21 Oct 2019 18:19:37 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.65]); Mon, 21 Oct 2019 18:19:37 +0000 (UTC) for IP:'209.85.160.194' DOMAIN:'mail-qt1-f194.google.com' HELO:'mail-qt1-f194.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.131 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS) 209.85.160.194 mail-qt1-f194.google.com 209.85.160.194 mail-qt1-f194.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.65 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 09/21] qemu_monitor_json.c: remove unneeded cleanup label 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.11 X-MC-Unique: PGtMjvkbPcmV4HPrgPMt0g-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" qemuMonitorJSONBlockIoThrottleInfo uses a macro called GET_THROTTLE_STATS that's defined outside of the function, which references a 'cleanup' label. GET_THROTTLE_STATS is only used inside qemuMonitorJSONBlockIoThrottleInfo (in fact, the macro is undef right after it) thus it is safe to erase the 'cleanup' reference inside the macro, then proceed with the usual cleanup label removal inside qemuMonitorJSONBlockIoThrottleInfo. Signed-off-by: Daniel Henrique Barboza Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor_json.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 99f55c420a..31e10c5127 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5195,7 +5195,7 @@ int qemuMonitorJSONOpenGraphics(qemuMonitorPtr mon, _("block_io_throttle field '%s' missing " \ "in qemu's output"), \ #STORE); \ - goto cleanup; \ + return -1; \ } static int qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr io_throttle, @@ -5203,7 +5203,6 @@ qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr io= _throttle, const char *qdevid, virDomainBlockIoTuneInfoPtr reply) { - int ret =3D -1; size_t i; bool found =3D false; =20 @@ -5217,7 +5216,7 @@ qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr io= _throttle, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("block_io_throttle device entry " "was not in expected format")); - goto cleanup; + return -1; } =20 current_qdev =3D virJSONValueObjectGetString(temp_dev, "qdev"); @@ -5227,7 +5226,7 @@ qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr io= _throttle, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("block_io_throttle device entry " "was not in expected format")); - goto cleanup; + return -1; } =20 if ((drivealias && current_drive && STRNEQ(current_drive, driveali= as)) || @@ -5239,7 +5238,7 @@ qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr io= _throttle, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("block_io_throttle inserted entry " "was not in expected format")); - goto cleanup; + return -1; } GET_THROTTLE_STATS("bps", total_bytes_sec); GET_THROTTLE_STATS("bps_rd", read_bytes_sec); @@ -5271,12 +5270,10 @@ qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr = io_throttle, virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot find throttling info for device '%s'"), drivealias ? drivealias : qdevid); - goto cleanup; + return -1; } - ret =3D 0; =20 - cleanup: - return ret; + return 0; } #undef GET_THROTTLE_STATS #undef GET_THROTTLE_STATS_OPTIONAL --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 9 02:14:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 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=1571737031; cv=none; d=zoho.com; s=zohoarc; b=n5RgIxsLh7FXMibJHkNL44SfhvyKE8DkLccxPcJDcoWaoDPKITxAiQZoISffUM+Q5xIpEknYsjQfCHG3Ak4CJh3ljuXxy/Yqw9AIrh9ovphhJfXzVk+d98sBC/UMcaYBjemFQcM9KA9n1ABoD6qtw/KlX8471l0XGaWUfuENjXg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571737031; 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=aKlhfJ9iQDQB7NBizD3pQl9MQSN2q6hKUJEiHN/6/9I=; b=CNmPdBVR2GJTyvyjHV90dWKg6J00PVV4FXxTbsNl82O7GYKqxpdkn4xnAN4Tw0MfDJsSv7SYDNei7YziLdw/Olj+YdZFxGuISQiqBKAmH7Yg5qNKZ526VqcjUYQLYB6E8TzU5SWUvWh/YMqj+csVZIejsAG1hJ7E28jtT+ul904= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 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 [207.211.31.81]) by mx.zohomail.com with SMTPS id 1571737031053110.01871372105609; Tue, 22 Oct 2019 02:37:11 -0700 (PDT) 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-95-TuVYWq1SPfK4G1Vkqg6nqA-1; Tue, 22 Oct 2019 05:37:07 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E7BA8800D54; Tue, 22 Oct 2019 09:37:02 +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 B37C65D6A9; Tue, 22 Oct 2019 09:37:02 +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 5A63318198E6; Tue, 22 Oct 2019 09:37:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9LIJgsf000605 for ; Mon, 21 Oct 2019 14:19:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id CC3825D717; Mon, 21 Oct 2019 18:19:42 +0000 (UTC) Received: from mx1.redhat.com (ext-mx28.extmail.prod.ext.phx2.redhat.com [10.5.110.69]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C01AC5D6B0 for ; Mon, 21 Oct 2019 18:19:42 +0000 (UTC) Received: from mail-qt1-f179.google.com (mail-qt1-f179.google.com [209.85.160.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 182178AC6FF for ; Mon, 21 Oct 2019 18:19:40 +0000 (UTC) Received: by mail-qt1-f179.google.com with SMTP id e14so2697648qto.1 for ; Mon, 21 Oct 2019 11:19:40 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:7979:d16f:4e5e:8e8d:1141]) by smtp.gmail.com with ESMTPSA id d205sm9248741qke.96.2019.10.21.11.19.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 11:19:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571737029; 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=aKlhfJ9iQDQB7NBizD3pQl9MQSN2q6hKUJEiHN/6/9I=; b=iF48d4PMnxVbTjN9D27UfGnEdhVTTWa5TlI7qF7F4yI+9b7NgqbrnrfwThBpf9VR0OdwKi z/7iUrclaT5auaY4suN7SMRzHFCZkUZ+KG6GLOtoHqfHPByv/eEauunIJEG0tjvi/ojSTR icE0DhgEeb/GT2Kyl6M2MyZf8zfSuBg= 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=xu4x9M4O0uewT2AA4snSVd6a6lCtMIoBBC4FPSngWkk=; b=MVT7oh3IeXnnVRys9J9oYTSv/bIbY02M9y8BXI70gCoA9O6gc6r+lZVcMj6nCDceBH FqIqTI9xuNp1AxW2fywsQeSE9ISFy4GZLfEqyuKWqEoMQfgdbp8GEBZXMab+7dS++m1w HL3R0VxotTGRucPR4FWNt2WIIj0YSHAK+3xfPcbV1ZPpSodpiDTVRxsdrhBUgQKh5MpL YVDIP300Wba4NrVV+RYc1LRYVnp+dTn1+g4A2Si/EgctTF4xQDdqNQbPJ9zM1dW+cstP StxilWjvNZn1Bt/NHlYXDauhaltrSHldHJSf23kdtD+1jTZzC7h1yhXiIiqm5bSWhtsq Li4w== X-Gm-Message-State: APjAAAVmi+wnFeUxFc32hb4j8b9kMufmxX+4zjnw6vJEBDRxF0oG2DOV TQhFwCqwr2XFH7mPazc3CHb4qDQfWlk= X-Google-Smtp-Source: APXvYqxI1NdAJOsRk6jFb3yOFjuQ+WLDXHdl6XJkugr5pUWvikDJ6ElJdVSQmK9GyWHyqO779YQxUA== X-Received: by 2002:aed:3c24:: with SMTP id t33mr26708452qte.186.1571681977983; Mon, 21 Oct 2019 11:19:37 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 15:19:00 -0300 Message-Id: <20191021181911.14986-11-danielhb413@gmail.com> In-Reply-To: <20191021181911.14986-1-danielhb413@gmail.com> References: <20191021181911.14986-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.69]); Mon, 21 Oct 2019 18:19:40 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.69]); Mon, 21 Oct 2019 18:19:40 +0000 (UTC) for IP:'209.85.160.179' DOMAIN:'mail-qt1-f179.google.com' HELO:'mail-qt1-f179.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.131 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS) 209.85.160.179 mail-qt1-f179.google.com 209.85.160.179 mail-qt1-f179.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.69 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 10/21] qemu: 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.15 X-MC-Unique: TuVYWq1SPfK4G1Vkqg6nqA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_cgroup.c | 15 ++-- src/qemu/qemu_domain.c | 92 ++++++++-------------- src/qemu/qemu_domain_address.c | 31 +++----- src/qemu/qemu_driver.c | 140 ++++++++++++--------------------- src/qemu/qemu_hotplug.c | 45 +++++------ src/qemu/qemu_interface.c | 26 +++--- src/qemu/qemu_migration.c | 38 +++------ src/qemu/qemu_process.c | 77 ++++++------------ src/qemu/qemu_tpm.c | 20 ++--- 9 files changed, 172 insertions(+), 312 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index f8bb270117..96d77542ba 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -1077,7 +1077,6 @@ qemuSetupCgroup(virDomainObjPtr vm, int *nicindexes) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - int ret =3D -1; =20 if (!vm->pid) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1092,23 +1091,21 @@ qemuSetupCgroup(virDomainObjPtr vm, return 0; =20 if (qemuSetupDevicesCgroup(vm) < 0) - goto cleanup; + return -1; =20 if (qemuSetupBlkioCgroup(vm) < 0) - goto cleanup; + return -1; =20 if (qemuSetupMemoryCgroup(vm) < 0) - goto cleanup; + return -1; =20 if (qemuSetupCpuCgroup(vm) < 0) - goto cleanup; + return -1; =20 if (qemuSetupCpusetCgroup(vm) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 int diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 3e8da13794..72bcd74a3a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2300,7 +2300,6 @@ qemuStorageSourcePrivateDataFormat(virStorageSourcePt= r src, { g_auto(virBuffer) tmp =3D VIR_BUFFER_INITIALIZER; qemuDomainStorageSourcePrivatePtr srcPriv =3D QEMU_DOMAIN_STORAGE_SOUR= CE_PRIVATE(src); - int ret =3D -1; =20 if (src->nodestorage || src->nodeformat) { virBufferAddLit(buf, "\n"); @@ -2315,7 +2314,7 @@ qemuStorageSourcePrivateDataFormat(virStorageSourcePt= r src, virBufferAsprintf(buf, "\n", src->p= r->mgralias); =20 if (virStorageSourcePrivateDataFormatRelPath(src, buf) < 0) - goto cleanup; + return -1; =20 virBufferSetChildIndent(&tmp, buf); =20 @@ -2328,12 +2327,9 @@ qemuStorageSourcePrivateDataFormat(virStorageSourceP= tr src, virBufferAsprintf(&tmp, "\n", src->tlsAlias= ); =20 if (virXMLFormatElement(buf, "objects", NULL, &tmp) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -2615,7 +2611,6 @@ qemuDomainObjPrivateXMLFormatNBDMigrationSource(virBu= fferPtr buf, { g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; - int ret =3D -1; =20 virBufferSetChildIndent(&childBuf, buf); =20 @@ -2625,15 +2620,12 @@ qemuDomainObjPrivateXMLFormatNBDMigrationSource(vir= BufferPtr buf, =20 if (virDomainDiskSourceFormat(&childBuf, src, "source", 0, false, VIR_DOMAIN_DEF_FORMAT_STATUS, xmlopt) < = 0) - goto cleanup; + return -1; =20 if (virXMLFormatElement(buf, "migrationSource", &attrBuf, &childBuf) <= 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -2647,7 +2639,6 @@ qemuDomainObjPrivateXMLFormatNBDMigration(virBufferPt= r buf, size_t i; virDomainDiskDefPtr disk; qemuDomainDiskPrivatePtr diskPriv; - int ret =3D -1; =20 for (i =3D 0; i < vm->def->ndisks; i++) { disk =3D vm->def->disks[i]; @@ -2662,16 +2653,13 @@ qemuDomainObjPrivateXMLFormatNBDMigration(virBuffer= Ptr buf, qemuDomainObjPrivateXMLFormatNBDMigrationSource(&childBuf, diskPriv->migr= Source, priv->driver->= xmlopt) < 0) - goto cleanup; + return -1; =20 if (virXMLFormatElement(buf, "disk", &attrBuf, &childBuf) < 0) - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -2683,7 +2671,6 @@ qemuDomainObjPrivateXMLFormatJob(virBufferPtr buf, g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; qemuDomainJob job =3D priv->job.active; - int ret =3D -1; =20 if (!qemuDomainTrackJob(job)) job =3D QEMU_JOB_NONE; @@ -2709,18 +2696,15 @@ qemuDomainObjPrivateXMLFormatJob(virBufferPtr buf, =20 if (priv->job.asyncJob =3D=3D QEMU_ASYNC_JOB_MIGRATION_OUT && qemuDomainObjPrivateXMLFormatNBDMigration(&childBuf, vm) < 0) - goto cleanup; + return -1; =20 if (priv->job.migParams) qemuMigrationParamsFormat(&childBuf, priv->job.migParams); =20 if (virXMLFormatElement(buf, "job", &attrBuf, &childBuf) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -4032,11 +4016,10 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def, bool addDefaultUSBKBD =3D false; bool addDefaultUSBMouse =3D false; bool addPanicDevice =3D false; - int ret =3D -1; =20 /* add implicit input devices */ if (qemuDomainDefAddImplicitInputDevice(def) < 0) - goto cleanup; + return -1; =20 /* Add implicit PCI root controller if the machine has one */ switch (def->os.arch) { @@ -4149,12 +4132,12 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def, if (addDefaultUSB && virDomainControllerFind(def, VIR_DOMAIN_CONTROLLER_TYPE_USB, 0) < = 0 && virDomainDefAddUSBController(def, 0, usbModel) < 0) - goto cleanup; + return -1; =20 if (addImplicitSATA && virDomainDefMaybeAddController( def, VIR_DOMAIN_CONTROLLER_TYPE_SATA, 0, -1) < 0) - goto cleanup; + return -1; =20 pciRoot =3D virDomainControllerFind(def, VIR_DOMAIN_CONTROLLER_TYPE_PC= I, 0); =20 @@ -4169,11 +4152,11 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def, "model=3D'pci-root' for this machine type= , " "but model=3D'%s' was found instead"), virDomainControllerModelPCITypeToString(def= ->controllers[pciRoot]->model)); - goto cleanup; + return -1; } } else if (!virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_T= YPE_PCI, 0, VIR_DOMAIN_CONTROLLER_MODEL_= PCI_ROOT)) { - goto cleanup; + return -1; } } =20 @@ -4192,18 +4175,18 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def, "model=3D'pcie-root' for this machine typ= e, " "but model=3D'%s' was found instead"), virDomainControllerModelPCITypeToString(def= ->controllers[pciRoot]->model)); - goto cleanup; + return -1; } } else if (!virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_T= YPE_PCI, 0, VIR_DOMAIN_CONTROLLER_MODEL_P= CIE_ROOT)) { - goto cleanup; + return -1; } } =20 if (addDefaultMemballoon && !def->memballoon) { virDomainMemballoonDefPtr memballoon; if (VIR_ALLOC(memballoon) < 0) - goto cleanup; + return -1; =20 memballoon->model =3D VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO; def->memballoon =3D memballoon; @@ -4238,14 +4221,14 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def, virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_KBD, VIR_DOMAIN_INPUT_BUS_USB) < 0) - goto cleanup; + return -1; =20 if (addDefaultUSBMouse && def->ngraphics > 0 && virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_MOUSE, VIR_DOMAIN_INPUT_BUS_USB) < 0) - goto cleanup; + return -1; =20 if (addPanicDevice) { size_t j; @@ -4264,14 +4247,12 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def, VIR_APPEND_ELEMENT_COPY(def->panics, def->npanics, panic) < 0) { VIR_FREE(panic); - goto cleanup; + return -1; } } } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -13323,19 +13304,16 @@ qemuDomainPopulateDevices(virQEMUDriverConfigPtr = cfg, { const char *const *devices =3D (const char *const *) cfg->cgroupDevice= ACL; size_t i; - int ret =3D -1; =20 if (!devices) devices =3D defaultDeviceACL; =20 for (i =3D 0; devices[i]; i++) { if (qemuDomainCreateDevice(devices[i], data, true) < 0) - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -13686,7 +13664,6 @@ qemuDomainSetupLoader(virQEMUDriverConfigPtr cfg G_= GNUC_UNUSED, const struct qemuDomainCreateDeviceData *data) { virDomainLoaderDefPtr loader =3D vm->def->os.loader; - int ret =3D -1; =20 VIR_DEBUG("Setting up loader"); =20 @@ -13694,16 +13671,16 @@ qemuDomainSetupLoader(virQEMUDriverConfigPtr cfg = G_GNUC_UNUSED, switch ((virDomainLoader) loader->type) { case VIR_DOMAIN_LOADER_TYPE_ROM: if (qemuDomainCreateDevice(loader->path, data, false) < 0) - goto cleanup; + return -1; break; =20 case VIR_DOMAIN_LOADER_TYPE_PFLASH: if (qemuDomainCreateDevice(loader->path, data, false) < 0) - goto cleanup; + return -1; =20 if (loader->nvram && qemuDomainCreateDevice(loader->nvram, data, false) < 0) - goto cleanup; + return -1; break; =20 case VIR_DOMAIN_LOADER_TYPE_NONE: @@ -13713,9 +13690,7 @@ qemuDomainSetupLoader(virQEMUDriverConfigPtr cfg G_= GNUC_UNUSED, } =20 VIR_DEBUG("Setup loader"); - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -14307,7 +14282,6 @@ qemuDomainDetachDeviceUnlink(virQEMUDriverPtr drive= r G_GNUC_UNUSED, char * const *devMountsPath, size_t ndevMountsPath) { - int ret =3D -1; size_t i; =20 if (STRPREFIX(file, QEMU_DEVPREFIX)) { @@ -14322,13 +14296,11 @@ qemuDomainDetachDeviceUnlink(virQEMUDriverPtr dri= ver G_GNUC_UNUSED, if (virProcessRunInMountNamespace(vm->pid, qemuDomainDetachDeviceUnlink= Helper, (void *)file) < 0) - goto cleanup; + return -1; } } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index fa40ba4f7d..092357f5f7 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -223,7 +223,6 @@ static int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def) { size_t i; - int ret =3D -1; =20 /* Default values match QEMU. See spapr_(llan|vscsi|vty).c */ =20 @@ -234,7 +233,7 @@ qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def) net->info.type =3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO; =20 if (qemuDomainAssignSpaprVIOAddress(def, &net->info, VIO_ADDR_NET)= < 0) - goto cleanup; + return -1; } =20 for (i =3D 0; i < def->ncontrollers; i++) { @@ -246,7 +245,7 @@ qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def) } if (qemuDomainAssignSpaprVIOAddress(def, &cont->info, VIO_ADDR_SCSI) < 0) { - goto cleanup; + return -1; } } =20 @@ -257,7 +256,7 @@ qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def) } if (qemuDomainAssignSpaprVIOAddress(def, &def->serials[i]->info, VIO_ADDR_SERIAL) < 0) - goto cleanup; + return -1; } =20 if (def->nvram) { @@ -265,15 +264,12 @@ qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def) def->nvram->info.type =3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPR= VIO; if (qemuDomainAssignSpaprVIOAddress(def, &def->nvram->info, VIO_ADDR_NVRAM) < 0) - goto cleanup; + return -1; } =20 /* No other devices are currently supported on spapr-vio */ =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -1376,7 +1372,6 @@ static int qemuDomainSetupIsolationGroups(virDomainDefPtr def) { int idx; - int ret =3D -1; =20 /* Only pSeries guests care about isolation groups at the moment */ if (!qemuDomainIsPSeries(def)) @@ -1384,7 +1379,7 @@ qemuDomainSetupIsolationGroups(virDomainDefPtr def) =20 idx =3D virDomainControllerFind(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, 0= ); if (idx < 0) - goto cleanup; + return -1; =20 /* We want to prevent hostdevs from being plugged into the default PHB: * we can make sure that doesn't happen by locking its isolation group= */ @@ -1394,13 +1389,10 @@ qemuDomainSetupIsolationGroups(virDomainDefPtr def) if (virDomainDeviceInfoIterate(def, qemuDomainFillDeviceIsolationGroupIter, NULL) < 0) { - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -1500,7 +1492,6 @@ qemuDomainCollectPCIAddress(virDomainDefPtr def G_GNU= C_UNUSED, void *opaque) { virDomainPCIAddressSetPtr addrs =3D opaque; - int ret =3D -1; virPCIDeviceAddressPtr addr =3D &info->addr.pci; =20 if (!virDeviceInfoPCIAddressIsPresent(info) || @@ -1577,12 +1568,10 @@ qemuDomainCollectPCIAddress(virDomainDefPtr def G_G= NUC_UNUSED, if (virDomainPCIAddressReserveAddr(addrs, addr, info->pciConnectFlags, info->isolationGroup) < 0) { - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 static int diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index af8cbf40f4..1b9469ad1d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3671,7 +3671,6 @@ static int qemuDumpWaitForCompletion(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - int ret =3D -1; =20 VIR_DEBUG("Waiting for dump completion"); while (!priv->job.dumpCompleted && !priv->job.abortJob) { @@ -3688,14 +3687,11 @@ qemuDumpWaitForCompletion(virDomainObjPtr vm) virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("memory-only dump failed for unknown reason")= ); =20 - goto cleanup; + return -1; } qemuDomainJobInfoUpdateTime(priv->job.current); =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -3739,19 +3735,18 @@ qemuDumpToFd(virQEMUDriverPtr driver, dumpformat); ret =3D -1; ignore_value(qemuDomainObjExitMonitor(driver, vm)); - goto cleanup; + return ret; } } =20 ret =3D qemuMonitorDumpToFd(priv->mon, fd, dumpformat, detach); =20 if ((qemuDomainObjExitMonitor(driver, vm) < 0) || ret < 0) - goto cleanup; + return ret; =20 if (detach) ret =3D qemuDumpWaitForCompletion(vm); =20 - cleanup: return ret; } =20 @@ -7417,13 +7412,12 @@ static int qemuConnectListDefinedDomains(virConnect= Ptr conn, int ret =3D -1; =20 if (virConnectListDefinedDomainsEnsureACL(conn) < 0) - goto cleanup; + return -1; =20 ret =3D virDomainObjListGetInactiveNames(driver->domains, names, nname= s, virConnectListDefinedDomainsChe= ckACL, conn); =20 - cleanup: return ret; } =20 @@ -7433,13 +7427,12 @@ static int qemuConnectNumOfDefinedDomains(virConnec= tPtr conn) int ret =3D -1; =20 if (virConnectNumOfDefinedDomainsEnsureACL(conn) < 0) - goto cleanup; + return -1; =20 ret =3D virDomainObjListNumOfDomains(driver->domains, false, virConnectNumOfDefinedDomainsCheckA= CL, conn); =20 - cleanup: return ret; } =20 @@ -7976,22 +7969,21 @@ qemuDomainChangeDiskLive(virDomainObjPtr vm, virDomainDiskDefPtr disk =3D dev->data.disk; virDomainDiskDefPtr orig_disk =3D NULL; virDomainDeviceDef oldDev =3D { .type =3D dev->type }; - int ret =3D -1; =20 if (!(orig_disk =3D virDomainDiskByTarget(vm->def, disk->dst))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("disk '%s' not found"), disk->dst); - goto cleanup; + return -1; } =20 oldDev.data.disk =3D orig_disk; if (virDomainDefCompatibleDevice(vm->def, dev, &oldDev, VIR_DOMAIN_DEVICE_ACTION_UPDATE, true) < 0) - goto cleanup; + return -1; =20 if (!qemuDomainDiskChangeSupported(disk, orig_disk)) - goto cleanup; + return -1; =20 if (!virStorageSourceIsSameLocation(disk->src, orig_disk->src)) { /* Disk source can be changed only for removable devices */ @@ -8000,12 +7992,12 @@ qemuDomainChangeDiskLive(virDomainObjPtr vm, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("disk source can be changed only in removable= " "drives")); - goto cleanup; + return -1; } =20 if (qemuDomainChangeEjectableMedia(driver, vm, orig_disk, dev->data.disk->src, force) < 0) - goto cleanup; + return -1; =20 dev->data.disk->src =3D NULL; } @@ -8013,9 +8005,7 @@ qemuDomainChangeDiskLive(virDomainObjPtr vm, orig_disk->startupPolicy =3D dev->data.disk->startupPolicy; orig_disk->snapshot =3D dev->data.disk->snapshot; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 static int @@ -12334,20 +12324,16 @@ qemuConnectDomainEventRegister(virConnectPtr conn, virFreeCallback freecb) { virQEMUDriverPtr driver =3D conn->privateData; - int ret =3D -1; =20 if (virConnectDomainEventRegisterEnsureACL(conn) < 0) - goto cleanup; + return -1; =20 if (virDomainEventStateRegister(conn, driver->domainEventState, callback, opaque, freecb) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -12356,20 +12342,16 @@ qemuConnectDomainEventDeregister(virConnectPtr co= nn, virConnectDomainEventCallback callback) { virQEMUDriverPtr driver =3D conn->privateData; - int ret =3D -1; =20 if (virConnectDomainEventDeregisterEnsureACL(conn) < 0) - goto cleanup; + return -1; =20 if (virDomainEventStateDeregister(conn, driver->domainEventState, callback) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -12385,7 +12367,7 @@ qemuConnectDomainEventRegisterAny(virConnectPtr con= n, int ret =3D -1; =20 if (virConnectDomainEventRegisterAnyEnsureACL(conn) < 0) - goto cleanup; + return -1; =20 if (virDomainEventStateRegisterID(conn, driver->domainEventState, @@ -12393,7 +12375,6 @@ qemuConnectDomainEventRegisterAny(virConnectPtr con= n, callback, opaque, freecb, &ret) < 0) ret =3D -1; =20 - cleanup: return ret; } =20 @@ -12403,20 +12384,16 @@ qemuConnectDomainEventDeregisterAny(virConnectPtr= conn, int callbackID) { virQEMUDriverPtr driver =3D conn->privateData; - int ret =3D -1; =20 if (virConnectDomainEventDeregisterAnyEnsureACL(conn) < 0) - goto cleanup; + return -1; =20 if (virObjectEventStateDeregisterID(conn, driver->domainEventState, callbackID, true) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -15025,7 +15002,6 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, { qemuDomainObjPrivatePtr priv =3D vm->privateData; bool blockdev =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); - int ret =3D -1; size_t i; bool active =3D virDomainObjIsActive(vm); bool reuse =3D (*flags & VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT) !=3D 0; @@ -15039,7 +15015,7 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, =20 if (disk->snapshot !=3D VIR_DOMAIN_SNAPSHOT_LOCATION_NONE && qemuDomainDiskBlockJobIsActive(dom_disk)) - goto cleanup; + return -1; =20 switch ((virDomainSnapshotLocation) disk->snapshot) { case VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL: @@ -15050,12 +15026,12 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, _("active qemu domains require external dis= k " "snapshots; disk %s requested internal"), disk->name); - goto cleanup; + return -1; } =20 if (qemuDomainSnapshotPrepareDiskInternal(dom_disk, active) < 0) - goto cleanup; + return -1; =20 if (vm->def->disks[i]->src->format > 0 && vm->def->disks[i]->src->format !=3D VIR_STORAGE_FILE_QCOW2= ) { @@ -15065,7 +15041,7 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, disk->name, virStorageFileFormatTypeToString( vm->def->disks[i]->src->format)); - goto cleanup; + return -1; } break; =20 @@ -15079,12 +15055,12 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, "is unsupported: %s"), disk->name, virStorageFileFormatTypeToString(disk->src-= >format)); - goto cleanup; + return -1; } =20 if (qemuDomainSnapshotPrepareDiskExternal(dom_disk, disk, active, reuse, block= dev) < 0) - goto cleanup; + return -1; =20 external++; break; @@ -15100,7 +15076,7 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, case VIR_DOMAIN_SNAPSHOT_LOCATION_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("unexpected code path")); - goto cleanup; + return -1; } } =20 @@ -15108,7 +15084,7 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, def->memory =3D=3D VIR_DOMAIN_SNAPSHOT_LOCATION_NONE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("nothing selected for snapshot")); - goto cleanup; + return -1; } =20 /* internal snapshot requires a disk image to store the memory image t= o, and @@ -15118,7 +15094,7 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("internal and full system snapshots require all " "disks to be selected for snapshot")); - goto cleanup; + return -1; } =20 /* disk snapshot requires at least one disk */ @@ -15126,7 +15102,7 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("disk-only snapshots require at least " "one disk to be selected for snapshot")); - goto cleanup; + return -1; } =20 /* For now, we don't allow mixing internal and external disks. @@ -15138,7 +15114,7 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("mixing internal and external targets for a snaps= hot " "is not yet supported")); - goto cleanup; + return -1; } =20 /* internal snapshots + pflash based loader have the following problem= s: @@ -15155,17 +15131,14 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("internal snapshots of a VM with pflash based " "firmware are not supported")); - goto cleanup; + return -1; } =20 /* Alter flags to let later users know what we learned. */ if (external && !active) *flags |=3D VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY; =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -17420,7 +17393,7 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver, case QEMU_BLOCKJOB_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("invalid job type '%d'"), job->type); - goto cleanup; + return -1; =20 case QEMU_BLOCKJOB_TYPE_PULL: case QEMU_BLOCKJOB_TYPE_COMMIT: @@ -17429,7 +17402,7 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver, virReportError(VIR_ERR_OPERATION_INVALID, _("job type '%s' does not support pivot"), qemuBlockjobTypeToString(job->type)); - goto cleanup; + return -1; =20 case QEMU_BLOCKJOB_TYPE_COPY: case QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT: @@ -17440,7 +17413,7 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver, virReportError(VIR_ERR_BLOCK_COPY_ACTIVE, _("block job '%s' not ready for pivot yet"), job->name); - goto cleanup; + return -1; } =20 qemuDomainObjEnterMonitor(driver, vm); @@ -17450,18 +17423,17 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver, ret =3D qemuMonitorDrivePivot(priv->mon, job->name); if (qemuDomainObjExitMonitor(driver, vm) < 0) { ret =3D -1; - goto cleanup; + return ret; } =20 /* The pivot failed. The block job in QEMU remains in the synchronised= state */ if (ret < 0) - goto cleanup; + return ret; =20 if (disk && disk->mirror) disk->mirrorState =3D VIR_DOMAIN_DISK_MIRROR_STATE_PIVOT; job->state =3D QEMU_BLOCKJOB_STATE_PIVOTING; =20 - cleanup: return ret; } =20 @@ -19806,18 +19778,14 @@ qemuConnectListAllDomains(virConnectPtr conn, unsigned int flags) { virQEMUDriverPtr driver =3D conn->privateData; - int ret =3D -1; =20 virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1); =20 if (virConnectListAllDomainsEnsureACL(conn) < 0) - goto cleanup; - - ret =3D virDomainObjListExport(driver->domains, conn, domains, - virConnectListAllDomainsCheckACL, flags); + return -1; =20 - cleanup: - return ret; + return virDomainObjListExport(driver->domains, conn, domains, + virConnectListAllDomainsCheckACL, flags); } =20 static char * @@ -19879,7 +19847,7 @@ qemuConnectDomainQemuMonitorEventRegister(virConnec= tPtr conn, int ret =3D -1; =20 if (virConnectDomainQemuMonitorEventRegisterEnsureACL(conn) < 0) - goto cleanup; + return -1; =20 if (virDomainQemuMonitorEventStateRegisterID(conn, driver->domainEventState, @@ -19888,7 +19856,6 @@ qemuConnectDomainQemuMonitorEventRegister(virConnec= tPtr conn, &ret) < 0) ret =3D -1; =20 - cleanup: return ret; } =20 @@ -19898,19 +19865,15 @@ qemuConnectDomainQemuMonitorEventDeregister(virCo= nnectPtr conn, int callbackID) { virQEMUDriverPtr driver =3D conn->privateData; - int ret =3D -1; =20 if (virConnectDomainQemuMonitorEventDeregisterEnsureACL(conn) < 0) - goto cleanup; + return -1; =20 if (virObjectEventStateDeregisterID(conn, driver->domainEventState, callbackID, true) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -20792,13 +20755,12 @@ qemuDomainGetStatsInterface(virQEMUDriverPtr driv= er G_GNUC_UNUSED, { size_t i; struct _virDomainInterfaceStats tmp; - int ret =3D -1; =20 if (!virDomainObjIsActive(dom)) return 0; =20 if (virTypedParamListAddUInt(params, dom->def->nnets, "net.count") < 0) - goto cleanup; + return -1; =20 /* Check the path is one of the domain's network interfaces. */ for (i =3D 0; i < dom->def->nnets; i++) { @@ -20813,7 +20775,7 @@ qemuDomainGetStatsInterface(virQEMUDriverPtr driver= G_GNUC_UNUSED, actualType =3D virDomainNetGetActualType(net); =20 if (virTypedParamListAddString(params, net->ifname, "net.%zu.name"= , i) < 0) - goto cleanup; + return -1; =20 if (actualType =3D=3D VIR_DOMAIN_NET_TYPE_VHOSTUSER) { if (virNetDevOpenvswitchInterfaceStats(net->ifname, &tmp) < 0)= { @@ -20846,9 +20808,7 @@ qemuDomainGetStatsInterface(virQEMUDriverPtr driver= G_GNUC_UNUSED, "tx.drop", tmp.tx_drop); } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 #undef QEMU_ADD_NET_PARAM diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index fd4bafef0c..e70bc018f7 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3300,23 +3300,19 @@ qemuDomainAttachLease(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainLeaseDefPtr lease) { - int ret =3D -1; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 if (virDomainLeaseInsertPreAlloc(vm->def) < 0) - goto cleanup; + return -1; =20 if (virDomainLockLeaseAttach(driver->lockManager, cfg->uri, vm, lease) < 0) { virDomainLeaseInsertPreAlloced(vm->def, NULL); - goto cleanup; + return -1; } =20 virDomainLeaseInsertPreAlloced(vm->def, lease); - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -3331,7 +3327,7 @@ qemuDomainChangeNetBridge(virDomainObjPtr vm, =20 if (!oldbridge || !newbridge) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing bridge nam= e")); - goto cleanup; + return -1; } =20 VIR_DEBUG("Change bridge for interface %s: %s -> %s", @@ -3340,7 +3336,7 @@ qemuDomainChangeNetBridge(virDomainObjPtr vm, if (virNetDevExists(newbridge) !=3D 1) { virReportError(VIR_ERR_OPERATION_FAILED, _("bridge %s doesn't exist"), newbridge); - goto cleanup; + return -1; } =20 ret =3D virNetDevBridgeRemovePort(oldbridge, olddev->ifname); @@ -3364,12 +3360,10 @@ qemuDomainChangeNetBridge(virDomainObjPtr vm, _("unable to recover former state by adding por= t " "to bridge %s"), oldbridge); } - goto cleanup; + return ret; } /* caller will replace entire olddev with newdev in domain nets list */ - ret =3D 0; - cleanup: - return ret; + return 0; } =20 static int @@ -4019,14 +4013,14 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, virReportError(VIR_ERR_DEVICE_MISSING, _("cannot find existing graphics device to modify o= f " "type '%s'"), type); - goto cleanup; + return -1; } =20 if (dev->nListens !=3D olddev->nListens) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("cannot change the number of listen addresses " "on '%s' graphics"), type); - goto cleanup; + return -1; } =20 for (i =3D 0; i < dev->nListens; i++) { @@ -4037,7 +4031,7 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("cannot change the type of listen address " "on '%s' graphics"), type); - goto cleanup; + return ret; } =20 switch (newlisten->type) { @@ -4046,7 +4040,7 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("cannot change listen address setting " "on '%s' graphics"), type); - goto cleanup; + return ret; } =20 break; @@ -4056,7 +4050,7 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("cannot change listen address setting " "on '%s' graphics"), type); - goto cleanup; + return ret; } =20 break; @@ -4066,7 +4060,7 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("cannot change listen socket setting " "on '%s' graphics"), type); - goto cleanup; + return ret; } break; =20 @@ -4084,12 +4078,12 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, (olddev->data.vnc.port !=3D dev->data.vnc.port))) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot change port settings on vnc graphics"= )); - goto cleanup; + return ret; } if (STRNEQ_NULLABLE(olddev->data.vnc.keymap, dev->data.vnc.keymap)= ) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot change keymap setting on vnc graphics= ")); - goto cleanup; + return ret; } =20 /* If a password lifetime was, or is set, or action if connected h= as @@ -4108,7 +4102,7 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, cfg->vncPassword, QEMU_ASYNC_JOB_NONE); if (ret < 0) - goto cleanup; + return ret; =20 /* Steal the new dev's char * reference */ VIR_FREE(olddev->data.vnc.auth.passwd); @@ -4130,13 +4124,13 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, (olddev->data.spice.tlsPort !=3D dev->data.spice.tlsPort))) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot change port settings on spice graphic= s")); - goto cleanup; + return ret; } if (STRNEQ_NULLABLE(olddev->data.spice.keymap, dev->data.spice.keymap)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot change keymap setting on spice graph= ics")); - goto cleanup; + return ret; } =20 /* We must reset the password if it has changed but also if: @@ -4160,7 +4154,7 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, QEMU_ASYNC_JOB_NONE); =20 if (ret < 0) - goto cleanup; + return ret; =20 /* Steal the new dev's char * reference */ VIR_FREE(olddev->data.spice.auth.passwd); @@ -4188,7 +4182,6 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, break; } =20 - cleanup: return ret; } =20 diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index 70832e0c9a..5846f636cb 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -53,7 +53,6 @@ VIR_LOG_INIT("qemu.qemu_interface"); int qemuInterfaceStartDevice(virDomainNetDefPtr net) { - int ret =3D -1; virDomainNetType actualType =3D virDomainNetGetActualType(net); =20 switch (actualType) { @@ -71,7 +70,7 @@ qemuInterfaceStartDevice(virDomainNetDefPtr net) if (virNetDevBridgeFDBAdd(&net->mac, net->ifname, VIR_NETDEVBRIDGE_FDB_FLAG_MASTER | VIR_NETDEVBRIDGE_FDB_FLAG_TEMP) < 0) - goto cleanup; + return -1; } break; =20 @@ -84,9 +83,9 @@ qemuInterfaceStartDevice(virDomainNetDefPtr net) * some sort of "blip" in the physdev's status. */ if (physdev && virNetDevGetOnline(physdev, &isOnline) < 0) - goto cleanup; + return -1; if (!isOnline && virNetDevSetOnline(physdev, true) < 0) - goto cleanup; + return -1; =20 /* macvtap devices share their MAC address with the guest * domain, and if they are set online prior to the domain CPUs @@ -101,13 +100,13 @@ qemuInterfaceStartDevice(virDomainNetDefPtr net) * we are starting the domain CPUs. */ if (virNetDevSetOnline(net->ifname, true) < 0) - goto cleanup; + return -1; break; } =20 case VIR_DOMAIN_NET_TYPE_ETHERNET: if (virNetDevIPInfoAddToDev(net->ifname, &net->hostIP) < 0) - goto cleanup; + return -1; =20 break; =20 @@ -124,9 +123,7 @@ qemuInterfaceStartDevice(virDomainNetDefPtr net) break; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 /** @@ -159,7 +156,6 @@ qemuInterfaceStartDevices(virDomainDefPtr def) int qemuInterfaceStopDevice(virDomainNetDefPtr net) { - int ret =3D -1; virDomainNetType actualType =3D virDomainNetGetActualType(net); =20 switch (actualType) { @@ -173,7 +169,7 @@ qemuInterfaceStopDevice(virDomainNetDefPtr net) if (virNetDevBridgeFDBDel(&net->mac, net->ifname, VIR_NETDEVBRIDGE_FDB_FLAG_MASTER | VIR_NETDEVBRIDGE_FDB_FLAG_TEMP) < 0) - goto cleanup; + return -1; } break; =20 @@ -186,7 +182,7 @@ qemuInterfaceStopDevice(virDomainNetDefPtr net) * on this network. */ if (virNetDevSetOnline(net->ifname, false) < 0) - goto cleanup; + return -1; =20 /* also mark the physdev down for passthrough macvtap, as the * physdev has the same MAC address as the macvtap device. @@ -194,7 +190,7 @@ qemuInterfaceStopDevice(virDomainNetDefPtr net) if (virDomainNetGetActualDirectMode(net) =3D=3D VIR_NETDEV_MACVLAN_MODE_PASSTHRU && physdev && virNetDevSetOnline(physdev, false) < 0) - goto cleanup; + return -1; break; } =20 @@ -212,9 +208,7 @@ qemuInterfaceStopDevice(virDomainNetDefPtr net) break; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 /** diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 3f90536339..02787e81d8 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1771,7 +1771,6 @@ qemuMigrationDstOPDRelocate(virQEMUDriverPtr driver G= _GNUC_UNUSED, qemuMigrationCookiePtr cookie) { virDomainNetDefPtr netptr; - int ret =3D -1; size_t i; =20 for (i =3D 0; i < cookie->network->nnets; i++) { @@ -1788,7 +1787,7 @@ qemuMigrationDstOPDRelocate(virQEMUDriverPtr driver G= _GNUC_UNUSED, virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to run command to set OVS port da= ta for " "interface %s"), netptr->ifname); - goto cleanup; + return -1; } break; default: @@ -1796,9 +1795,7 @@ qemuMigrationDstOPDRelocate(virQEMUDriverPtr driver G= _GNUC_UNUSED, } } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -1849,7 +1846,6 @@ qemuMigrationDstRun(virQEMUDriverPtr driver, qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - int ret =3D -1; int rv; =20 VIR_DEBUG("Setting up incoming migration with URI %s", uri); @@ -1860,21 +1856,16 @@ qemuMigrationDstRun(virQEMUDriverPtr driver, rv =3D qemuMonitorMigrateIncoming(priv->mon, uri); =20 if (qemuDomainObjExitMonitor(driver, vm) < 0 || rv < 0) - goto cleanup; + return -1; =20 - if (asyncJob =3D=3D QEMU_ASYNC_JOB_MIGRATION_IN) { + if (asyncJob =3D=3D QEMU_ASYNC_JOB_MIGRATION_IN) /* qemuMigrationDstWaitForCompletion is called from the Finish pha= se */ - ret =3D 0; - goto cleanup; - } + return 0; =20 if (qemuMigrationDstWaitForCompletion(driver, vm, asyncJob, false) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -4666,9 +4657,9 @@ qemuMigrationSrcPerformPhase(virQEMUDriverPtr driver, if (!(flags & VIR_MIGRATE_CHANGE_PROTECTION)) { if (qemuMigrationJobStart(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, flags) < 0) - goto cleanup; + return ret; } else if (!qemuMigrationJobIsActive(vm, QEMU_ASYNC_JOB_MIGRATION_OUT)= ) { - goto cleanup; + return ret; } =20 qemuMigrationJobStartPhase(driver, vm, QEMU_MIGRATION_PHASE_PERFORM3); @@ -4703,7 +4694,6 @@ qemuMigrationSrcPerformPhase(virQEMUDriverPtr driver, if (!virDomainObjIsActive(vm)) qemuDomainRemoveInactiveJob(driver, vm); =20 - cleanup: return ret; } =20 @@ -5327,7 +5317,6 @@ qemuMigrationSrcCancel(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv =3D vm->privateData; bool storage =3D false; size_t i; - int ret =3D -1; =20 VIR_DEBUG("Canceling unfinished outgoing migration of domain %s", vm->def->name); @@ -5335,7 +5324,7 @@ qemuMigrationSrcCancel(virQEMUDriverPtr driver, qemuDomainObjEnterMonitor(driver, vm); ignore_value(qemuMonitorMigrateCancel(priv->mon)); if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + return -1; =20 for (i =3D 0; i < vm->def->ndisks; i++) { virDomainDiskDefPtr disk =3D vm->def->disks[i]; @@ -5357,12 +5346,9 @@ qemuMigrationSrcCancel(virQEMUDriverPtr driver, if (storage && qemuMigrationSrcNBDCopyCancel(driver, vm, false, QEMU_ASYNC_JOB_NONE, NULL) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7e0dc26658..20bf67568b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2255,24 +2255,21 @@ qemuProcessRefreshPRManagerState(virDomainObjPtr vm, qemuDomainObjPrivatePtr priv =3D vm->privateData; qemuMonitorPRManagerInfoPtr prManagerInfo; const char *managedAlias =3D qemuDomainGetManagedPRAlias(); - int ret =3D -1; =20 if (!(prManagerInfo =3D virHashLookup(info, managedAlias))) { virReportError(VIR_ERR_OPERATION_FAILED, _("missing info on pr-manager %s"), managedAlias); - goto cleanup; + return -1; } =20 priv->prDaemonRunning =3D prManagerInfo->connected; =20 if (!priv->prDaemonRunning && qemuProcessStartManagedPRDaemon(vm) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -4998,16 +4995,15 @@ qemuProcessSetupGraphics(virQEMUDriverPtr driver, virDomainGraphicsDefPtr graphics; bool allocate =3D !(flags & VIR_QEMU_PROCESS_START_PRETEND); size_t i; - int ret =3D -1; =20 for (i =3D 0; i < vm->def->ngraphics; i++) { graphics =3D vm->def->graphics[i]; =20 if (qemuProcessGraphicsSetupRenderNode(graphics, qemuCaps) < 0) - goto cleanup; + return -1; =20 if (qemuProcessGraphicsSetupListen(driver, graphics, vm) < 0) - goto cleanup; + return -1; } =20 if (allocate) { @@ -5015,7 +5011,7 @@ qemuProcessSetupGraphics(virQEMUDriverPtr driver, graphics =3D vm->def->graphics[i]; =20 if (qemuProcessGraphicsReservePorts(graphics, false) < 0) - goto cleanup; + return -1; } } =20 @@ -5023,13 +5019,10 @@ qemuProcessSetupGraphics(virQEMUDriverPtr driver, graphics =3D vm->def->graphics[i]; =20 if (qemuProcessGraphicsAllocatePorts(driver, graphics, allocate) <= 0) - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -5130,20 +5123,15 @@ qemuProcessMakeDir(virQEMUDriverPtr driver, virDomainObjPtr vm, const char *path) { - int ret =3D -1; - if (virFileMakePathWithMode(path, 0750) < 0) { virReportSystemError(errno, _("Cannot create directory '%s'"), pat= h); - goto cleanup; + return -1; } =20 if (qemuSecurityDomainSetPathLabel(driver, vm, path, true) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -8499,30 +8487,29 @@ static int qemuProcessQMPInit(qemuProcessQMPPtr proc) { char *template =3D NULL; - int ret =3D -1; =20 VIR_DEBUG("proc=3D%p, emulator=3D%s", proc, proc->binary); =20 if (virAsprintf(&template, "%s/qmp-XXXXXX", proc->libDir) < 0) - goto cleanup; + return -1; =20 if (!(proc->uniqDir =3D mkdtemp(template))) { virReportSystemError(errno, _("Failed to create unique directory with " "template '%s' for probing QEMU"), template); - goto cleanup; + return -1; } =20 if (qemuProcessQEMULabelUniqPath(proc) < 0) - goto cleanup; + return -1; =20 if (virAsprintf(&proc->monpath, "%s/%s", proc->uniqDir, "qmp.monitor") < 0) - goto cleanup; + return -1; =20 if (virAsprintf(&proc->monarg, "unix:%s,server,nowait", proc->monpath)= < 0) - goto cleanup; + return -1; =20 /* * Normally we'd use runDir for pid files, but because we're using @@ -8530,12 +8517,9 @@ qemuProcessQMPInit(qemuProcessQMPPtr proc) * than libvirtd. So we're using libDir which QEMU can write to */ if (virAsprintf(&proc->pidfile, "%s/%s", proc->uniqDir, "qmp.pid") < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -8544,7 +8528,6 @@ qemuProcessQMPLaunch(qemuProcessQMPPtr proc) { const char *machine; int status =3D 0; - int ret =3D -1; int rc; =20 if (proc->forceTCG) @@ -8588,7 +8571,7 @@ qemuProcessQMPLaunch(qemuProcessQMPPtr proc) virCommandSetErrorBuffer(proc->cmd, &(proc->stdErr)); =20 if (virCommandRun(proc->cmd, &status) < 0) - goto cleanup; + return -1; =20 if (status !=3D 0) { VIR_DEBUG("QEMU %s exited with status %d", proc->binary, status); @@ -8596,18 +8579,15 @@ qemuProcessQMPLaunch(qemuProcessQMPPtr proc) _("Failed to start QEMU binary %s for probing: %s"), proc->binary, proc->stdErr ? proc->stdErr : _("unknown error")); - goto cleanup; + return -1; } =20 if ((rc =3D virPidFileReadPath(proc->pidfile, &proc->pid)) < 0) { virReportSystemError(-rc, _("Failed to read pidfile %s"), proc->pi= dfile); - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -8680,21 +8660,16 @@ qemuProcessQMPConnectMonitor(qemuProcessQMPPtr proc) int qemuProcessQMPStart(qemuProcessQMPPtr proc) { - int ret =3D -1; - VIR_DEBUG("proc=3D%p, emulator=3D%s", proc, proc->binary); =20 if (qemuProcessQMPInit(proc) < 0) - goto cleanup; + return -1; =20 if (qemuProcessQMPLaunch(proc) < 0) - goto cleanup; + return -1; =20 if (qemuProcessQMPConnectMonitor(proc) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index f21dbf9727..18390f9278 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -320,8 +320,6 @@ qemuTPMEmulatorPrepareHost(virDomainTPMDefPtr tpm, uid_t qemu_user, const char *shortName) { - int ret =3D -1; - if (virTPMEmulatorInit() < 0) return -1; =20 @@ -332,17 +330,17 @@ qemuTPMEmulatorPrepareHost(virDomainTPMDefPtr tpm, /* ... and adjust ownership */ if (virDirCreate(logDir, 0730, swtpm_user, swtpm_group, VIR_DIR_CREATE_ALLOW_EXIST) < 0) - goto cleanup; + return -1; =20 /* create logfile name ... */ if (!tpm->data.emulator.logfile && virAsprintf(&tpm->data.emulator.logfile, "%s/%s-swtpm.log", logDir, vmname) < 0) - goto cleanup; + return -1; =20 if (!virFileExists(tpm->data.emulator.logfile) && virFileTouch(tpm->data.emulator.logfile, 0644) < 0) { - goto cleanup; + return -1; } =20 /* ... and make sure it can be accessed by swtpm_user */ @@ -350,7 +348,7 @@ qemuTPMEmulatorPrepareHost(virDomainTPMDefPtr tpm, virReportSystemError(errno, _("Could not chown on swtpm logfile %s"), tpm->data.emulator.logfile); - goto cleanup; + return -1; } =20 /* @@ -362,20 +360,16 @@ qemuTPMEmulatorPrepareHost(virDomainTPMDefPtr tpm, */ if (virDirCreate(swtpmStateDir, 0770, qemu_user, swtpm_group, VIR_DIR_CREATE_ALLOW_EXIST) < 0) - goto cleanup; + return -1; =20 /* create the socket filename */ if (!tpm->data.emulator.source.data.nix.path && !(tpm->data.emulator.source.data.nix.path =3D qemuTPMCreateEmulatorSocket(swtpmStateDir, shortName))) - goto cleanup; + return -1; tpm->data.emulator.source.type =3D VIR_DOMAIN_CHR_TYPE_UNIX; =20 - ret =3D 0; - - cleanup: - - return ret; + return 0; } =20 /* --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 9 02:14:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1571737028; cv=none; d=zoho.com; s=zohoarc; b=YVYpVYN8Wz1TuCA9WoOaBYKNmFD8RNc2iDev9UImeRfVg+JFV+79y9abIYHvw1oE94+BhpXYBFemUGB4f0184D1uPVVcTh2MqRBaKLbi7hutKZtHE3IAlRAX1TCVcWyQngrmSpz+pj17Ry42MgkHymbzKfKgIH4AY7oHPidHFxU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571737028; 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=OA2wsdhwL3zBkNkbVNGkhMrADGurpOjji+p78l/DMWA=; b=gqvMAeh1IB0n+sWAkRrK7xlI+2MS8CgbD9bC8EB+3D6D7O/wNhABByrL3oSBRypRktff2V/zlJSxEJJAZRb5JNvUTAQopiXS7zppSTkWYrUvhf8VA/xBIZVYw92GRXkHOK3vDn3YPgmL2moL99KX412S9MvZNa52GNP2HmSOhC0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.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 1571737028927336.55818403158196; Tue, 22 Oct 2019 02:37:08 -0700 (PDT) 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-204-TlTOACOHM6C5aSe7gKPBdQ-1; Tue, 22 Oct 2019 05:37:04 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 11F7B100551F; Tue, 22 Oct 2019 09:36:59 +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 E23D65C1D4; Tue, 22 Oct 2019 09:36:58 +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 A16011A502; Tue, 22 Oct 2019 09:36:58 +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 x9LIJftH000592 for ; Mon, 21 Oct 2019 14:19:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 95D025C8A6; Mon, 21 Oct 2019 18:19:41 +0000 (UTC) Received: from mx1.redhat.com (ext-mx16.extmail.prod.ext.phx2.redhat.com [10.5.110.45]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7C10D5E1D8 for ; Mon, 21 Oct 2019 18:19:41 +0000 (UTC) Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 81DE13082B6D for ; Mon, 21 Oct 2019 18:19:40 +0000 (UTC) Received: by mail-qt1-f175.google.com with SMTP id c17so19468511qtn.8 for ; Mon, 21 Oct 2019 11:19:40 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:7979:d16f:4e5e:8e8d:1141]) by smtp.gmail.com with ESMTPSA id d205sm9248741qke.96.2019.10.21.11.19.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 11:19:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571737027; 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=OA2wsdhwL3zBkNkbVNGkhMrADGurpOjji+p78l/DMWA=; b=O8NPLRsYunFNqAa/plM9yKFfmtT6nEJ25lNxmngodLEEJyqpFWs5egIjqAqalPvt8YtHOk /csu9jCLtp7KVU9Afn6vkNZuNFVCe127qz+8c8Xa6mvJXj5AQOjc88iUCwDql6/oJXgJTR wEj60TjoL4lu2TuKgWQVRz1TOjR7Tyg= 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=SV3+A6oOOEynSWLDtQHoEMe11vYGEWrZXx1DUt8oHAQ=; b=t0cFyRvy05LGc8uACyYd4HOtMstAati+jMIJgNU/OFCIcS5asfkpeHpE2dPngobRMN w7Ub4Sndb3lQR26VsfOrmYIWG2OCF9Ma8FSOoIkXZy+rrsXGiLVNozZf2OpFrVuDc3nx +q5hZQHEjCTr/Vza/3f1pk/J6AMFw1gqjeCxOtvwJhzlMmgZjYuw1DksTNfaOlU8TmTK LaeQFYLcq6krW6MqzwEMnddDp0seeCyS1AbEHdAFlI+P/dP+HKxiJynkKpkZhywJP3Y3 FJ+aFMnKRzS85HYrTUrnVuxOLxv2PwA8spszr4BWAq95XUn6j1I4aOBmJVPG6DziZW+e NDJQ== X-Gm-Message-State: APjAAAV7mwZwjZ9bTjSA/vyNk1289ofZOkjxG5IY8lcAOzkxzGAs+rbs /cVmH8YgodE30B/C6UIqcPkEvLD4To4= X-Google-Smtp-Source: APXvYqzI30TBTN3WRAllC72TL9CthiBqJm4CnpcD4K/Qf0GuBYNaxkAyxWHJnXM3a2QIMoMNMg8c6g== X-Received: by 2002:ac8:18a9:: with SMTP id s38mr21048570qtj.355.1571681979547; Mon, 21 Oct 2019 11:19:39 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 15:19:01 -0300 Message-Id: <20191021181911.14986-12-danielhb413@gmail.com> In-Reply-To: <20191021181911.14986-1-danielhb413@gmail.com> References: <20191021181911.14986-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Mon, 21 Oct 2019 18:19:40 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Mon, 21 Oct 2019 18:19:40 +0000 (UTC) for IP:'209.85.160.175' DOMAIN:'mail-qt1-f175.google.com' HELO:'mail-qt1-f175.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.15 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS) 209.85.160.175 mail-qt1-f175.google.com 209.85.160.175 mail-qt1-f175.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.45 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 11/21] rpc: 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.16 X-MC-Unique: TlTOACOHM6C5aSe7gKPBdQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza Reviewed-by: J=C3=A1n Tomko --- src/rpc/virnetserver.c | 15 +++++---------- src/rpc/virnetserverprogram.c | 13 ++++--------- src/rpc/virnetsocket.c | 9 +++------ src/rpc/virnettlscontext.c | 20 ++++++++------------ 4 files changed, 20 insertions(+), 37 deletions(-) diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 042661ffa5..590e780b64 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -109,7 +109,6 @@ static int virNetServerProcessMsg(virNetServerPtr srv, virNetServerProgramPtr prog, virNetMessagePtr msg) { - int ret =3D -1; if (!prog) { /* Only send back an error for type =3D=3D CALL. Other * message types are not expecting replies, so we @@ -120,7 +119,7 @@ static int virNetServerProcessMsg(virNetServerPtr srv, if (virNetServerProgramUnknownError(client, msg, &msg->header) < 0) - goto cleanup; + return -1; } else { VIR_INFO("Dropping client message, unknown program %d version = %d type %d proc %d", msg->header.prog, msg->header.vers, @@ -129,22 +128,18 @@ static int virNetServerProcessMsg(virNetServerPtr srv, virNetMessageClear(msg); msg->header.type =3D VIR_NET_REPLY; if (virNetServerClientSendMessage(client, msg) < 0) - goto cleanup; + return -1; } - goto done; + return 0; } =20 if (virNetServerProgramDispatch(prog, srv, client, msg) < 0) - goto cleanup; - - done: - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 static void virNetServerHandleJob(void *jobOpaque, void *opaque) diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c index e3fa810a3f..8df92fb8df 100644 --- a/src/rpc/virnetserverprogram.c +++ b/src/rpc/virnetserverprogram.c @@ -312,10 +312,8 @@ int virNetServerProgramDispatch(virNetServerProgramPtr= prog, /* Send a dummy reply to free up 'msg' & unblock client rx */ virNetMessageClear(msg); msg->header.type =3D VIR_NET_REPLY; - if (virNetServerClientSendMessage(client, msg) < 0) { - ret =3D -1; - goto cleanup; - } + if (virNetServerClientSendMessage(client, msg) < 0) + return -1; ret =3D 0; break; =20 @@ -340,14 +338,11 @@ int virNetServerProgramDispatch(virNetServerProgramPt= r prog, /* Send a dummy reply to free up 'msg' & unblock client rx */ virNetMessageClear(msg); msg->header.type =3D VIR_NET_REPLY; - if (virNetServerClientSendMessage(client, msg) < 0) { - ret =3D -1; - goto cleanup; - } + if (virNetServerClientSendMessage(client, msg) < 0) + return -1; ret =3D 0; } =20 - cleanup: return ret; } =20 diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 6574ee0d16..a031133626 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -159,7 +159,6 @@ int virNetSocketCheckProtocols(bool *hasIPv4, struct ifaddrs *ifaddr =3D NULL, *ifa; struct addrinfo hints; struct addrinfo *ai =3D NULL; - int ret =3D -1; int gaierr; =20 memset(&hints, 0, sizeof(hints)); @@ -169,7 +168,7 @@ int virNetSocketCheckProtocols(bool *hasIPv4, if (getifaddrs(&ifaddr) < 0) { virReportSystemError(errno, "%s", _("Cannot get host interface addresses")); - goto cleanup; + return -1; } =20 for (ifa =3D ifaddr; ifa !=3D NULL; ifa =3D ifa->ifa_next) { @@ -197,7 +196,7 @@ int virNetSocketCheckProtocols(bool *hasIPv4, virReportError(VIR_ERR_INTERNAL_ERROR, _("Cannot resolve ::1 address: %s"), gai_strerror(gaierr)); - goto cleanup; + return -1; } } =20 @@ -205,9 +204,7 @@ int virNetSocketCheckProtocols(bool *hasIPv4, =20 VIR_DEBUG("Protocols: v4 %d v6 %d", *hasIPv4, *hasIPv6); =20 - ret =3D 0; - cleanup: - return ret; + return 0; #else *hasIPv4 =3D *hasIPv6 =3D false; virReportError(VIR_ERR_NO_SUPPORT, "%s", diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 2420ad8681..e15cd7f64a 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -610,12 +610,11 @@ static int virNetTLSContextLoadCredentials(virNetTLSC= ontextPtr ctxt, const char *cert, const char *key) { - int ret =3D -1; int err; =20 if (cacert && cacert[0] !=3D '\0') { if (virNetTLSContextCheckCertFile("CA certificate", cacert, false)= < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("loading CA cert from %s", cacert); err =3D gnutls_certificate_set_x509_trust_file(ctxt->x509cred, @@ -625,14 +624,14 @@ static int virNetTLSContextLoadCredentials(virNetTLSC= ontextPtr ctxt, virReportError(VIR_ERR_SYSTEM_ERROR, _("Unable to set x509 CA certificate: %s: %s"), cacert, gnutls_strerror(err)); - goto cleanup; + return -1; } } =20 if (cacrl && cacrl[0] !=3D '\0') { int rv; if ((rv =3D virNetTLSContextCheckCertFile("CA revocation list", ca= crl, true)) < 0) - goto cleanup; + return -1; =20 if (rv =3D=3D 0) { VIR_DEBUG("loading CRL from %s", cacrl); @@ -643,7 +642,7 @@ static int virNetTLSContextLoadCredentials(virNetTLSCon= textPtr ctxt, virReportError(VIR_ERR_SYSTEM_ERROR, _("Unable to set x509 certificate revocatio= n list: %s: %s"), cacrl, gnutls_strerror(err)); - goto cleanup; + return -1; } } else { VIR_DEBUG("Skipping non-existent CA CRL %s", cacrl); @@ -653,10 +652,10 @@ static int virNetTLSContextLoadCredentials(virNetTLSC= ontextPtr ctxt, if (cert && cert[0] !=3D '\0' && key && key[0] !=3D '\0') { int rv; if ((rv =3D virNetTLSContextCheckCertFile("certificate", cert, !is= Server)) < 0) - goto cleanup; + return -1; if (rv =3D=3D 0 && (rv =3D virNetTLSContextCheckCertFile("private key", key, !isS= erver)) < 0) - goto cleanup; + return -1; =20 if (rv =3D=3D 0) { VIR_DEBUG("loading cert and key from %s and %s", cert, key); @@ -668,7 +667,7 @@ static int virNetTLSContextLoadCredentials(virNetTLSCon= textPtr ctxt, virReportError(VIR_ERR_SYSTEM_ERROR, _("Unable to set x509 key and certificate: = %s, %s: %s"), key, cert, gnutls_strerror(err)); - goto cleanup; + return -1; } } else { VIR_DEBUG("Skipping non-existent cert %s key %s on client", @@ -676,10 +675,7 @@ static int virNetTLSContextLoadCredentials(virNetTLSCo= ntextPtr ctxt, } } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 9 02:14:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 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=1571737223; cv=none; d=zoho.com; s=zohoarc; b=M6GrghjgJWN3lrHxtLI2ziAA0cmv8xmhqwnG/Nu2aJnr6VmYSTE7PRhG0FscGxBKpXDAJGv2Lc1i6ppJhAKX/Uj43ZNfqfgo4ixs9FJjubBgVY3T705VEfDKTA+jCoiiwr/9oSdMSW7JFzscF0JW2fRndQ/A53jQ8LXqpf6UxO4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571737223; 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=7y6nv0e50eHEQGhtgSP4aadJRqZs4K4vv95D1n/RfD0=; b=H6q077WyPTn9nKrs5g5+AaW61KEvioX+Z2uh6Iq3S4NXZR7rwJokq9hf5zPFA0UHOoDEIrlr8uQ1irbKj73b4rN0V9OZTGXNyTekUzoE2vBxNZ1rRk/sTN3HYGSZxRE5pqXfX1olIZjFQKmenPnLMsirOz2zrGzVCyYGSeUzYTI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571737223350433.88044400782667; Tue, 22 Oct 2019 02:40:23 -0700 (PDT) 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-40-QqI7thjGM-ab0np65PicXQ-1; Tue, 22 Oct 2019 05:40:20 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 44782107AD33; Tue, 22 Oct 2019 09:40:15 +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 1D99660856; Tue, 22 Oct 2019 09:40: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 CFA3383545; Tue, 22 Oct 2019 09:40:14 +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 x9LIJgDF000613 for ; Mon, 21 Oct 2019 14:19:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id E93DE5C290; Mon, 21 Oct 2019 18:19:42 +0000 (UTC) Received: from mx1.redhat.com (ext-mx21.extmail.prod.ext.phx2.redhat.com [10.5.110.62]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E03B75C219 for ; Mon, 21 Oct 2019 18:19:42 +0000 (UTC) Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4DFE218C4279 for ; Mon, 21 Oct 2019 18:19:42 +0000 (UTC) Received: by mail-qk1-f195.google.com with SMTP id a194so9488566qkg.10 for ; Mon, 21 Oct 2019 11:19:42 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:7979:d16f:4e5e:8e8d:1141]) by smtp.gmail.com with ESMTPSA id d205sm9248741qke.96.2019.10.21.11.19.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 11:19:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571737222; 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=7y6nv0e50eHEQGhtgSP4aadJRqZs4K4vv95D1n/RfD0=; b=UdG/IOdbLoUVu993b5L4Vv7p49KMHGB6QUAXdXHhgtlH6yfyyc/OBpNCp1ULlBM8hG+OQX qaY+bIb/Ie+1gmL9Pskbq3jWVmaWJ6C0o4hv2J5JXGyLVaMgtM4+XoqGzx1UegrJ0+HGxA dVw6wCGHlipIOXhPl5YbIWsoyEC9i8k= 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=KVmfd3s4iQkZPocHdIabbjhzfnPxM2ZDH9RP996JuEw=; b=Yd+NN0TFezbbxHNI6G6KEvzfOEK6HKyOA+4Ax8MyYwjypezBM6ej/uRAUDqeZDeJpR vdbnswJHE7q308FSOoqMPp9/43av/+dYtkPWXQ8EIh7kTSg5niy52izfFPqDPVbZMTpW dkh2qFCRiMHiIuT5VTJcjx9b09h0pYYTzFTpcRgCaD3bhjUBnkUp6PDaLT6qSEkCxDlD 3LVzFw2dLx96BShjotPxaV54J5Jsk23XmuX1wopbIUS1KxsMp0FEs1SZcyTbFe0VDAk+ Ico+pUpAfFp7rjgBkJkeiTmUN+3QaGg4ktcxP+AHqP5l9GnVB1jLhUwgn/AfxENfkvyk eWgA== X-Gm-Message-State: APjAAAWqMza/l2HmnvRnUJBRK6xBygSd28WgOfTwW3AmuSaIiff7wnl6 hdSgSNaLP8gAPwmZGlpkA8kwVZqa9JM= X-Google-Smtp-Source: APXvYqwy5sPi/je1dvBuyOerWyTHBp43TloDgs+vF9lg263zLTRv1awmjSn2Au0YIo5pENV06Kf7Sw== X-Received: by 2002:a37:4a91:: with SMTP id x139mr24026141qka.103.1571681981398; Mon, 21 Oct 2019 11:19:41 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 15:19:02 -0300 Message-Id: <20191021181911.14986-13-danielhb413@gmail.com> In-Reply-To: <20191021181911.14986-1-danielhb413@gmail.com> References: <20191021181911.14986-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.62]); Mon, 21 Oct 2019 18:19:42 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.62]); Mon, 21 Oct 2019 18:19:42 +0000 (UTC) for IP:'209.85.222.195' DOMAIN:'mail-qk1-f195.google.com' HELO:'mail-qk1-f195.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.15 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS) 209.85.222.195 mail-qk1-f195.google.com 209.85.222.195 mail-qk1-f195.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.62 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 12/21] vz_sdk.c: remove unneeded cleanup label 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.13 X-MC-Unique: QqI7thjGM-ab0np65PicXQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza Reviewed-by: J=C3=A1n Tomko --- src/vz/vz_sdk.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index e7c1676df9..d76eae24c9 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -4841,7 +4841,6 @@ int prlsdkMigrate(virDomainObjPtr dom, virURIPtr uri, const char *dname, unsigned int flags) { - int ret =3D -1; vzDomObjPtr privdom =3D dom->privateData; PRL_HANDLE job =3D PRL_INVALID_HANDLE; char uuidstr[VIR_UUID_STRING_BRACED_BUFLEN]; @@ -4861,12 +4860,9 @@ int prlsdkMigrate(virDomainObjPtr dom, virURIPtr uri, ); =20 if (PRL_FAILED(waitDomainJob(job, dom))) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 int prlsdkSetCpuCount(virDomainObjPtr dom, unsigned int count) --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 9 02:14:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 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=1571737036; cv=none; d=zoho.com; s=zohoarc; b=g0H7TgGnX5AjuCvR+VzDgjaz5a4XGo+MALlW+wLk0knJckaxPeKohZtsWOXyGIn+VUSJYprTG5eZle9R+g1boQYwagFk9lGlK9JMkFb2/hXIWGwJYtJH7aW7qYEjiBuizKDF/lIySHWR3ZYk4/RwrnYQ0y4q0Y6bZZvaE/oiLl0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571737036; 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=VS4/gcOgKyLY4xMy5r9WfMV6RewkuWHbcnJGVyxSdaw=; b=ej4iFDV3TgLUy+MHQxdY291Y2XcIjp3q57mC3FO+zL+NYVmTAYn8zICD+YwYymkIvqoYjVI4XNoNCTeFoyTCpAEVVgJUt+mxmppmai9o4BhDdhHz9CuXxQZME8tLGi0jnP92FxN3GmJDb1Z/h9AE7Kx8yL1IOGOa8uZ4XQgRgOI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1571737036281356.2428585801763; Tue, 22 Oct 2019 02:37:16 -0700 (PDT) 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-279-l4jOa3b0P4G8OHdgrwVlAg-1; Tue, 22 Oct 2019 05:37:12 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 36D43107AD36; Tue, 22 Oct 2019 09:37:07 +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 0D81B19C4F; Tue, 22 Oct 2019 09:37:07 +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 A929B1A503; Tue, 22 Oct 2019 09:37:06 +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 x9LIJjfF000628 for ; Mon, 21 Oct 2019 14:19:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 384345C54A; Mon, 21 Oct 2019 18:19:45 +0000 (UTC) Received: from mx1.redhat.com (ext-mx15.extmail.prod.ext.phx2.redhat.com [10.5.110.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 30BF55C3F8 for ; Mon, 21 Oct 2019 18:19:44 +0000 (UTC) Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 05FAB30860DB for ; Mon, 21 Oct 2019 18:19:44 +0000 (UTC) Received: by mail-qt1-f196.google.com with SMTP id c21so22432798qtj.12 for ; Mon, 21 Oct 2019 11:19:43 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:7979:d16f:4e5e:8e8d:1141]) by smtp.gmail.com with ESMTPSA id d205sm9248741qke.96.2019.10.21.11.19.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 11:19:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571737035; 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=VS4/gcOgKyLY4xMy5r9WfMV6RewkuWHbcnJGVyxSdaw=; b=YNFdDza4mENGly1N/OxZKv/8bHW6kDgyp9rVb112sZCIJHa7+Q8qIqbkN/LzzdvuMHyNUq OeBpCqCe8rx3xC+sk3qXVfuCYwWg59od/xnRbMZRqBXwPTJaiopbVPO3KH72+72gdLOKK9 DLzm98QnwrycUyCntxuPtYI8cxE438w= 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=jTjZ4+joZ5lKj7zgjiRr3H2q2Q/FNVSgyYmUzzz6kuc=; b=dyl7vrQ//8h6UGFCP+B3JHwP50YtYuov6RJgsftxR/4Y/WEB0VwcJ5vhXIWf/Pr5Gl /iL0gfb7mPSiPhWOmsnsr2RIbkE0b0HdCbDV6hl/tbUIwxmJTMIg6fvLyNgWwWue94T9 1KvJ/cL+VTfyE+tyz1nFNPO2bv6lUhPymt5tnAsC0BoCYYtD/OzFTH81xR9IrpYaHz5f YdOV4P85FXlcKvFg9deDauK1bjJnpRs4/OtpkDPHvc8QA6RfZB9HoC/p2Nz5zQZAEH8K ng5Tzusg++0WxAUjtXYt3rf1LQ3YB1dLk8890s42agO/V2wcC2hClJRe8K5swHPw8ROs mKjA== X-Gm-Message-State: APjAAAV0ewjl2Zbs5gfkKXHxTAQv4yVl94xuo7XAhKxY3l4X5G/vu93f BMSdvc/EDoPO+4/q3pSbDxwbzgQS8r0= X-Google-Smtp-Source: APXvYqzbVH/YpPq816s70CWEnuirH4cuJMS5hYjAzZwrUXI84zOYMzZKkgiLb7BdmuCf9aGqvNPokw== X-Received: by 2002:ac8:d04:: with SMTP id q4mr25500638qti.76.1571681983063; Mon, 21 Oct 2019 11:19:43 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 15:19:03 -0300 Message-Id: <20191021181911.14986-14-danielhb413@gmail.com> In-Reply-To: <20191021181911.14986-1-danielhb413@gmail.com> References: <20191021181911.14986-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Mon, 21 Oct 2019 18:19:44 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Mon, 21 Oct 2019 18:19:44 +0000 (UTC) for IP:'209.85.160.196' DOMAIN:'mail-qt1-f196.google.com' HELO:'mail-qt1-f196.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.131 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS) 209.85.160.196 mail-qt1-f196.google.com 209.85.160.196 mail-qt1-f196.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.44 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 13/21] vbox: 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.84 on 10.5.11.23 X-MC-Unique: l4jOa3b0P4G8OHdgrwVlAg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza --- src/vbox/vbox_common.c | 12 +++--- src/vbox/vbox_snapshot_conf.c | 75 +++++++++++++++-------------------- 2 files changed, 36 insertions(+), 51 deletions(-) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 475b3a3147..5ea9ef627d 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -2202,21 +2202,21 @@ static int vboxDomainCreateWithFlags(virDomainPtr d= om, unsigned int flags) int ret =3D -1; =20 if (!data->vboxObj) - return ret; + return -1; =20 virCheckFlags(0, -1); =20 if (!dom->name) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Error while reading the domain name")); - goto cleanup; + return -1; } =20 rc =3D gVBoxAPI.UArray.vboxArrayGet(&machines, data->vboxObj, ARRAY_GE= T_MACHINES); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not get list of machines, rc=3D%08x"), (un= signed)rc); - goto cleanup; + return -1; } =20 for (i =3D 0; i < machines.count; ++i) { @@ -2260,7 +2260,6 @@ static int vboxDomainCreateWithFlags(virDomainPtr dom= , unsigned int flags) /* Do the cleanup and take care you dont leak any memory */ gVBoxAPI.UArray.vboxArrayRelease(&machines); =20 - cleanup: return ret; } =20 @@ -2755,13 +2754,13 @@ static int vboxDomainGetInfo(virDomainPtr dom, virD= omainInfoPtr info) int ret =3D -1; =20 if (!data->vboxObj) - return ret; + return -2; =20 rc =3D gVBoxAPI.UArray.vboxArrayGet(&machines, data->vboxObj, ARRAY_GE= T_MACHINES); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not get list of machines, rc=3D%08x"), (un= signed)rc); - goto cleanup; + return -1; } =20 info->nrVirtCpu =3D 0; @@ -2823,7 +2822,6 @@ static int vboxDomainGetInfo(virDomainPtr dom, virDom= ainInfoPtr info) =20 gVBoxAPI.UArray.vboxArrayRelease(&machines); =20 - cleanup: return ret; } =20 diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c index 8cdfb35357..eafdc577e3 100644 --- a/src/vbox/vbox_snapshot_conf.c +++ b/src/vbox/vbox_snapshot_conf.c @@ -753,18 +753,17 @@ virVBoxSnapshotConfAddSnapshotToXmlMachine(virVBoxSna= pshotConfSnapshotPtr snapsh virVBoxSnapshotConfMachinePtr m= achine, const char *snapshotParentName) { - int ret =3D -1; virVBoxSnapshotConfSnapshotPtr parentSnapshot =3D NULL; =20 if (snapshot =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Snapshot is Null")); - goto cleanup; + return -1; } if (machine =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Machine is Null")); - goto cleanup; + return -1; } =20 /*If parent is NULL and the machine has no snapshot yet, @@ -774,32 +773,29 @@ virVBoxSnapshotConfAddSnapshotToXmlMachine(virVBoxSna= pshotConfSnapshotPtr snapsh virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to add this snapshot, there is alread= y a snapshot " "linked to the machine")); - goto cleanup; + return -1; } machine->snapshot =3D snapshot; - ret =3D 0; - goto cleanup; + return 0; } else { if (machine->snapshot =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("The machine has no snapshot and it should ha= ve it")); - goto cleanup; + return -1; } parentSnapshot =3D virVBoxSnapshotConfSnapshotByName(machine->snap= shot, snapshotParentName); if (parentSnapshot =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to find the snapshot %s"), snapshotPa= rentName); - goto cleanup; + return -1; } if (VIR_EXPAND_N(parentSnapshot->children, parentSnapshot->nchildr= en, 1) < 0) - goto cleanup; + return -1; =20 parentSnapshot->children[parentSnapshot->nchildren - 1] =3D snapsh= ot; - ret =3D 0; } =20 - cleanup: - return ret; + return 0; } =20 /* @@ -813,18 +809,17 @@ virVBoxSnapshotConfAddHardDiskToMediaRegistry(virVBox= SnapshotConfHardDiskPtr har virVBoxSnapshotConfMediaRegi= stryPtr mediaRegistry, const char *parentHardDiskId) { - int ret =3D -1; size_t i =3D 0; virVBoxSnapshotConfHardDiskPtr parentDisk =3D NULL; if (hardDisk =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Hard disk is null")); - goto cleanup; + return -1; } if (mediaRegistry =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Media Registry is null")); - goto cleanup; + return -1; } =20 for (i =3D 0; i < mediaRegistry->ndisks; i++) { @@ -835,19 +830,17 @@ virVBoxSnapshotConfAddHardDiskToMediaRegistry(virVBox= SnapshotConfHardDiskPtr har if (parentDisk =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to get the parent disk")); - goto cleanup; + return -1; } /*Hard disk found*/ if (VIR_EXPAND_N(parentDisk->children, parentDisk->nchildren, 1) < 0) - goto cleanup; + return -1; =20 parentDisk->children[parentDisk->nchildren - 1] =3D hardDisk; if (hardDisk->parent =3D=3D NULL) hardDisk->parent =3D parentDisk; - ret =3D 0; =20 - cleanup: - return ret; + return 0; } =20 /* @@ -860,48 +853,47 @@ int virVBoxSnapshotConfRemoveSnapshot(virVBoxSnapshotConfMachinePtr machine, const char *snapshotName) { - int ret =3D -1; size_t i =3D 0; virVBoxSnapshotConfSnapshotPtr snapshot =3D NULL; virVBoxSnapshotConfSnapshotPtr parentSnapshot =3D NULL; if (machine =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("machine is null")); - goto cleanup; + return -1; } if (snapshotName =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("snapshotName is null")); - goto cleanup; + return -1; } if (machine->snapshot =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("the machine has no snapshot")); - goto cleanup; + return -1; } snapshot =3D virVBoxSnapshotConfSnapshotByName(machine->snapshot, snap= shotName); if (snapshot =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to find the snapshot with name %s"), snap= shotName); - goto cleanup; + return -1; } if (snapshot->nchildren > 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("This snapshot has children, " "please delete theses snapshots before")); - goto cleanup; + return -1; } =20 if (snapshot->parent =3D=3D NULL) { if (machine->snapshot !=3D snapshot) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("You are trying to remove a snapshot which do= es not exists")); - goto cleanup; + return -1; } machine->snapshot =3D NULL; virVBoxSnapshotConfSnapshotFree(snapshot); - ret =3D 0; - goto cleanup; + + return 0; } parentSnapshot =3D snapshot->parent; =20 @@ -909,11 +901,9 @@ virVBoxSnapshotConfRemoveSnapshot(virVBoxSnapshotConfM= achinePtr machine, while (i < parentSnapshot->nchildren && parentSnapshot->children[i] != =3D snapshot) ++i; if (VIR_DELETE_ELEMENT(parentSnapshot->children, i, parentSnapshot->nc= hildren) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 /* @@ -926,19 +916,18 @@ int virVBoxSnapshotConfRemoveHardDisk(virVBoxSnapshotConfMediaRegistryPtr medi= aRegistry, const char *uuid) { - int ret =3D -1; size_t i =3D 0; virVBoxSnapshotConfHardDiskPtr hardDisk =3D NULL; virVBoxSnapshotConfHardDiskPtr parentHardDisk =3D NULL; if (mediaRegistry =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Media registry is null")); - goto cleanup; + return -1; } if (uuid =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Uuid is null")); - goto cleanup; + return -1; } =20 for (i =3D 0; i < mediaRegistry->ndisks; i++) { @@ -949,7 +938,7 @@ virVBoxSnapshotConfRemoveHardDisk(virVBoxSnapshotConfMe= diaRegistryPtr mediaRegis if (hardDisk =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to find the hard disk with uuid %s"), uui= d); - goto cleanup; + return -1; } if (hardDisk->parent =3D=3D NULL) { /* it means that the hard disk is in 'root' */ @@ -958,9 +947,9 @@ virVBoxSnapshotConfRemoveHardDisk(virVBoxSnapshotConfMe= diaRegistryPtr mediaRegis break; } if (VIR_DELETE_ELEMENT(mediaRegistry->disks, i, mediaRegistry->ndi= sks) < 0) - goto cleanup; - ret =3D 0; - goto cleanup; + return -1; + + return 0; } =20 parentHardDisk =3D hardDisk->parent; @@ -969,11 +958,9 @@ virVBoxSnapshotConfRemoveHardDisk(virVBoxSnapshotConfM= ediaRegistryPtr mediaRegis ++i; hardDisk->parent =3D NULL; if (VIR_DELETE_ELEMENT(parentHardDisk->children, i, parentHardDisk->nc= hildren) < 0) - goto cleanup; - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 /*vboxSnapshotSaveVboxFile: Create a VirtualBox XML file from a vboxSnapsh= otXmlMachinePtr. --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 9 02:14:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 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=1571737043; cv=none; d=zoho.com; s=zohoarc; b=NFccf62Pp5uKWsv5Ao57KhCzf/DvB11YWXXyufaz4anUa0aPZOsaL7PvkNbVZ5QYxMlFHOKwmodleLGpUySrY26xy+ZXwBwfM0AvO/9bbi45xxqVzfWzZrKp0BChvcLA31GfkW5Hsk1TVb/p1MazkkokHipMgjMkJXMG7+Ce/kc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571737043; 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=xXMqqTvZTv7wVZp9NkErlI7IWpdXWD1GdystYvf0kLI=; b=cBGjGZgcCjfEx5pUlCE8+qWL4bV8WkXtlGH0ct6KSbCgIdVRb9KMC5DhpZZ8bHMAbbzPNEgPhK8CG4IejHHRdcWi2rxgtPn/A4y5I7ieCPv7l2piYBroB6Z8AmuaC+nMU4zdU8qqk5usuxMbHwNlDmYgN8kE8uNL5VZ0d5i3nfk= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 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 [207.211.31.81]) by mx.zohomail.com with SMTPS id 1571737043457493.57479218585763; Tue, 22 Oct 2019 02:37:23 -0700 (PDT) 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-45-eaFIMD4bM0OLRVJy4BZ5Bw-1; Tue, 22 Oct 2019 05:37:19 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B51045E9; Tue, 22 Oct 2019 09:37:14 +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 81A651001B30; Tue, 22 Oct 2019 09:37:14 +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 3A82318198F0; Tue, 22 Oct 2019 09:37:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9LIJnZe000663 for ; Mon, 21 Oct 2019 14:19:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id 184235D6B0; Mon, 21 Oct 2019 18:19:49 +0000 (UTC) Received: from mx1.redhat.com (ext-mx26.extmail.prod.ext.phx2.redhat.com [10.5.110.67]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 117835D6A5 for ; Mon, 21 Oct 2019 18:19:49 +0000 (UTC) Received: from mail-qk1-f196.google.com (mail-qk1-f196.google.com [209.85.222.196]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0FD738980FB for ; Mon, 21 Oct 2019 18:19:46 +0000 (UTC) Received: by mail-qk1-f196.google.com with SMTP id e66so13550172qkf.13 for ; Mon, 21 Oct 2019 11:19:46 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:7979:d16f:4e5e:8e8d:1141]) by smtp.gmail.com with ESMTPSA id d205sm9248741qke.96.2019.10.21.11.19.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 11:19:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571737042; 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=xXMqqTvZTv7wVZp9NkErlI7IWpdXWD1GdystYvf0kLI=; b=LErPfR1aFkyKnBukcMO575N+oWK21WZZPTGGdb9bGpOwSXGJvYflf3Be1spsSyNkuYfN3Z n47Qo1zEPBvYpifStirlPoGHEsDoyGNhDYvZzRGRBs3gY+RcZZW2C95omGB3Mp+XkBIMSz j7FqKABjMotPOg031te8wVS+uMyPoiU= 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=2ina47l5iiWzv/f+a2OduqhlNKySs/BTNY/Ws49c6pc=; b=NEd3I3JSFFsfqQDybQCE8UyTgkqffmxnF10G+pF4bOmD6vZ4fq2NheY1Oz8w0zfrvl 5zfOCqAvnZzWYymNBMkFwzx+/iIGsQZ/YifW/42bTQZQiBr57Ank3IPSpMYk6bzdG9Eo Ti8Yo5r/YmMuoieIBGeedZbbJr1E0ah0OuTk1PWBa4OwWtpS+CgNeEuo8kdMFtFaIsj9 w5Q+fZ+GZIo/7Y2g+/tdwe6TUr9CBce6hzPgj4pBsMTbwVdniB3xmpWXgihx+0KL+3U6 dbjzxjRJu0PVmGs6DwiIPNMVv3ltCBHPDZooqkEuueVJuFf/Fq3j23wwLOTO5GThmwIQ Wi4w== X-Gm-Message-State: APjAAAXWlg2T7bUt1Lvjf5GuNtVTpzzUSHE56IRzy8/ge2MHSb/3+YJ7 1hz0vOy2tpVm/nMe2/VLBVVatz2O920= X-Google-Smtp-Source: APXvYqwPflrkiy5opHbap8hRx/DFrivhunRjokkcTXhCsQPGaUdp0YYzXru6HAGeDx0NKKVTEif7Tg== X-Received: by 2002:a37:a50a:: with SMTP id o10mr23384354qke.115.1571681984404; Mon, 21 Oct 2019 11:19:44 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 15:19:04 -0300 Message-Id: <20191021181911.14986-15-danielhb413@gmail.com> In-Reply-To: <20191021181911.14986-1-danielhb413@gmail.com> References: <20191021181911.14986-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.67]); Mon, 21 Oct 2019 18:19:47 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.67]); Mon, 21 Oct 2019 18:19:47 +0000 (UTC) for IP:'209.85.222.196' DOMAIN:'mail-qk1-f196.google.com' HELO:'mail-qk1-f196.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.15 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS) 209.85.222.196 mail-qk1-f196.google.com 209.85.222.196 mail-qk1-f196.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.67 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 14/21] util: 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.84 on 10.5.11.22 X-MC-Unique: eaFIMD4bM0OLRVJy4BZ5Bw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza Reviewed-by: J=C3=A1n Tomko --- src/util/vircgroupv1.c | 18 ++++--------- src/util/vircommand.c | 11 +++----- src/util/virdbus.c | 30 +++++++-------------- src/util/virfile.c | 19 +++++-------- src/util/virhash.c | 6 ++--- src/util/virhostcpu.c | 20 ++++++-------- src/util/virhostdev.c | 7 ++--- src/util/virhostmem.c | 55 +++++++++++++------------------------- src/util/virjson.c | 30 +++++++++------------ src/util/virmacmap.c | 10 +++---- src/util/virnetdevbridge.c | 21 +++++---------- src/util/virnuma.c | 27 +++++++------------ src/util/virpci.c | 7 ++--- src/util/virprocess.c | 19 +++++-------- src/util/virresctrl.c | 7 ++--- src/util/virstoragefile.c | 46 +++++++++++-------------------- src/util/virutil.c | 19 ++++++------- 17 files changed, 117 insertions(+), 235 deletions(-) diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index 0820c5d638..d70e910b4c 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -708,7 +708,6 @@ virCgroupV1AddTask(virCgroupPtr group, pid_t pid, unsigned int flags) { - int ret =3D -1; size_t i; =20 for (i =3D 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { @@ -724,12 +723,10 @@ virCgroupV1AddTask(virCgroupPtr group, continue; =20 if (virCgroupSetValueI64(group, i, "tasks", pid) < 0) - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -1845,18 +1842,13 @@ static int virCgroupV1AllowAllDevices(virCgroupPtr group, int perms) { - int ret =3D -1; - if (virCgroupV1AllowDevice(group, 'b', -1, -1, perms) < 0) - goto cleanup; + return -1; =20 if (virCgroupV1AllowDevice(group, 'c', -1, -1, perms) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 223a2a824e..240a670ea1 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -405,8 +405,6 @@ virCommandHandshakeChild(virCommandPtr cmd) static int virExecCommon(virCommandPtr cmd, gid_t *groups, int ngroups) { - int ret =3D -1; - if (cmd->uid !=3D (uid_t)-1 || cmd->gid !=3D (gid_t)-1 || cmd->capabilities || (cmd->flags & VIR_EXEC_CLEAR_CAPS)) { VIR_DEBUG("Setting child uid:gid to %d:%d with caps %llx", @@ -414,7 +412,7 @@ virExecCommon(virCommandPtr cmd, gid_t *groups, int ngr= oups) if (virSetUIDGIDWithCaps(cmd->uid, cmd->gid, groups, ngroups, cmd->capabilities, !!(cmd->flags & VIR_EXEC_CLEAR_CAPS)) < 0) - goto cleanup; + return -1; } =20 if (cmd->pwd) { @@ -422,13 +420,10 @@ virExecCommon(virCommandPtr cmd, gid_t *groups, int n= groups) if (chdir(cmd->pwd) < 0) { virReportSystemError(errno, _("Unable to change to %s"), cmd->pwd); - goto cleanup; + return -1; } } - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 # ifdef __linux__ diff --git a/src/util/virdbus.c b/src/util/virdbus.c index 89c9cb3e24..e44d2bc6a1 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -1194,7 +1194,6 @@ int virDBusMessageDecodeArgs(DBusMessage* msg, va_list args) { DBusMessageIter iter; - int ret =3D -1; =20 if (!dbus_message_iter_init(msg, &iter)) { if (*types !=3D '\0') { @@ -1202,15 +1201,12 @@ int virDBusMessageDecodeArgs(DBusMessage* msg, _("No args present for signature %s"), types); } else { - ret =3D 0; + return 0; } - goto cleanup; + return -1; } =20 - ret =3D virDBusMessageIterDecode(&iter, types, args); - - cleanup: - return ret; + return virDBusMessageIterDecode(&iter, types, args); } =20 =20 @@ -1399,25 +1395,21 @@ int virDBusCreateMethodV(DBusMessage **call, const char *types, va_list args) { - int ret =3D -1; - if (!(*call =3D dbus_message_new_method_call(destination, path, iface, member))) { virReportOOMError(); - goto cleanup; + return -1; } =20 if (virDBusMessageEncodeArgs(*call, types, args) < 0) { virDBusMessageUnref(*call); *call =3D NULL; - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -1471,22 +1463,18 @@ int virDBusCreateReplyV(DBusMessage **reply, const char *types, va_list args) { - int ret =3D -1; - if (!(*reply =3D dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN))) { virReportOOMError(); - goto cleanup; + return -1; } =20 if (virDBusMessageEncodeArgs(*reply, types, args) < 0) { virDBusMessageUnref(*reply); *reply =3D NULL; - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 diff --git a/src/util/virfile.c b/src/util/virfile.c index c4d544be73..10526dc644 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3610,27 +3610,25 @@ int virFileGetHugepageSize(const char *path, unsigned long long *size) { - int ret =3D -1; struct statfs fs; =20 if (statfs(path, &fs) < 0) { virReportSystemError(errno, _("cannot determine filesystem for '%s'"), path); - goto cleanup; + return -1; } =20 if (fs.f_type !=3D HUGETLBFS_MAGIC) { virReportError(VIR_ERR_INTERNAL_ERROR, _("not a hugetlbfs mount: '%s'"), path); - goto cleanup; + return -1; } =20 *size =3D fs.f_bsize / 1024; /* we are storing size in KiB */ - ret =3D 0; - cleanup: - return ret; + + return 0; } =20 # define PROC_MEMINFO "/proc/meminfo" @@ -3802,12 +3800,11 @@ virFileSetupDev(const char *path, { const unsigned long mount_flags =3D MS_NOSUID; const char *mount_fs =3D "tmpfs"; - int ret =3D -1; =20 if (virFileMakePath(path) < 0) { virReportSystemError(errno, _("Failed to make path %s"), path); - goto cleanup; + return -1; } =20 VIR_DEBUG("Mount devfs on %s type=3Dtmpfs flags=3D0x%lx, opts=3D%s", @@ -3816,12 +3813,10 @@ virFileSetupDev(const char *path, virReportSystemError(errno, _("Failed to mount devfs on %s type %s (%s)"), path, mount_fs, mount_options); - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 diff --git a/src/util/virhash.c b/src/util/virhash.c index 05a3b803f2..1df7f6efca 100644 --- a/src/util/virhash.c +++ b/src/util/virhash.c @@ -646,15 +646,13 @@ virHashForEach(virHashTablePtr table, virHashIterator= iter, void *data) ret =3D iter(entry->payload, entry->name, data); =20 if (ret < 0) - goto cleanup; + return ret; =20 entry =3D next; } } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index d544d36c61..5a7b61e0d7 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -776,7 +776,6 @@ virHostCPUGetStatsLinux(FILE *procstat, virNodeCPUStatsPtr params, int *nparams) { - int ret =3D -1; char line[1024]; unsigned long long usr, ni, sys, idle, iowait; unsigned long long irq, softirq, steal, guest, guest_nice; @@ -785,15 +784,14 @@ virHostCPUGetStatsLinux(FILE *procstat, if ((*nparams) =3D=3D 0) { /* Current number of cpu stats supported by linux */ *nparams =3D LINUX_NB_CPU_STATS; - ret =3D 0; - goto cleanup; + return 0; } =20 if ((*nparams) !=3D LINUX_NB_CPU_STATS) { virReportInvalidArg(*nparams, _("nparams in %s must be equal to %d"), __FUNCTION__, LINUX_NB_CPU_STATS); - goto cleanup; + return -1; } =20 if (cpuNum =3D=3D VIR_NODE_CPU_STATS_ALL_CPUS) { @@ -816,22 +814,21 @@ virHostCPUGetStatsLinux(FILE *procstat, =20 if (virHostCPUStatsAssign(¶ms[0], VIR_NODE_CPU_STATS_KERNE= L, (sys + irq + softirq) * TICK_TO_NSEC= ) < 0) - goto cleanup; + return -1; =20 if (virHostCPUStatsAssign(¶ms[1], VIR_NODE_CPU_STATS_USER, (usr + ni) * TICK_TO_NSEC) < 0) - goto cleanup; + return -1; =20 if (virHostCPUStatsAssign(¶ms[2], VIR_NODE_CPU_STATS_IDLE, idle * TICK_TO_NSEC) < 0) - goto cleanup; + return -1; =20 if (virHostCPUStatsAssign(¶ms[3], VIR_NODE_CPU_STATS_IOWAI= T, iowait * TICK_TO_NSEC) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - goto cleanup; + return 0; } } =20 @@ -839,8 +836,7 @@ virHostCPUGetStatsLinux(FILE *procstat, _("Invalid cpuNum in %s"), __FUNCTION__); =20 - cleanup: - return ret; + return 0; } =20 =20 diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index 010eb551a9..c35b6ff3b6 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -80,7 +80,6 @@ struct virHostdevIsPCINodeDeviceUsedData { static int virHostdevIsPCINodeDeviceUsed(virPCIDeviceAddressPtr devAddr, v= oid *opaque) { virPCIDevicePtr actual; - int ret =3D -1; struct virHostdevIsPCINodeDeviceUsedData *helperData =3D opaque; =20 actual =3D virPCIDeviceListFindByIDs(helperData->mgr->activePCIHostdev= s, @@ -106,12 +105,10 @@ static int virHostdevIsPCINodeDeviceUsed(virPCIDevice= AddressPtr devAddr, void *o virReportError(VIR_ERR_OPERATION_INVALID, _("PCI device %s is in use"), virPCIDeviceGetName(actual)); - goto cleanup; + return -1; } iommu_owner: - ret =3D 0; - cleanup: - return ret; + return 0; } =20 static int virHostdevManagerOnceInit(void) diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c index c1dfc1225c..0918ede7c2 100644 --- a/src/util/virhostmem.c +++ b/src/util/virhostmem.c @@ -142,7 +142,6 @@ virHostMemGetStatsLinux(FILE *meminfo, virNodeMemoryStatsPtr params, int *nparams) { - int ret =3D -1; size_t i =3D 0, j =3D 0, k =3D 0; int found =3D 0; int nr_param; @@ -169,15 +168,14 @@ virHostMemGetStatsLinux(FILE *meminfo, if ((*nparams) =3D=3D 0) { /* Current number of memory stats supported by linux */ *nparams =3D nr_param; - ret =3D 0; - goto cleanup; + return 0; } =20 if ((*nparams) !=3D nr_param) { virReportInvalidArg(nparams, _("nparams in %s must be %d"), __FUNCTION__, nr_param); - goto cleanup; + return -1; } =20 while (fgets(line, sizeof(line), meminfo) !=3D NULL) { @@ -200,7 +198,7 @@ virHostMemGetStatsLinux(FILE *meminfo, if (p =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no prefix found")); - goto cleanup; + return -1; } p++; } @@ -219,7 +217,7 @@ virHostMemGetStatsLinux(FILE *meminfo, if (virStrcpyStatic(param->field, convp->field) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Field kernel memory too long f= or destination")); - goto cleanup; + return -1; } param->value =3D val; found++; @@ -233,13 +231,10 @@ virHostMemGetStatsLinux(FILE *meminfo, if (found =3D=3D 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no available memory line found")); - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } #endif =20 @@ -620,14 +615,12 @@ static int virHostMemGetInfoFake(unsigned long long *mem, unsigned long long *freeMem) { - int ret =3D -1; - if (mem) { double total =3D physmem_total(); if (!total) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot determine free memory")); - goto cleanup; + return -1; } =20 *mem =3D (unsigned long long) total; @@ -639,15 +632,13 @@ virHostMemGetInfoFake(unsigned long long *mem, if (!avail) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot determine free memory")); - goto cleanup; + return -1; } =20 *freeMem =3D (unsigned long long) avail; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -658,7 +649,6 @@ virHostMemGetCellsFree(unsigned long long *freeMems, { unsigned long long mem; int n, lastCell, numCells; - int ret =3D -1; int maxCell; =20 if (!virNumaIsAvailable()) @@ -672,7 +662,7 @@ virHostMemGetCellsFree(unsigned long long *freeMems, virReportError(VIR_ERR_INTERNAL_ERROR, _("start cell %d out of range (0-%d)"), startCell, maxCell); - goto cleanup; + return -1; } lastCell =3D startCell + maxCells - 1; if (lastCell > maxCell) @@ -683,10 +673,7 @@ virHostMemGetCellsFree(unsigned long long *freeMems, =20 freeMems[numCells++] =3D mem; } - ret =3D numCells; - - cleanup: - return ret; + return numCells; } =20 int @@ -734,7 +721,6 @@ virHostMemGetFreePages(unsigned int npages, unsigned int cellCount, unsigned long long *counts) { - int ret =3D -1; int cell, lastCell; size_t i, ncounts =3D 0; =20 @@ -745,7 +731,7 @@ virHostMemGetFreePages(unsigned int npages, virReportError(VIR_ERR_INTERNAL_ERROR, _("start cell %d out of range (0-%d)"), startCell, lastCell); - goto cleanup; + return -1; } =20 lastCell =3D MIN(lastCell, startCell + (int) cellCount - 1); @@ -756,7 +742,7 @@ virHostMemGetFreePages(unsigned int npages, unsigned long long page_free; =20 if (virNumaGetPageInfo(cell, page_size, 0, NULL, &page_free) <= 0) - goto cleanup; + return -1; =20 counts[ncounts++] =3D page_free; } @@ -765,12 +751,10 @@ virHostMemGetFreePages(unsigned int npages, if (!ncounts) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no suitable info found")); - goto cleanup; + return -1; } =20 - ret =3D ncounts; - cleanup: - return ret; + return ncounts; } =20 int @@ -781,7 +765,6 @@ virHostMemAllocPages(unsigned int npages, unsigned int cellCount, bool add) { - int ret =3D -1; int cell, lastCell; size_t i, ncounts =3D 0; =20 @@ -792,7 +775,7 @@ virHostMemAllocPages(unsigned int npages, virReportError(VIR_ERR_INTERNAL_ERROR, _("start cell %d out of range (0-%d)"), startCell, lastCell); - goto cleanup; + return -1; } =20 lastCell =3D MIN(lastCell, startCell + (int) cellCount - 1); @@ -803,13 +786,11 @@ virHostMemAllocPages(unsigned int npages, unsigned long long page_count =3D pageCounts[i]; =20 if (virNumaSetPagePoolSize(cell, page_size, page_count, add) <= 0) - goto cleanup; + return -1; =20 ncounts++; } } =20 - ret =3D ncounts; - cleanup: - return ret; + return ncounts; } diff --git a/src/util/virjson.c b/src/util/virjson.c index eb6207f13f..1b1be81a1a 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -160,7 +160,6 @@ virJSONValueObjectAddVArgs(virJSONValuePtr obj, { char type; char *key; - int ret =3D -1; int rc; =20 while ((key =3D va_arg(args, char *)) !=3D NULL) { @@ -169,7 +168,7 @@ virJSONValueObjectAddVArgs(virJSONValuePtr obj, virReportError(VIR_ERR_INTERNAL_ERROR, _("argument key '%s' is too short, missing type= prefix"), key); - goto cleanup; + return -1; } =20 type =3D key[0]; @@ -187,7 +186,7 @@ virJSONValueObjectAddVArgs(virJSONValuePtr obj, virReportError(VIR_ERR_INTERNAL_ERROR, _("argument key '%s' must not have null val= ue"), key); - goto cleanup; + return -1; } rc =3D virJSONValueObjectAppendString(obj, key, val); } break; @@ -202,7 +201,7 @@ virJSONValueObjectAddVArgs(virJSONValuePtr obj, virReportError(VIR_ERR_INTERNAL_ERROR, _("argument key '%s' must not be negative"), key); - goto cleanup; + return -1; } =20 if (!val && (type =3D=3D 'z' || type =3D=3D 'y')) @@ -231,7 +230,7 @@ virJSONValueObjectAddVArgs(virJSONValuePtr obj, virReportError(VIR_ERR_INTERNAL_ERROR, _("argument key '%s' must not be negative"), key); - goto cleanup; + return -1; } =20 if (!val && (type =3D=3D 'Z' || type =3D=3D 'Y')) @@ -296,7 +295,7 @@ virJSONValueObjectAddVArgs(virJSONValuePtr obj, virReportError(VIR_ERR_INTERNAL_ERROR, _("argument key '%s' must not have null val= ue"), key); - goto cleanup; + return -1; } =20 if ((rc =3D virJSONValueObjectAppend(obj, key, *val)) =3D=3D 0) @@ -315,11 +314,11 @@ virJSONValueObjectAddVArgs(virJSONValuePtr obj, virReportError(VIR_ERR_INTERNAL_ERROR, _("argument key '%s' must not have null val= ue"), key); - goto cleanup; + return -1; } =20 if (!(jsonMap =3D virJSONValueNewArrayFromBitmap(map))) - goto cleanup; + return -1; =20 if ((rc =3D virJSONValueObjectAppend(obj, key, jsonMap)) < 0) virJSONValueFree(jsonMap); @@ -328,23 +327,18 @@ virJSONValueObjectAddVArgs(virJSONValuePtr obj, default: virReportError(VIR_ERR_INTERNAL_ERROR, _("unsupported data type '%c' for arg '%s'"), t= ype, key - 2); - goto cleanup; + return -1; } =20 if (rc < 0) - goto cleanup; + return -1; } =20 /* verify that we added at least one key-value pair */ - if (virJSONValueObjectKeysNumber(obj) =3D=3D 0) { - ret =3D 0; - goto cleanup; - } - - ret =3D 1; + if (virJSONValueObjectKeysNumber(obj) =3D=3D 0) + return 0; =20 - cleanup: - return ret; + return 1; } =20 =20 diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c index 43cefc1e8e..ee8633281b 100644 --- a/src/util/virmacmap.c +++ b/src/util/virmacmap.c @@ -85,22 +85,18 @@ virMacMapAddLocked(virMacMapPtr mgr, const char *domain, const char *mac) { - int ret =3D -1; char **macsList =3D NULL; =20 if ((macsList =3D virHashLookup(mgr->macs, domain)) && virStringListHasString((const char**) macsList, mac)) { - ret =3D 0; - goto cleanup; + return 0; } =20 if (virStringListAdd(&macsList, mac) < 0 || virHashUpdateEntry(mgr->macs, domain, macsList) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index edf4cc6236..5dca8fdfae 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -274,16 +274,13 @@ virNetDevBridgePortGetLearning(const char *brname, const char *ifname, bool *enable) { - int ret =3D -1; unsigned long value; =20 if (virNetDevBridgePortGet(brname, ifname, "learning", &value) < 0) - goto cleanup; + return -1; =20 *enable =3D !!value; - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -301,16 +298,13 @@ virNetDevBridgePortGetUnicastFlood(const char *brname, const char *ifname, bool *enable) { - int ret =3D -1; unsigned long value; =20 if (virNetDevBridgePortGet(brname, ifname, "unicast_flood", &value) < = 0) - goto cleanup; + return -1; =20 *enable =3D !!value; - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -863,16 +857,13 @@ int virNetDevBridgeGetVlanFiltering(const char *brname, bool *enable) { - int ret =3D -1; unsigned long value; =20 if (virNetDevBridgeGet(brname, "vlan_filtering", &value) < 0) - goto cleanup; + return -1; =20 *enable =3D !!value; - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 diff --git a/src/util/virnuma.c b/src/util/virnuma.c index 448833d8d1..761770979b 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -93,7 +93,6 @@ virNumaSetupMemoryPolicy(virDomainNumatuneMemMode mode, { nodemask_t mask; int node =3D -1; - int ret =3D -1; int bit =3D 0; size_t i; int maxnode =3D 0; @@ -140,7 +139,7 @@ virNumaSetupMemoryPolicy(virDomainNumatuneMemMode mode, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("NUMA memory tuning in 'preferred' mode= " "only supports single node")); - goto cleanup; + return -1; } =20 numa_set_bind_policy(0); @@ -155,10 +154,8 @@ virNumaSetupMemoryPolicy(virDomainNumatuneMemMode mode, case VIR_DOMAIN_NUMATUNE_MEM_LAST: break; } - ret =3D 0; =20 - cleanup: - return ret; + return 0; } =20 bool @@ -466,7 +463,6 @@ virNumaGetDistances(int node, int **distances, int *ndistances) { - int ret =3D -1; int max_node; size_t i; =20 @@ -478,10 +474,10 @@ virNumaGetDistances(int node, } =20 if ((max_node =3D virNumaGetMaxNode()) < 0) - goto cleanup; + return -1; =20 if (VIR_ALLOC_N(*distances, max_node + 1) < 0) - goto cleanup; + return -1; =20 *ndistances =3D max_node + 1; =20 @@ -492,9 +488,7 @@ virNumaGetDistances(int node, (*distances)[i] =3D numa_distance(node, i); } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 #else /* !(WITH_NUMACTL && HAVE_NUMA_BITMASK_ISBITSET) */ @@ -689,7 +683,6 @@ virNumaGetPageInfo(int node, unsigned long long *page_avail, unsigned long long *page_free) { - int ret =3D -1; long system_page_size =3D virGetSystemPageSize(); =20 /* sysconf() returns page size in bytes, @@ -701,10 +694,10 @@ virNumaGetPageInfo(int node, * account. The problem is huge pages cut off regular memory. */ if (node =3D=3D -1) { if (virHostMemGetInfo(&memsize, &memfree) < 0) - goto cleanup; + return -1; } else { if (virNumaGetNodeMemory(node, &memsize, &memfree) < 0) - goto cleanup; + return -1; } =20 /* see description above */ @@ -717,12 +710,10 @@ virNumaGetPageInfo(int node, *page_free =3D memfree / system_page_size; } else { if (virNumaGetHugePageInfo(node, page_size, page_avail, page_free)= < 0) - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 diff --git a/src/util/virpci.c b/src/util/virpci.c index f9e39e79d8..a39c2be29f 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1908,18 +1908,15 @@ virPCIDeviceAddressGetIOMMUGroupAddresses(virPCIDev= iceAddressPtr devAddr, virPCIDeviceAddressPtr **iommuGr= oupDevices, size_t *nIommuGroupDevices) { - int ret =3D -1; virPCIDeviceAddressList addrList =3D { iommuGroupDevices, nIommuGroupDevices }; =20 if (virPCIDeviceAddressIOMMUGroupIterate(devAddr, virPCIGetIOMMUGroupAddressesA= ddOne, &addrList) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 diff --git a/src/util/virprocess.c b/src/util/virprocess.c index b5fda05e0c..2073664303 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -349,7 +349,6 @@ int virProcessKillPainfullyDelay(pid_t pid, bool force, unsigned int extradela= y) { size_t i; - int ret =3D -1; /* This is in 1/5th seconds since polling is on a 0.2s interval */ unsigned int polldelay =3D (force ? 200 : 75) + (extradelay*5); const char *signame =3D "TERM"; @@ -393,10 +392,9 @@ virProcessKillPainfullyDelay(pid_t pid, bool force, un= signed int extradelay) virReportSystemError(errno, _("Failed to terminate process %lld w= ith SIG%s"), (long long)pid, signame); - goto cleanup; + return -1; } - ret =3D signum =3D=3D SIGTERM ? 0 : 1; - goto cleanup; /* process is dead */ + return signum =3D=3D SIGTERM ? 0 : 1; } =20 g_usleep(200 * 1000); @@ -406,8 +404,7 @@ virProcessKillPainfullyDelay(pid_t pid, bool force, uns= igned int extradelay) _("Failed to terminate process %lld with SIG%s"), (long long)pid, signame); =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -1183,23 +1180,19 @@ virProcessRunInFork(virProcessForkCallback cb, int virProcessSetupPrivateMountNS(void) { - int ret =3D -1; - if (unshare(CLONE_NEWNS) < 0) { virReportSystemError(errno, "%s", _("Cannot unshare mount namespace")); - goto cleanup; + return -1; } =20 if (mount("", "/", "none", MS_SLAVE|MS_REC, NULL) < 0) { virReportSystemError(errno, "%s", _("Failed to switch root mount into slave mod= e")); - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 #else /* !defined(HAVE_SYS_MOUNT_H) || !defined(HAVE_UNSHARE) */ diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index 29ea52a16f..90eee9e6b5 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -871,7 +871,6 @@ virResctrlInfoGetCache(virResctrlInfoPtr resctrl, virResctrlInfoPerLevelPtr i_level =3D NULL; virResctrlInfoPerTypePtr i_type =3D NULL; size_t i =3D 0; - int ret =3D -1; =20 if (virResctrlInfoIsEmpty(resctrl)) return 0; @@ -928,14 +927,12 @@ virResctrlInfoGetCache(virResctrlInfoPtr resctrl, memcpy((*controls)[*ncontrols - 1], &i_type->control, sizeof(i_typ= e->control)); } =20 - ret =3D 0; - cleanup: - return ret; + return 0; error: while (*ncontrols) VIR_FREE((*controls)[--*ncontrols]); VIR_FREE(*controls); - goto cleanup; + return -1; } =20 =20 diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index be2b5479bb..b640957bb3 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -601,11 +601,10 @@ vmdk4GetBackingStore(char **res, static const char prefix[] =3D "parentFileNameHint=3D\""; char *start, *end; size_t len; - int ret =3D BACKING_STORE_ERROR; g_autofree char *desc =3D NULL; =20 if (VIR_ALLOC_N(desc, VIR_STORAGE_MAX_HEADER) < 0) - goto cleanup; + return BACKING_STORE_ERROR; =20 *res =3D NULL; /* @@ -617,10 +616,9 @@ vmdk4GetBackingStore(char **res, */ *format =3D VIR_STORAGE_FILE_AUTO; =20 - if (buf_size <=3D 0x200) { - ret =3D BACKING_STORE_INVALID; - goto cleanup; - } + if (buf_size <=3D 0x200) + return BACKING_STORE_INVALID; + len =3D buf_size - 0x200; if (len > VIR_STORAGE_MAX_HEADER) len =3D VIR_STORAGE_MAX_HEADER; @@ -629,27 +627,21 @@ vmdk4GetBackingStore(char **res, start =3D strstr(desc, prefix); if (start =3D=3D NULL) { *format =3D VIR_STORAGE_FILE_NONE; - ret =3D BACKING_STORE_OK; - goto cleanup; + return BACKING_STORE_OK; } start +=3D strlen(prefix); end =3D strchr(start, '"'); - if (end =3D=3D NULL) { - ret =3D BACKING_STORE_INVALID; - goto cleanup; - } + if (end =3D=3D NULL) + return BACKING_STORE_INVALID; + if (end =3D=3D start) { *format =3D VIR_STORAGE_FILE_NONE; - ret =3D BACKING_STORE_OK; - goto cleanup; + return BACKING_STORE_OK; } *end =3D '\0'; *res =3D g_strdup(start); =20 - ret =3D BACKING_STORE_OK; - - cleanup: - return ret; + return BACKING_STORE_OK; } =20 static int @@ -2391,20 +2383,15 @@ virStorageSourceInitChainElement(virStorageSourcePt= r newelem, virStorageSourcePtr old, bool transferLabels) { - int ret =3D -1; - if (transferLabels && !newelem->seclabels && virStorageSourceSeclabelsCopy(newelem, old) < 0) - goto cleanup; + return -1; =20 newelem->shared =3D old->shared; newelem->readonly =3D old->readonly; =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -3440,7 +3427,6 @@ virStorageSourceParseBackingJSONRBD(virStorageSourceP= tr src, virJSONValuePtr servers =3D virJSONValueObjectGetArray(json, "server"); size_t nservers; size_t i; - int ret =3D -1; =20 src->type =3D VIR_STORAGE_TYPE_NETWORK; src->protocol =3D VIR_STORAGE_NET_PROTOCOL_RBD; @@ -3465,20 +3451,18 @@ virStorageSourceParseBackingJSONRBD(virStorageSourc= ePtr src, nservers =3D virJSONValueArraySize(servers); =20 if (VIR_ALLOC_N(src->hosts, nservers) < 0) - goto cleanup; + return -1; =20 src->nhosts =3D nservers; =20 for (i =3D 0; i < nservers; i++) { if (virStorageSourceParseBackingJSONInetSocketAddress(src->hos= ts + i, virJSONV= alueArrayGet(servers, i)) < 0) - goto cleanup; + return -1; } } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 static int diff --git a/src/util/virutil.c b/src/util/virutil.c index f2528e257c..8862a6b800 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1331,7 +1331,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *gro= ups, int ngroups, unsigned long long capBits, bool clearExistingCaps) { size_t i; - int capng_ret, ret =3D -1; + int capng_ret; bool need_setgid =3D false; bool need_setuid =3D false; bool need_setpcap =3D false; @@ -1383,7 +1383,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *gro= ups, int ngroups, if (prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0)) { virReportSystemError(errno, "%s", _("prctl failed to set KEEPCAPS")); - goto cleanup; + return -1; } =20 /* Change to the temp capabilities */ @@ -1401,18 +1401,18 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *g= roups, int ngroups, } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot apply process capabilities %d"), capn= g_ret); - goto cleanup; + return -1; } } =20 if (virSetUIDGID(uid, gid, groups, ngroups) < 0) - goto cleanup; + return -1; =20 /* Tell it we are done keeping capabilities */ if (prctl(PR_SET_KEEPCAPS, 0, 0, 0, 0)) { virReportSystemError(errno, "%s", _("prctl failed to reset KEEPCAPS")); - goto cleanup; + return -1; } =20 # ifdef PR_CAP_AMBIENT @@ -1430,7 +1430,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *gro= ups, int ngroups, _("prctl failed to enable '%s' in the= " "AMBIENT set"), capstr); - goto cleanup; + return -1; } } } @@ -1454,13 +1454,10 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *g= roups, int ngroups, if (((capng_ret =3D capng_apply(CAPNG_SELECT_CAPS)) < 0)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot apply process capabilities %d"), capng_re= t); - ret =3D -1; - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 #else --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 9 02:14:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 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=1571737226; cv=none; d=zoho.com; s=zohoarc; b=mDP0LyX+EYdjzANNBve2J+d3LXCj8WdnVy/Iv+AU46+B/CV9B0cD6a3y2wLUCDSK+B9b7sv+DjE8Z4QFSqbtRxhskHs2c5ig3q+y2Kh0WgFmQ4qbogq+Id2e2vkPIqiklWDt5QL+J5NPyrY1lQOemMs7mwHKibevUSX7mhUE/GU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571737226; 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=H5ck2plF2UGzl/6bj1r33ovlVd3PQOcjeMkcarnzn/Q=; b=TBmrBXr8FwX9bY6M7mWBnVuyHrh/osWh0NwoM6qYt7cFr63mA7Yf5j3hCyzQPV6jg+ofibyLPxOmSirzUHr3XW0Mi96kfJNU1g+9kbMr93HVdTEC9paaNSuO2GjBSgA/0mLn7GShf6G1w7AJiI42I8tgc/gGPwsFo/kuZ0PKjUg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571737226538723.8945322668684; Tue, 22 Oct 2019 02:40:26 -0700 (PDT) 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-78-mP1oXM7UPm-DPX9lwgBVYg-1; Tue, 22 Oct 2019 05:40:23 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D825F1800D79; Tue, 22 Oct 2019 09:40:18 +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 B394E100164D; Tue, 22 Oct 2019 09:40:18 +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 6D9228354D; Tue, 22 Oct 2019 09:40:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9LIJl99000648 for ; Mon, 21 Oct 2019 14:19:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8764760C4E; Mon, 21 Oct 2019 18:19:47 +0000 (UTC) Received: from mx1.redhat.com (ext-mx22.extmail.prod.ext.phx2.redhat.com [10.5.110.63]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8072060BE2 for ; Mon, 21 Oct 2019 18:19:47 +0000 (UTC) Received: from mail-qk1-f196.google.com (mail-qk1-f196.google.com [209.85.222.196]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DE3AD18CCF0F for ; Mon, 21 Oct 2019 18:19:46 +0000 (UTC) Received: by mail-qk1-f196.google.com with SMTP id y81so9683398qkb.7 for ; Mon, 21 Oct 2019 11:19:46 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:7979:d16f:4e5e:8e8d:1141]) by smtp.gmail.com with ESMTPSA id d205sm9248741qke.96.2019.10.21.11.19.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 11:19:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571737225; 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=H5ck2plF2UGzl/6bj1r33ovlVd3PQOcjeMkcarnzn/Q=; b=GYlmiRH3BkHh43KJcz387C5vukbr7R3oOqez39ix+Elf1RqonieXZWj5swOucycgZBdhg+ NO1m3olz1yGpFtBTXEIPqcaQpM8vinX7AtZMoN9QWq1I5hx7a84RLqlKfqEKdnB38dqpIQ 4EEHjA6MH06bP/SdvIaTFlxuB/LvIFo= 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=P0o8WAXfTBGo8duyiuWRIItsBWj4S6VkHa8biKkVUhI=; b=aGIe9Mod95F6TPqmbzBUcxadHPfen/2orBY/SM2XUbAs4eLLOAS+YQoRj3iux+WoS2 USxhX9n8B35ooIr0eWonyNeT5w9ai+d1ZaD+4n8tVo2Ej/F+GlymjPM5Ke/04HEJ9oJ2 /JvSNEaRpZGR8yaDPGMhaZK+MPKh2R2//GF20juR1YPFWt5fePNZ8u9XZ9sL8FWGnXhX ipmPtz+z7e3ZkkXAeHFyPtTucwg4sOomDRpKLoOaaQQtkmFfxS3K6aaXYaEUAXEt9xEL WhXrhZPdtYoTBGmo6NfexmiGpTkY+1qHggcRaE8jMFz7x2u0DQQcLKxLrWMwBFn5MbT2 pQDA== X-Gm-Message-State: APjAAAUV+jRyZZ/2QXEiz72Sqnc8BbnQfWVd7gn49pHUbMfxnuObu1re jSgfwbHAodN0Ihu+Wwy9ImWguAgnEs8= X-Google-Smtp-Source: APXvYqzc0te5dT19AUj75p4uHCjDvHSYqIbZsAnXc1Jrtwe+YpZG8kA/27DxEfkbe/et4k2SsTWfhA== X-Received: by 2002:ae9:df07:: with SMTP id t7mr22136580qkf.58.1571681986053; Mon, 21 Oct 2019 11:19:46 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 15:19:05 -0300 Message-Id: <20191021181911.14986-16-danielhb413@gmail.com> In-Reply-To: <20191021181911.14986-1-danielhb413@gmail.com> References: <20191021181911.14986-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.63]); Mon, 21 Oct 2019 18:19:47 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.63]); Mon, 21 Oct 2019 18:19:47 +0000 (UTC) for IP:'209.85.222.196' DOMAIN:'mail-qk1-f196.google.com' HELO:'mail-qk1-f196.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.15 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS) 209.85.222.196 mail-qk1-f196.google.com 209.85.222.196 mail-qk1-f196.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.63 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 15/21] libvirt.c: remove unneeded cleanup label 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.84 on 10.5.11.22 X-MC-Unique: mP1oXM7UPm-DPX9lwgBVYg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza Reviewed-by: J=C3=A1n Tomko --- src/libvirt.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 33b43305a1..9d783761e6 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -796,22 +796,19 @@ static int virConnectGetDefaultURI(virConfPtr conf, char **name) { - int ret =3D -1; const char *defname =3D getenv("LIBVIRT_DEFAULT_URI"); if (defname && *defname) { VIR_DEBUG("Using LIBVIRT_DEFAULT_URI '%s'", defname); *name =3D g_strdup(defname); } else { if (virConfGetValueString(conf, "uri_default", name) < 0) - goto cleanup; + return -1; =20 if (*name) VIR_DEBUG("Using config file uri '%s'", *name); } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 9 02:14:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 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=1571737046; cv=none; d=zoho.com; s=zohoarc; b=QkexI7h4XIQbdZ8iB/udFTDvNWsAe6VBbffObnGUsuarzjkOB09U1OZHugd5kzK3BswLuI9yqcir5AKcH/XcJpYRFqGdN/gaOpDMqY6DOa5Tv1m/3BhuK6FKTMZTQaGPb1s33lzq6bh4Oy0VahhGSU/RzdD/8cskW5we5+vVsd8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571737046; 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=Vkcy+7aWW/TvcAx6ay7/bHJW9ahW6bwFCorW8jdaFDA=; b=hOYBEobyAhGkqeBCqdNUGBMSkSsj9JMq51zYEcktWjc6PGWwIhzOjgMuQr0HcI5x7ahPhQcGcTxTXbsnUq3RENkSHbOgzw339Pj28QwDSPCS1rmlQ9ZogDfyVgNCaXGqxzjgcdkdrZE5EsDXJXLj4ruDKg37AbUgJ1FWeypqw9E= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571737046473474.76898386812843; Tue, 22 Oct 2019 02:37:26 -0700 (PDT) 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-262-HvB0nQVWPJ6GkVUEzEYf3A-1; Tue, 22 Oct 2019 05:37:23 -0400 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 47B75800D57; Tue, 22 Oct 2019 09:37:18 +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 236235ED23; Tue, 22 Oct 2019 09:37:18 +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 D5E1518198F3; Tue, 22 Oct 2019 09:37:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9LIJn31000668 for ; Mon, 21 Oct 2019 14:19:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2EC335D6B0; Mon, 21 Oct 2019 18:19:49 +0000 (UTC) Received: from mx1.redhat.com (ext-mx24.extmail.prod.ext.phx2.redhat.com [10.5.110.65]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 29CD95D6A5 for ; Mon, 21 Oct 2019 18:19:49 +0000 (UTC) Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7723310BF01A for ; Mon, 21 Oct 2019 18:19:48 +0000 (UTC) Received: by mail-qk1-f173.google.com with SMTP id a194so9488967qkg.10 for ; Mon, 21 Oct 2019 11:19:48 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:7979:d16f:4e5e:8e8d:1141]) by smtp.gmail.com with ESMTPSA id d205sm9248741qke.96.2019.10.21.11.19.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 11:19:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571737045; 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=Vkcy+7aWW/TvcAx6ay7/bHJW9ahW6bwFCorW8jdaFDA=; b=iuzZctMk/Xd2Xm3CCW8NHs7XNq+b0jO0yHEV3rbtuoIHJJThBHexe9YCPuWd761v8HW6lF KGj6cDOXQhiaS93cB8sV1m0SepBexZSkLXFksiY9tvWyIi6LhgCBXiXQQn0J7hWJe9qDt4 SOiK4g9q53/5sLro3wwLhFrq0aRXDUM= 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=dUgU2s+C7RZuGvhu/Xs+M/K8ZkNFqRAFxO9nteRhWEs=; b=EIFz49Tt4NWhs4fHwVUNETPSKa1Oa0KHpDxwuXXYsAZOx2EgZyrLOe7PD95AQ6nLV9 My9MXMOdQB7iL/0FwCcx3tSVgbct3vUy2sQrqBzFE+cBBzqppy/hHHNzKb6tOjdi7c4C 2WH7JA0wwrC6d/fAadGJab3Tx+XxnQLwPkqAlmWsPKQtDydaVgREfQ9FHOJcvmveLwUN GrGGYQJPPkGXtaDf1+hxvf+qJ0gW0BZBebZM5794nPTky8eJXaZ2P177ajTUHajCxH3D hF5168CE7jxzbroRCjnxUVqrGIOR0ly5ah9UN7yfcmR9e9VokVWvWB8fTj3EYJ4bqDHW OpfQ== X-Gm-Message-State: APjAAAXrI8PySThz9EaWbT8Tu8U2km2IYNvvjiiG5UQHfrPgfXktgcxN fc/xCFPP4mfvlPfbI7OV20hqPwekAR8= X-Google-Smtp-Source: APXvYqx4t5cct8gDCxPNRwC1gNPTEqVhKrq2sxbqZyWlAAXOnu9OrohMXFRCmwaFEDPnHKjN87Aq/w== X-Received: by 2002:a37:a1c7:: with SMTP id k190mr24735007qke.167.1571681987568; Mon, 21 Oct 2019 11:19:47 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 15:19:06 -0300 Message-Id: <20191021181911.14986-17-danielhb413@gmail.com> In-Reply-To: <20191021181911.14986-1-danielhb413@gmail.com> References: <20191021181911.14986-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.65]); Mon, 21 Oct 2019 18:19:48 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.65]); Mon, 21 Oct 2019 18:19:48 +0000 (UTC) for IP:'209.85.222.173' DOMAIN:'mail-qk1-f173.google.com' HELO:'mail-qk1-f173.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.15 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS) 209.85.222.173 mail-qk1-f173.google.com 209.85.222.173 mail-qk1-f173.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.65 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 16/21] libxl_driver.c: remove unneeded cleanup label 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-MC-Unique: HvB0nQVWPJ6GkVUEzEYf3A-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza Reviewed-by: J=C3=A1n Tomko --- src/libxl/libxl_driver.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 5cc6b87b8c..267f2106b2 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -4066,7 +4066,6 @@ libxlDomainUpdateDeviceConfig(virDomainDefPtr vmdef, = virDomainDeviceDefPtr dev) { virDomainDiskDefPtr orig; virDomainDiskDefPtr disk; - int ret =3D -1; =20 switch (dev->type) { case VIR_DOMAIN_DEVICE_DISK: @@ -4074,31 +4073,28 @@ libxlDomainUpdateDeviceConfig(virDomainDefPtr vmdef= , virDomainDeviceDefPtr dev) if (!(orig =3D virDomainDiskByTarget(vmdef, disk->dst))) { virReportError(VIR_ERR_INVALID_ARG, _("target %s doesn't exist."), disk->dst); - goto cleanup; + return -1; } if (!(orig->device =3D=3D VIR_DOMAIN_DISK_DEVICE_CDROM)) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("this disk doesn't support update")); - goto cleanup; + return -1; } =20 if (virDomainDiskSetSource(orig, virDomainDiskGetSource(disk))= < 0) - goto cleanup; + return -1; virDomainDiskSetType(orig, virDomainDiskGetType(disk)); virDomainDiskSetFormat(orig, virDomainDiskGetFormat(disk)); if (virDomainDiskSetDriver(orig, virDomainDiskGetDriver(disk))= < 0) - goto cleanup; + return -1; break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("persistent update of device is not supported= ")); - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 9 02:14:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1571737185; cv=none; d=zoho.com; s=zohoarc; b=mGttOTF7Gs2Ifi3cybLH3qo9486r4Z6kvhVpgMwtgy9kxxcA7Ip50/l0PaYVmbNAlaxt8tpQVdJVw+mpNuuYu+rGUcCsrSwZshUOcNlGcNDHWbHgn8BQO50KZckRRioQ8AjhMooHm+qDOGmCy9fEEWvsMlHhr6h8pIyAtYRmJoU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571737185; 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=wPxyshNdiF5ynDKXFP6ij4bFcxWVTPSrL/liZ1eIgP8=; b=gJ6QtCYuZhcG1Plk3hCC+FaZAl23RznIl0PIiTYhcVwncBfwy7lYLIcT/fb734letYerHptunLUdnmuBFZiy7s+b7AZh5OwdKCmSMWHAXMZKmb/TYuKFgjUVrsTTwkMfPe5HNE5VFvyajx4IKAxIA1rDYB8IL7MbjvFpiNyQHS0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.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 1571737185196694.3216938174918; Tue, 22 Oct 2019 02:39:45 -0700 (PDT) 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-66-dMfFZc5NMBOtOtuJdkKwng-1; Tue, 22 Oct 2019 05:39:42 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 41DFA107AD31; Tue, 22 Oct 2019 09:39:36 +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 13FE55D6A9; Tue, 22 Oct 2019 09:39:36 +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 C87D41A504; Tue, 22 Oct 2019 09:39:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9LIJp9K000693 for ; Mon, 21 Oct 2019 14:19:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id 972B860C63; Mon, 21 Oct 2019 18:19:51 +0000 (UTC) Received: from mx1.redhat.com (ext-mx29.extmail.prod.ext.phx2.redhat.com [10.5.110.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8E68360C4E for ; Mon, 21 Oct 2019 18:19:51 +0000 (UTC) Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 581F91918676 for ; Mon, 21 Oct 2019 18:19:50 +0000 (UTC) Received: by mail-qt1-f194.google.com with SMTP id u22so22428308qtq.13 for ; Mon, 21 Oct 2019 11:19:50 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:7979:d16f:4e5e:8e8d:1141]) by smtp.gmail.com with ESMTPSA id d205sm9248741qke.96.2019.10.21.11.19.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 11:19:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571737184; 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=wPxyshNdiF5ynDKXFP6ij4bFcxWVTPSrL/liZ1eIgP8=; b=cYXaSwSMW9VzyvI8hvb/gYV34ophZJtueRdWi0qY5mbFxjy7pSa2KEtrDr/4xjTn4AqWrE eHOyQrw/RG0/OivSSCwizu/wjQQvJpXzAZTL8LuJukI0kamDZrMal8ozpo0V2cK1yYaWAA b/XfCVALbMnDRfkgSkGPK1neFbTWwQ4= 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=svozyyvaMZwe0pC3dxDy84LejiV/2DLYWya9YohE15w=; b=Ee6n/6hJX2PVECW872/G4f0yOMxOszKUzpPTdMnnwdVPoh5UmM/sSvEWG8O0doXM/B DBegP7gzzCY0KEY4SICqmMHwpZUcNli2JxARfZCd1Us6s4YWQE8yIa+jnGBWHub1VrKZ 1PCk28FUX6EWtb/EtJiPsSmrjn4Lax0OqBiSM0pGfEC3stoImVKv0F8Q1+yiOJRGSOF0 C6GHd90ljAy2NqqDTEiB6r48xpGBzeKudpzbUJUQdu2LmlkMwYKZM3LHKMrv3OFH5+0c ++TQMY4P5MGaq5sggAyCYIuTpLS756/xIG3B6gOQZy5igUkQaQX6ntMpZ4NbvpdJXyvt 7izQ== X-Gm-Message-State: APjAAAUUdtXmV3e8vIuPQfTieK+V45M5OSp+YIYs+1s62z45V11e0bV3 bwfDfm6AzoSbBKQtAOqIjxCtk4BMKY0= X-Google-Smtp-Source: APXvYqwH73A6tw/9EFblRE5eUnOjomK5mHmutqVo989Hijytqf4TMzBBGZ92HvPyz1beCHGhQd4y4w== X-Received: by 2002:ac8:730c:: with SMTP id x12mr14097784qto.193.1571681989160; Mon, 21 Oct 2019 11:19:49 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 15:19:07 -0300 Message-Id: <20191021181911.14986-18-danielhb413@gmail.com> In-Reply-To: <20191021181911.14986-1-danielhb413@gmail.com> References: <20191021181911.14986-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]); Mon, 21 Oct 2019 18:19:50 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]); Mon, 21 Oct 2019 18:19:50 +0000 (UTC) for IP:'209.85.160.194' DOMAIN:'mail-qt1-f194.google.com' HELO:'mail-qt1-f194.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.131 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS) 209.85.160.194 mail-qt1-f194.google.com 209.85.160.194 mail-qt1-f194.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.70 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 17/21] bridge_driver.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.15 X-MC-Unique: dMfFZc5NMBOtOtuJdkKwng-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza Reviewed-by: J=C3=A1n Tomko --- src/network/bridge_driver.c | 172 ++++++++++++++---------------------- 1 file changed, 68 insertions(+), 104 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index fcaa6a48ae..0ba7f91c20 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1010,7 +1010,7 @@ networkKillDaemon(pid_t pid, daemonName, pid, networkName, signame, virStrerror(errno, ebuf, sizeof(ebuf))); } - goto cleanup; + return ret; } /* NB: since networks have no reference count like * domains, there is no safe way to unlock the network @@ -1032,7 +1032,6 @@ networkKillDaemon(pid_t pid, VIR_WARN("Timed out waiting after SIG%s to %s process %d " "(network '%s')", signame, daemonName, pid, networkName); - cleanup: return ret; } =20 @@ -3205,19 +3204,15 @@ networkConnectListAllNetworks(virConnectPtr conn, unsigned int flags) { virNetworkDriverStatePtr driver =3D networkGetDriver(); - int ret =3D -1; =20 virCheckFlags(VIR_CONNECT_LIST_NETWORKS_FILTERS_ALL, -1); =20 if (virConnectListAllNetworksEnsureACL(conn) < 0) - goto cleanup; - - ret =3D virNetworkObjListExport(conn, driver->networks, nets, - virConnectListAllNetworksCheckACL, - flags); + return -1; =20 - cleanup: - return ret; + return virNetworkObjListExport(conn, driver->networks, nets, + virConnectListAllNetworksCheckACL, + flags); } =20 =20 @@ -3233,14 +3228,13 @@ networkConnectNetworkEventRegisterAny(virConnectPtr= conn, int ret =3D -1; =20 if (virConnectNetworkEventRegisterAnyEnsureACL(conn) < 0) - goto cleanup; + return -1; =20 if (virNetworkEventStateRegisterID(conn, driver->networkEventState, net, eventID, callback, opaque, freecb, &ret) < 0) ret =3D -1; =20 - cleanup: return ret; } =20 @@ -3250,20 +3244,16 @@ networkConnectNetworkEventDeregisterAny(virConnectP= tr conn, int callbackID) { virNetworkDriverStatePtr driver =3D networkGetDriver(); - int ret =3D -1; =20 if (virConnectNetworkEventDeregisterAnyEnsureACL(conn) < 0) - goto cleanup; + return -1; =20 if (virObjectEventStateDeregisterID(conn, driver->networkEventState, callbackID, true) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -3367,24 +3357,20 @@ static int networkBridgeNameValidate(virNetworkObjListPtr nets, virNetworkDefPtr def) { - int ret =3D -1; - if (def->bridge && !strstr(def->bridge, "%d")) { if (virNetworkObjBridgeInUse(nets, def->bridge, def->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("bridge name '%s' already in use."), def->bridge); - goto cleanup; + return -1; } } else { /* Allocate a bridge name */ if (networkFindUnusedBridgeName(nets, def) < 0) - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -4537,7 +4523,6 @@ networkAllocatePort(virNetworkObjPtr obj, virPortGroupDefPtr portgroup =3D NULL; virNetworkForwardIfDefPtr dev =3D NULL; size_t i; - int ret =3D -1; virNetDevVPortProfilePtr portprofile =3D NULL; =20 netdef =3D virNetworkObjGetDef(obj); @@ -4547,7 +4532,7 @@ networkAllocatePort(virNetworkObjPtr obj, virReportError(VIR_ERR_OPERATION_INVALID, _("network '%s' is not active"), netdef->name); - goto cleanup; + return -1; } =20 VIR_DEBUG("Interface port group %s", port->group); @@ -4561,7 +4546,7 @@ networkAllocatePort(virNetworkObjPtr obj, if (portgroup && portgroup->bandwidth && virNetDevBandwidthCopy(&port->bandwidth, portgroup->bandwidth) < 0) - goto cleanup; + return -1; } =20 if (port->vlan.nTags =3D=3D 0) { @@ -4572,7 +4557,7 @@ networkAllocatePort(virNetworkObjPtr obj, vlan =3D &netdef->vlan; =20 if (vlan && virNetDevVlanCopy(&port->vlan, vlan) < 0) - goto cleanup; + return -1; } =20 if (!port->trustGuestRxFilters) { @@ -4590,7 +4575,7 @@ networkAllocatePort(virNetworkObjPtr obj, netdef->virtPortProfile, portgroup ? portgroup->virtPortProfile : NULL) <= 0) { - goto cleanup; + return -1; } if (portprofile) { VIR_FREE(port->virtPortProfile); @@ -4618,18 +4603,18 @@ networkAllocatePort(virNetworkObjPtr obj, "'%s' which uses IP forwarding"), virNetDevVPortTypeToString(port->virtPortProfil= e->virtPortType), netdef->name); - goto cleanup; + return -1; } =20 if (networkPlugBandwidth(obj, &port->mac, port->bandwidth, &port->= class_id) < 0) - goto cleanup; + return -1; break; =20 case VIR_NETWORK_FORWARD_HOSTDEV: { port->plugtype =3D VIR_NETWORK_PORT_PLUG_TYPE_HOSTDEV_PCI; =20 if (networkCreateInterfacePool(netdef) < 0) - goto cleanup; + return -1; =20 /* pick first dev with 0 connections */ for (i =3D 0; i < netdef->forward.nifs; i++) { @@ -4643,7 +4628,7 @@ networkAllocatePort(virNetworkObjPtr obj, _("network '%s' requires exclusive access " "to interfaces, but none are available"), netdef->name); - goto cleanup; + return -1; } port->plug.hostdevpci.addr =3D dev->device.pci; port->plug.hostdevpci.driver =3D netdef->forward.driverName; @@ -4659,7 +4644,7 @@ networkAllocatePort(virNetworkObjPtr obj, "via PCI passthrough"), virNetDevVPortTypeToString(port->virtPortPr= ofile->virtPortType), netdef->name); - goto cleanup; + return -1; } } break; @@ -4683,12 +4668,12 @@ networkAllocatePort(virNetworkObjPtr obj, "'%s' which uses a bridge device"), virNetDevVPortTypeToString(port->virtPo= rtProfile->virtPortType), netdef->name); - goto cleanup; + return -1; } } =20 if (networkPlugBandwidth(obj, &port->mac, port->bandwidth, &po= rt->class_id) < 0) - goto cleanup; + return -1; break; } =20 @@ -4722,7 +4707,7 @@ networkAllocatePort(virNetworkObjPtr obj, "'%s' which uses a macvtap device"), virNetDevVPortTypeToString(port->virtPortPr= ofile->virtPortType), netdef->name); - goto cleanup; + return -1; } } =20 @@ -4734,12 +4719,12 @@ networkAllocatePort(virNetworkObjPtr obj, _("network '%s' uses a direct mode, but " "has no forward dev and no interface pool"), netdef->name); - goto cleanup; + return -1; } else { /* pick an interface from the pool */ =20 if (networkCreateInterfacePool(netdef) < 0) - goto cleanup; + return -1; =20 /* PASSTHROUGH mode, and PRIVATE Mode + 802.1Qbh both * require exclusive access to a device, so current @@ -4774,7 +4759,7 @@ networkAllocatePort(virNetworkObjPtr obj, _("network '%s' requires exclusive access " "to interfaces, but none are available"), netdef->name); - goto cleanup; + return -1; } port->plug.direct.linkdev =3D g_strdup(dev->device.dev); } @@ -4783,15 +4768,15 @@ networkAllocatePort(virNetworkObjPtr obj, case VIR_NETWORK_FORWARD_LAST: default: virReportEnumRangeError(virNetworkForwardType, netdef->forward.typ= e); - goto cleanup; + return -1; } =20 if (virNetworkObjMacMgrAdd(obj, driver->dnsmasqStateDir, port->ownername, &port->mac) < 0) - goto cleanup; + return -1; =20 if (virNetDevVPortProfileCheckComplete(port->virtPortProfile, true) < = 0) - goto cleanup; + return -1; =20 /* make sure that everything now specified for the device is * actually supported on this type of network. NB: network, @@ -4816,7 +4801,7 @@ networkAllocatePort(virNetworkObjPtr obj, "is requesting a vlan tag, but that is not " "supported for this type of network"), netdef->name); - goto cleanup; + return -1; } } =20 @@ -4827,7 +4812,7 @@ networkAllocatePort(virNetworkObjPtr obj, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("bandwidth settings are not supported " "for hostdev interfaces")); - goto cleanup; + return -1; } =20 netdef->connections++; @@ -4841,15 +4826,13 @@ networkAllocatePort(virNetworkObjPtr obj, netdef->connections--; if (dev) dev->connections--; - goto cleanup; + return -1; } networkLogAllocation(netdef, dev, &port->mac, true); =20 VIR_DEBUG("Port allocated"); =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -4869,7 +4852,6 @@ networkNotifyPort(virNetworkObjPtr obj, virNetworkDefPtr netdef; virNetworkForwardIfDefPtr dev =3D NULL; size_t i; - int ret =3D -1; =20 netdef =3D virNetworkObjGetDef(obj); =20 @@ -4877,14 +4859,14 @@ networkNotifyPort(virNetworkObjPtr obj, virReportError(VIR_ERR_OPERATION_INVALID, _("network '%s' is not active"), netdef->name); - goto cleanup; + return -1; } =20 switch (port->plugtype) { case VIR_NETWORK_PORT_PLUG_TYPE_NONE: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unexpectedly got a network port without a plug")= ); - goto cleanup; + return -1; =20 case VIR_NETWORK_PORT_PLUG_TYPE_NETWORK: case VIR_NETWORK_PORT_PLUG_TYPE_BRIDGE: @@ -4892,13 +4874,13 @@ networkNotifyPort(virNetworkObjPtr obj, if (!netdef->bridge) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unexpectedly got a network port without a ne= twork bridge")); - goto cleanup; + return -1; } break; =20 case VIR_NETWORK_PORT_PLUG_TYPE_DIRECT: if (networkCreateInterfacePool(netdef) < 0) - goto cleanup; + return -1; =20 /* find the matching interface and increment its connections */ for (i =3D 0; i < netdef->forward.nifs; i++) { @@ -4917,7 +4899,7 @@ networkNotifyPort(virNetworkObjPtr obj, "in use by network port '%s'"), netdef->name, port->plug.direct.linkdev, port->uuid); - goto cleanup; + return -1; } =20 /* PASSTHROUGH mode and PRIVATE Mode + 802.1Qbh both require @@ -4933,14 +4915,14 @@ networkNotifyPort(virNetworkObjPtr obj, _("network '%s' claims dev=3D'%s' is already in= " "use by a different port"), netdef->name, port->plug.direct.linkdev); - goto cleanup; + return -1; } break; =20 case VIR_NETWORK_PORT_PLUG_TYPE_HOSTDEV_PCI: =20 if (networkCreateInterfacePool(netdef) < 0) - goto cleanup; + return -1; =20 /* find the matching interface and increment its connections */ for (i =3D 0; i < netdef->forward.nifs; i++) { @@ -4962,7 +4944,7 @@ networkNotifyPort(virNetworkObjPtr obj, port->plug.hostdevpci.addr.bus, port->plug.hostdevpci.addr.slot, port->plug.hostdevpci.addr.function); - goto cleanup; + return -1; } =20 /* PASSTHROUGH mode, PRIVATE Mode + 802.1Qbh, and hostdev (PCI @@ -4978,7 +4960,7 @@ networkNotifyPort(virNetworkObjPtr obj, netdef->name, dev->device.pci.domain, dev->device.pci.bus, dev->device.pci.slot, dev->device.pci.function); - goto cleanup; + return -1; } =20 break; @@ -4986,7 +4968,7 @@ networkNotifyPort(virNetworkObjPtr obj, case VIR_NETWORK_PORT_PLUG_TYPE_LAST: default: virReportEnumRangeError(virNetworkPortPlugType, port->plugtype); - goto cleanup; + return -1; } =20 netdef->connections++; @@ -4999,13 +4981,11 @@ networkNotifyPort(virNetworkObjPtr obj, if (dev) dev->connections--; netdef->connections--; - goto cleanup; + return -1; } networkLogAllocation(netdef, dev, &port->mac, true); =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -5028,7 +5008,6 @@ networkReleasePort(virNetworkObjPtr obj, virNetworkDefPtr netdef; virNetworkForwardIfDefPtr dev =3D NULL; size_t i; - int ret =3D -1; =20 netdef =3D virNetworkObjGetDef(obj); =20 @@ -5041,7 +5020,7 @@ networkReleasePort(virNetworkObjPtr obj, case VIR_NETWORK_PORT_PLUG_TYPE_BRIDGE: if (networkUnplugBandwidth(obj, port->bandwidth, &port->class_id) < 0) - goto cleanup; + return -1; break; =20 case VIR_NETWORK_PORT_PLUG_TYPE_DIRECT: @@ -5050,7 +5029,7 @@ networkReleasePort(virNetworkObjPtr obj, _("network '%s' uses a direct mode, but " "has no forward dev and no interface pool"), netdef->name); - goto cleanup; + return -1; } =20 for (i =3D 0; i < netdef->forward.nifs; i++) { @@ -5067,7 +5046,7 @@ networkReleasePort(virNetworkObjPtr obj, _("network '%s' doesn't have dev=3D'%s' " "in use by domain"), netdef->name, port->plug.direct.linkdev); - goto cleanup; + return -1; } break; =20 @@ -5077,7 +5056,7 @@ networkReleasePort(virNetworkObjPtr obj, _("network '%s' uses a hostdev mode, but " "has no forward dev and no interface pool"), netdef->name); - goto cleanup; + return -1; } =20 for (i =3D 0; i < netdef->forward.nifs; i++) { @@ -5099,14 +5078,14 @@ networkReleasePort(virNetworkObjPtr obj, port->plug.hostdevpci.addr.bus, port->plug.hostdevpci.addr.slot, port->plug.hostdevpci.addr.function); - goto cleanup; + return -1; } break; =20 case VIR_NETWORK_PORT_PLUG_TYPE_LAST: default: virReportEnumRangeError(virNetworkPortPlugType, port->plugtype); - goto cleanup; + return -1; } =20 virNetworkObjMacMgrDel(obj, driver->dnsmasqStateDir, port->ownername, = &port->mac); @@ -5119,9 +5098,7 @@ networkReleasePort(virNetworkObjPtr obj, VIR_HOOK_SUBOP_BEGIN); networkLogAllocation(netdef, dev, &port->mac, false); =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -5152,7 +5129,6 @@ networkCheckBandwidth(virNetworkObjPtr obj, virMacAddrPtr ifaceMac, unsigned long long *new_rate) { - int ret =3D -1; virNetworkDefPtr def =3D virNetworkObjGetDef(obj); virNetDevBandwidthPtr netBand =3D def->bandwidth; unsigned long long tmp_floor_sum =3D virNetworkObjGetFloorSum(obj); @@ -5201,7 +5177,7 @@ networkCheckBandwidth(virNetworkObjPtr obj, tmp_floor_sum, netBand->in->peak, def->name); - goto cleanup; + return -1; } } else if (tmp_floor_sum > netBand->in->average) { /* tmp_floor_sum can be between 'average' and 'peak' iff 'peak' is= set. @@ -5215,15 +5191,13 @@ networkCheckBandwidth(virNetworkObjPtr obj, tmp_floor_sum, netBand->in->average, def->name); - goto cleanup; + return -1; } =20 if (new_rate) *new_rate =3D tmp_new_rate; - ret =3D 0; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -5266,20 +5240,19 @@ networkPlugBandwidthImpl(virNetworkObjPtr obj, unsigned long long tmp_floor_sum =3D virNetworkObjGetFloorSum(obj); ssize_t next_id =3D 0; int plug_ret; - int ret =3D -1; =20 /* generate new class_id */ if ((next_id =3D networkNextClassID(obj)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not generate next class ID")); - goto cleanup; + return -1; } =20 plug_ret =3D virNetDevBandwidthPlug(def->bridge, def->bandwidth, mac, ifaceBand, next_id); if (plug_ret < 0) { ignore_value(virNetDevBandwidthUnplug(def->bridge, next_id)); - goto cleanup; + return -1; } =20 /* QoS was set, generate new class ID */ @@ -5294,7 +5267,7 @@ networkPlugBandwidthImpl(virNetworkObjPtr obj, virNetworkObjSetFloorSum(obj, tmp_floor_sum); *class_id =3D 0; ignore_value(virNetDevBandwidthUnplug(def->bridge, next_id)); - goto cleanup; + return -1; } /* update rate for non guaranteed NICs */ new_rate -=3D tmp_floor_sum; @@ -5303,9 +5276,7 @@ networkPlugBandwidthImpl(virNetworkObjPtr obj, VIR_WARN("Unable to update rate for 1:2 class on %s bridge", def->bridge); =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -5315,7 +5286,6 @@ networkPlugBandwidth(virNetworkObjPtr obj, virNetDevBandwidthPtr ifaceBand, unsigned int *class_id) { - int ret =3D -1; int plug_ret; unsigned long long new_rate =3D 0; char ifmac[VIR_MAC_STRING_BUFLEN]; @@ -5323,24 +5293,19 @@ networkPlugBandwidth(virNetworkObjPtr obj, if ((plug_ret =3D networkCheckBandwidth(obj, ifaceBand, NULL, mac, &new_rate)) < 0) { /* helper reported error */ - goto cleanup; + return -1; } =20 - if (plug_ret > 0) { + if (plug_ret > 0) /* no QoS needs to be set; claim success */ - ret =3D 0; - goto cleanup; - } + return 0; =20 virMacAddrFormat(mac, ifmac); =20 if (networkPlugBandwidthImpl(obj, mac, ifaceBand, class_id, new_rate) = < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -5360,7 +5325,7 @@ networkUnplugBandwidth(virNetworkObjPtr obj, if (!def->bandwidth || !def->bandwidth->in) { VIR_WARN("Network %s has no bandwidth but unplug requested", def->name); - goto cleanup; + return 0; } /* we must remove class from bridge */ new_rate =3D def->bandwidth->in->average; @@ -5370,7 +5335,7 @@ networkUnplugBandwidth(virNetworkObjPtr obj, =20 ret =3D virNetDevBandwidthUnplug(def->bridge, *class_id); if (ret < 0) - goto cleanup; + return ret; /* update sum of 'floor'-s of attached NICs */ tmp_floor_sum -=3D ifaceBand->in->floor; virNetworkObjSetFloorSum(obj, tmp_floor_sum); @@ -5383,7 +5348,7 @@ networkUnplugBandwidth(virNetworkObjPtr obj, tmp_floor_sum +=3D ifaceBand->in->floor; virNetworkObjSetFloorSum(obj, tmp_floor_sum); ignore_value(virBitmapSetBit(classIdMap, *class_id)); - goto cleanup; + return ret; } /* update rate for non guaranteed NICs */ new_rate -=3D tmp_floor_sum; @@ -5395,7 +5360,6 @@ networkUnplugBandwidth(virNetworkObjPtr obj, *class_id =3D 0; } =20 - cleanup: return ret; } =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 9 02:14:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1571737056; cv=none; d=zoho.com; s=zohoarc; b=FSzLLpDCvepaPMqDyIUfIT2iuDXoVlYQznlM36Gmi4wSQMwtqggY8MSCYXR9X3aiwIfbmG0i6HNhWxT8bTEUur0HEJBttiHnvNSQu75xWJvsjRbvO/OnIx7KEsA0Y5stl7Zgzo1cncYzKEoX8xwG87VOP7Dl0XzZ475FrOhcfbs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571737056; 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=M0Q/wZIsGh6IcrylrB3RdO6SWxGNBHthUMrOLbMpUOE=; b=f0REvzgGNTo6DzIa82SBIPvbKAWj0boptGrJOFV7uy76ojPcEEaNFbYKlUJ7sHc1mc4rdIcaywMgWME4Rh5Lx7ZFQazd5fMNC8eOE+Fj84ZqxZ7WheDjJk5N24rNwfACuNyWCeLODox948PXqsAzSJZnRj61iVRLzsyvOFKMXIw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.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-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1571737056524806.214184159176; Tue, 22 Oct 2019 02:37:36 -0700 (PDT) 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-76-ix-E6BSEPGObKNaIkz4x4w-1; Tue, 22 Oct 2019 05:37:34 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5E9AC107AD33; Tue, 22 Oct 2019 09:37:29 +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 3536A60C80; Tue, 22 Oct 2019 09:37:29 +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 E5AFC1A50B; Tue, 22 Oct 2019 09:37:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9LIJqqI000698 for ; Mon, 21 Oct 2019 14:19:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3C4C360BE2; Mon, 21 Oct 2019 18:19:52 +0000 (UTC) Received: from mx1.redhat.com (ext-mx14.extmail.prod.ext.phx2.redhat.com [10.5.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3662B60C5D for ; Mon, 21 Oct 2019 18:19:52 +0000 (UTC) Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 98E453090FE3 for ; Mon, 21 Oct 2019 18:19:51 +0000 (UTC) Received: by mail-qk1-f194.google.com with SMTP id e66so13550534qkf.13 for ; Mon, 21 Oct 2019 11:19:51 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:7979:d16f:4e5e:8e8d:1141]) by smtp.gmail.com with ESMTPSA id d205sm9248741qke.96.2019.10.21.11.19.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 11:19:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571737055; 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=M0Q/wZIsGh6IcrylrB3RdO6SWxGNBHthUMrOLbMpUOE=; b=C0jzSY25A9Fq1QXhgszifp5sfleJxuAHapKhC47Oydv7NqU61ylnmbOFBEwJWvVLJCM10M 5Y72x3g2/MIxl3okcZwMALFwFrDXGZQnTz3WRClPUovp/iRya2p0GfESayHDIGea/TYdIm vV3d60xyf5G0meoQ39ub3vHoL8BKr44= 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=JWMmB4abFQ/iEFRKIq0qDbGTjwbfuSfmWH4+nOQ7tBA=; b=gfbXp8gkYedH42wjSBuZsNHlxE32SgYu9+w/LHKpOgJSo5SpPaXPfNH/86s2P3xQgK oFNXp7FHE6IhLZdr1CD+vlIxjWqbL+/jrTEh8R38w/i8hr1L4SahbgTwQEbo4u2sAVH3 M2iWLGduhORR4ofpLAmaoAaaiO82a1XuPKlPCKwkkGY8Sw9kIPrmHg6YC51zlQBihL7i cmmpPTHZh+V2hYH34CZEI4vqJGZAQVdUghz/GoAoXti2ZSa+31I91+xcWEq7I+AuU1WC ssA0AefvqPoCmphQ7o6IQ9sdw9EbOfPcG13EadtmXsnqMtBs3mvdeRxt1MNSKqft/eBP bEbw== X-Gm-Message-State: APjAAAXKuAoR2oCa8W0D5ygq6z9ozt0c14WZ7HklXWweMgUUJEEsoKgT MBemnXEvf+ZAGUqsE2bCTq48Zo6G3Is= X-Google-Smtp-Source: APXvYqw9485FphkZZUeyfCBm92tVOPQoDMfQkY+3wZs8h8JdC5KVkQ9rv+OvBeDAXfFCx+X4VeDO3A== X-Received: by 2002:a05:620a:1211:: with SMTP id u17mr23643163qkj.310.1571681990686; Mon, 21 Oct 2019 11:19:50 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 15:19:08 -0300 Message-Id: <20191021181911.14986-19-danielhb413@gmail.com> In-Reply-To: <20191021181911.14986-1-danielhb413@gmail.com> References: <20191021181911.14986-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Mon, 21 Oct 2019 18:19:51 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Mon, 21 Oct 2019 18:19:51 +0000 (UTC) for IP:'209.85.222.194' DOMAIN:'mail-qk1-f194.google.com' HELO:'mail-qk1-f194.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.15 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS) 209.85.222.194 mail-qk1-f194.google.com 209.85.222.194 mail-qk1-f194.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.43 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 18/21] suspend.c: remove unneeded cleanup label 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.12 X-MC-Unique: ix-E6BSEPGObKNaIkz4x4w-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza Reviewed-by: J=C3=A1n Tomko --- examples/c/domain/suspend.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/examples/c/domain/suspend.c b/examples/c/domain/suspend.c index af61129ecc..322f0d60df 100644 --- a/examples/c/domain/suspend.c +++ b/examples/c/domain/suspend.c @@ -86,7 +86,6 @@ parse_argv(int argc, char *argv[], const char **dom_name, unsigned int *seconds) { - int ret =3D -1; int arg; unsigned long val; char *p; @@ -116,12 +115,12 @@ parse_argv(int argc, char *argv[], val =3D strtoul(optarg, &p, 10); if (errno || *p || p =3D=3D optarg) { ERROR("Invalid number: '%s'", optarg); - goto cleanup; + return -1; } *seconds =3D val; if (*seconds !=3D val) { ERROR("Integer overflow: %ld", val); - goto cleanup; + return -1; } break; case ':': @@ -142,9 +141,7 @@ parse_argv(int argc, char *argv[], if (argc > optind) *dom_name =3D argv[optind]; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 static int --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 9 02:14:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 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=1571737060; cv=none; d=zoho.com; s=zohoarc; b=JYcOWs/f6e5J7UIdKtt/E++644KDLgezsRRAmr3W7/v5qH2fqNyQuTNmFel/dnoSheFSZkapfDacZ/7CTzFR90TbmAD76sLBRJFOjZGl971hTqFLhuEz0wegddEXYbBDzV4KrA3UYocsT/OezBX5gOBd+ujukxH9GpN7490JLBI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571737060; 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=gDWse5MRTzZE72+etqwCbeRttS41ARYLuaWsZ+CLeUE=; b=ici+Sjo6wZ9JbUDaonzXMGNVqj2YgT7Lw5nv4HqDz7uOThsZDJeFFED5FKt65cvwA6YuPqzcWQIgKrSNQSzHMvCal7lnHyQHGbdalI4DnHhvpBNt8TILxCMhT964QlwYgFIZjOMmm4qYqeDz4NUhmKEplV98QE9olJh6nZY1KxU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 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 [207.211.31.81]) by mx.zohomail.com with SMTPS id 1571737060343351.4541889464666; Tue, 22 Oct 2019 02:37:40 -0700 (PDT) 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-367-ozjeYWiEMtiPitfr7KZEdA-1; Tue, 22 Oct 2019 05:37:37 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C8DAF107AD35; Tue, 22 Oct 2019 09:37:32 +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 A77D35D6B0; Tue, 22 Oct 2019 09:37:32 +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 648001A50B; Tue, 22 Oct 2019 09:37:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9LIJsTk000713 for ; Mon, 21 Oct 2019 14:19:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 141A160C4E; Mon, 21 Oct 2019 18:19:54 +0000 (UTC) Received: from mx1.redhat.com (ext-mx09.extmail.prod.ext.phx2.redhat.com [10.5.110.38]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0A3A560BE2 for ; Mon, 21 Oct 2019 18:19:54 +0000 (UTC) Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 222E62DD98 for ; Mon, 21 Oct 2019 18:19:53 +0000 (UTC) Received: by mail-qt1-f195.google.com with SMTP id m15so22544876qtq.2 for ; Mon, 21 Oct 2019 11:19:53 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:7979:d16f:4e5e:8e8d:1141]) by smtp.gmail.com with ESMTPSA id d205sm9248741qke.96.2019.10.21.11.19.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 11:19:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571737059; 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=gDWse5MRTzZE72+etqwCbeRttS41ARYLuaWsZ+CLeUE=; b=PkIGObKq0hg1jBCS+kUNdsAY4dPM565v1/IUZI9KYII8r8J3GLmMoYIYB4UYpjfGboAKZB r+foS20lEfngj62rlBwUduab/R37qHX87f5KJ5R/VyQx8+A/bOttjPJp4wTaaTNXHR+/i1 9WKHa2/Bw7BKST3WbMascCZU17zmz4E= 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=mQcxsnEoVHnTMZjruAI14+K7qD8l14IlsPBVsykkokU=; b=NtF2QTgXVY1sGA1mE2b2bssBUV3m5qb55IqX9k9zZov0A+4KRyqCl1RuhRGf5OliCe pQuX1nfoTiOXiYBXhHor0PHMC7hJd4V6y5LgRj+JktzNQ1NkeTGgvQWlSGRix3+QqNtm n4wwzTsSA8jPI7gOcR5BhJJXEN4Njaddfd6v73yvWQNNgsbi3wnzDJ2MD1x0bbE2ZTkO x2PwnZZ/2VUYW70cJdeW9kNveHJAqGyydVq2uZrNBo9GAztycQxvFMEtwg2t+avqjGLy NgeAfq1ijWotazLxDwCSlyHCOqkLWRFjkNHZoXAY8yd/hGa3PUHWVYEnHRPoxqWPRLIB Wi9g== X-Gm-Message-State: APjAAAXvOX1WPDlKP+vafBFnPWxgH/8zxVviIdTOBiyhvQqRkFzXjNm5 PgaM1MhygaHwCqL8+ZSp8hdsvsfc75E= X-Google-Smtp-Source: APXvYqzAegmZQsWmVXgcLPJv2QtT2y6iWhrIumTHQGNgxtmIRlHSbAXohQH6kMmDrpkm1VOno/O7aQ== X-Received: by 2002:ac8:614a:: with SMTP id d10mr25691217qtm.250.1571681992154; Mon, 21 Oct 2019 11:19:52 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 15:19:09 -0300 Message-Id: <20191021181911.14986-20-danielhb413@gmail.com> In-Reply-To: <20191021181911.14986-1-danielhb413@gmail.com> References: <20191021181911.14986-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 21 Oct 2019 18:19:53 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 21 Oct 2019 18:19:53 +0000 (UTC) for IP:'209.85.160.195' DOMAIN:'mail-qt1-f195.google.com' HELO:'mail-qt1-f195.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.131 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS) 209.85.160.195 mail-qt1-f195.google.com 209.85.160.195 mail-qt1-f195.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.38 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 19/21] tools: 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.15 X-MC-Unique: ozjeYWiEMtiPitfr7KZEdA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza Reviewed-by: J=C3=A1n Tomko --- tools/virsh-completer-network.c | 8 ++----- tools/virsh-domain.c | 41 +++++++++++---------------------- tools/vsh.c | 14 +++++------ 3 files changed, 22 insertions(+), 41 deletions(-) diff --git a/tools/virsh-completer-network.c b/tools/virsh-completer-networ= k.c index 0097fca7cc..8f0048ed6f 100644 --- a/tools/virsh-completer-network.c +++ b/tools/virsh-completer-network.c @@ -74,21 +74,17 @@ virshNetworkEventNameCompleter(vshControl *ctl G_GNUC_U= NUSED, unsigned int flags) { size_t i =3D 0; - char **ret =3D NULL; VIR_AUTOSTRINGLIST tmp =3D NULL; =20 virCheckFlags(0, NULL); =20 if (VIR_ALLOC_N(tmp, VIR_NETWORK_EVENT_ID_LAST + 1) < 0) - goto cleanup; + return NULL; =20 for (i =3D 0; i < VIR_NETWORK_EVENT_ID_LAST; i++) tmp[i] =3D g_strdup(virshNetworkEventCallbacks[i].name); =20 - ret =3D g_steal_pointer(&tmp); - - cleanup: - return ret; + return g_steal_pointer(&tmp); } =20 =20 diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 2f3ac2d430..af43078205 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -2583,7 +2583,6 @@ virshBlockJobInfo(vshControl *ctl, virshControlPtr priv =3D ctl->privData; unsigned long long speed; unsigned int flags =3D 0; - bool ret =3D false; int rc =3D -1; =20 /* If bytes were requested, or if raw mode is not forcing a MiB/s @@ -2605,7 +2604,7 @@ virshBlockJobInfo(vshControl *ctl, } G_GNUC_FALLTHROUGH; default: - goto cleanup; + return false; } } speed =3D info.bandwidth; @@ -2614,7 +2613,7 @@ virshBlockJobInfo(vshControl *ctl, if (rc < 0) { flags &=3D ~VIR_DOMAIN_BLOCK_JOB_INFO_BANDWIDTH_BYTES; if ((rc =3D virDomainGetBlockJobInfo(dom, path, &info, flags)) < 0) - goto cleanup; + return false; speed =3D info.bandwidth; /* Scale to bytes/s unless in raw mode */ if (!raw) { @@ -2622,7 +2621,7 @@ virshBlockJobInfo(vshControl *ctl, if (speed >> 20 !=3D info.bandwidth) { vshError(ctl, _("overflow in converting %ld MiB/s to bytes= \n"), info.bandwidth); - goto cleanup; + return false; } } } @@ -2630,8 +2629,7 @@ virshBlockJobInfo(vshControl *ctl, if (rc =3D=3D 0) { if (!raw) vshPrintExtra(ctl, _("No current block job for %s"), path); - ret =3D true; - goto cleanup; + return true; } =20 if (raw) { @@ -2650,10 +2648,7 @@ virshBlockJobInfo(vshControl *ctl, vshPrint(ctl, "\n"); } =20 - ret =3D true; - - cleanup: - return ret; + return true; } =20 =20 @@ -2994,34 +2989,31 @@ cmdRunConsole(vshControl *ctl, virDomainPtr dom, const char *name, unsigned int flags) { - bool ret =3D false; int state; virshControlPtr priv =3D ctl->privData; =20 if ((state =3D virshDomainState(ctl, dom, NULL)) < 0) { vshError(ctl, "%s", _("Unable to get domain status")); - goto cleanup; + return false; } =20 if (state =3D=3D VIR_DOMAIN_SHUTOFF) { vshError(ctl, "%s", _("The domain is not running")); - goto cleanup; + return false; } =20 if (!isatty(STDIN_FILENO)) { vshError(ctl, "%s", _("Cannot run interactive console without a co= ntrolling TTY")); - goto cleanup; + return false; } =20 vshPrintExtra(ctl, _("Connected to domain %s\n"), virDomainGetName(dom= )); vshPrintExtra(ctl, _("Escape character is %s\n"), priv->escapeChar); fflush(stdout); if (virshRunConsole(ctl, dom, name, flags) =3D=3D 0) - ret =3D true; - - cleanup: + return true; =20 - return ret; + return false; } =20 static bool @@ -5056,7 +5048,7 @@ cmdSchedInfoUpdateOne(vshControl *ctl, field, param->type, value) < 0) { vshSaveLibvirtError(); - goto cleanup; + return ret; } ret =3D 0; break; @@ -5065,7 +5057,6 @@ cmdSchedInfoUpdateOne(vshControl *ctl, if (ret < 0) vshError(ctl, _("invalid scheduler option: %s"), field); =20 - cleanup: return ret; } =20 @@ -9733,26 +9724,22 @@ static bool cmdQemuAttach(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom =3D NULL; - bool ret =3D false; unsigned int flags =3D 0; unsigned int pid_value; /* API uses unsigned int, not pid_t */ virshControlPtr priv =3D ctl->privData; =20 if (vshCommandOptUInt(ctl, cmd, "pid", &pid_value) <=3D 0) - goto cleanup; + return false; =20 if (!(dom =3D virDomainQemuAttach(priv->conn, pid_value, flags))) { vshError(ctl, _("Failed to attach to pid %u"), pid_value); - goto cleanup; + return false; } =20 vshPrintExtra(ctl, _("Domain %s attached to pid %u\n"), virDomainGetName(dom), pid_value); virshDomainFree(dom); - ret =3D true; - - cleanup: - return ret; + return true; } =20 /* diff --git a/tools/vsh.c b/tools/vsh.c index 3f8b7f2186..40747edcb2 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -2537,11 +2537,10 @@ vshTreePrintInternal(vshControl *ctl, { size_t i; int nextlastdev =3D -1; - int ret =3D -1; const char *dev =3D (lookup)(devid, false, opaque); =20 if (virBufferError(indent)) - goto cleanup; + return -1; =20 /* Print this device, with indent if not at root */ vshPrint(ctl, "%s%s%s\n", virBufferCurrentContent(indent), @@ -2552,7 +2551,7 @@ vshTreePrintInternal(vshControl *ctl, virBufferAddChar(indent, devid =3D=3D lastdev ? ' ' : '|'); virBufferAddChar(indent, ' '); if (virBufferError(indent)) - goto cleanup; + return -1; } =20 /* Determine the index of the last child device */ @@ -2570,7 +2569,7 @@ vshTreePrintInternal(vshControl *ctl, /* Finally print all children */ virBufferAddLit(indent, " "); if (virBufferError(indent)) - goto cleanup; + return -1; for (i =3D 0; i < num_devices; i++) { const char *parent =3D (lookup)(i, true, opaque); =20 @@ -2578,7 +2577,7 @@ vshTreePrintInternal(vshControl *ctl, vshTreePrintInternal(ctl, lookup, opaque, num_devices, i, nextlastdev, false, indent) < 0) - goto cleanup; + return -1; } virBufferTrim(indent, " ", -1); =20 @@ -2589,9 +2588,8 @@ vshTreePrintInternal(vshControl *ctl, =20 if (!root) virBufferTrim(indent, NULL, 2); - ret =3D 0; - cleanup: - return ret; + + return 0; } =20 int --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 9 02:14:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1571737233; cv=none; d=zoho.com; s=zohoarc; b=n4ZpMxcXNwez1XNjZwwQfl9Aln9mRxieJAIC6OcBMoiIRKlG6yTJ5YY76oXdxaJJIFioy2G7P4qz3yKx+ggY9xbgWRREnUsFwIKrOIYW+E6w3GTIN/t97aK4/DU52tPRnqkkB55Sy273zkuw6QNt/wHTiFDcDzkJyi9koAGF0zg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571737233; 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=R+AjSssBf5NIQwpA3b3bFs57CAitvUDNJKq6Vmx8x9Y=; b=eIDg2/Bz+GOWjw7eP9gnkS3BtpsO7pTEH6/7CgOf3CiC7mQesxQ38i7Ljd/rN+d/G4FU6hxAIUqgjP6VQ/VEomGF8Da/A06oH7VBSw3jzW+1cdOXbDnY4ccKEOfuh78k4CGEJiCgcOgFM4yzzR5MmVQ392xZOwztydtbuVvqYeg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.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 1571737233246427.11728462553026; Tue, 22 Oct 2019 02:40:33 -0700 (PDT) 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-180-lbWRvTXCOYWB-mI_FMbHpQ-1; Tue, 22 Oct 2019 05:40:30 -0400 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 A87C91800D79; Tue, 22 Oct 2019 09:40: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 818E36C060; Tue, 22 Oct 2019 09:40: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 327CD181A82C; Tue, 22 Oct 2019 09:40:25 +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 x9LIJv4j000739 for ; Mon, 21 Oct 2019 14:19:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4479B5C219; Mon, 21 Oct 2019 18:19:57 +0000 (UTC) Received: from mx1.redhat.com (ext-mx23.extmail.prod.ext.phx2.redhat.com [10.5.110.64]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 38D8D5C207 for ; Mon, 21 Oct 2019 18:19:57 +0000 (UTC) Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 695C010A8128 for ; Mon, 21 Oct 2019 18:19:55 +0000 (UTC) Received: by mail-qt1-f194.google.com with SMTP id g50so8316136qtb.4 for ; Mon, 21 Oct 2019 11:19:55 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:7979:d16f:4e5e:8e8d:1141]) by smtp.gmail.com with ESMTPSA id d205sm9248741qke.96.2019.10.21.11.19.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 11:19:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571737232; 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=R+AjSssBf5NIQwpA3b3bFs57CAitvUDNJKq6Vmx8x9Y=; b=cUWSxVsDc/1AYGE6pDzMr259IpGP/2K85UQWrLPDMYfTfaze/kzd4SHVHA0srCW8Fwykk9 KqXArsdbYBgGGnhdTClr5MR6E6eEBknpRoUny5dwufwmgk9RMMwBJi9s/CFVUYzPJ9GF8t 22f7xOqwnrwcg5o/b2KpQUGFvneS5qk= 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=nr9HWc7ti5gsbgqUQbtkGXQ4BNKoGpqX7a8FHzIuf48=; b=NSjwZCrjP4CpJXC8tgWTCxUvM7hi9JFSBCtk46E+cm4anxObrRA1INSFSauCXUscMD 4tDr5eZzBdb65HtVrmMjMkFBfEhSJykK6diazDjoVdm0nLmhBYcK7O0Tri+QXxoKB8p3 SGv3irK1AXTwJDlPeD5Y/8d1NGa7IhKDFhqunKoBmRRzoqjqj+1yv7XcRcY0SaguEP2O wCYpwzL6k9NIwTrB4X8dn1CURMDi5eEvTr/AP1huhn0iCt5hllxtGfw3WlSdiqNQ4QLT OevoV2tx5oqv0V2kURUs4NbRfHylEGy8KYuEZBQGWs2zwmynWgS4Q4VYWO2y8rbsLixx YRBQ== X-Gm-Message-State: APjAAAXVQCR3aWIpvGuuYL/Zkv4rJ1ADS1uxqVxzlA9pbHge9uSwrV17 8oe2vOLxH5flY4AbNhdw87eWmApNynk= X-Google-Smtp-Source: APXvYqwM6xeb8MglWbi558G4C5ftC0ljTqAmcPisK76dnc0SQGg9a5SOVwiwZusyRb1zC7+IKdJ9lw== X-Received: by 2002:ac8:29c8:: with SMTP id 8mr24933251qtt.32.1571681993606; Mon, 21 Oct 2019 11:19:53 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 15:19:10 -0300 Message-Id: <20191021181911.14986-21-danielhb413@gmail.com> In-Reply-To: <20191021181911.14986-1-danielhb413@gmail.com> References: <20191021181911.14986-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.64]); Mon, 21 Oct 2019 18:19:55 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.64]); Mon, 21 Oct 2019 18:19:55 +0000 (UTC) for IP:'209.85.160.194' DOMAIN:'mail-qt1-f194.google.com' HELO:'mail-qt1-f194.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.131 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS) 209.85.160.194 mail-qt1-f194.google.com 209.85.160.194 mail-qt1-f194.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.64 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 20/21] tests: 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-MC-Unique: lbWRvTXCOYWB-mI_FMbHpQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza --- tests/commandtest.c | 17 ++++---- tests/domainconftest.c | 5 +-- tests/networkxml2firewalltest.c | 13 ++---- tests/nsstest.c | 27 ++++++------- tests/nwfilterebiptablestest.c | 4 +- tests/nwfilterxml2firewalltest.c | 16 +++----- tests/qemuhotplugtest.c | 19 ++++----- tests/qemuxml2argvtest.c | 11 ++--- tests/storagebackendsheepdogtest.c | 5 +-- tests/virauthconfigtest.c | 11 ++--- tests/vircgroupmock.c | 11 ++--- tests/virendiantest.c | 58 ++++++++++++-------------- tests/virkeycodetest.c | 14 ++----- tests/virmacmaptest.c | 5 +-- tests/virnetdevtest.c | 11 ++--- tests/virpcimock.c | 31 +++++--------- tests/virpcitest.c | 3 +- tests/virpolkittest.c | 65 +++++++++--------------------- tests/virstringtest.c | 18 +++------ 19 files changed, 126 insertions(+), 218 deletions(-) diff --git a/tests/commandtest.c b/tests/commandtest.c index 6ff2039ab1..4fbbde9559 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -949,12 +949,11 @@ test23(const void *unused G_GNUC_UNUSED) /* Not strictly a virCommand test, but this is the easiest place * to test this lower-level interface. It takes a double fork to * test virProcessExitWithStatus. */ - int ret =3D -1; int status =3D -1; pid_t pid; =20 if ((pid =3D virFork()) < 0) - goto cleanup; + return -1; if (pid =3D=3D 0) { if ((pid =3D virFork()) < 0) _exit(EXIT_FAILURE); @@ -967,14 +966,14 @@ test23(const void *unused G_GNUC_UNUSED) } =20 if (virProcessWait(pid, &status, true) < 0) - goto cleanup; + return -1; if (!WIFEXITED(status) || WEXITSTATUS(status) !=3D 42) { printf("Unexpected status %d\n", status); - goto cleanup; + return -1; } =20 if ((pid =3D virFork()) < 0) - goto cleanup; + return -1; if (pid =3D=3D 0) { if ((pid =3D virFork()) < 0) _exit(EXIT_FAILURE); @@ -989,15 +988,13 @@ test23(const void *unused G_GNUC_UNUSED) } =20 if (virProcessWait(pid, &status, true) < 0) - goto cleanup; + return -1; if (!WIFSIGNALED(status) || WTERMSIG(status) !=3D SIGKILL) { printf("Unexpected status %d\n", status); - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 static int test25(const void *unused G_GNUC_UNUSED) diff --git a/tests/domainconftest.c b/tests/domainconftest.c index e7bdc99438..5b7bf4bbec 100644 --- a/tests/domainconftest.c +++ b/tests/domainconftest.c @@ -83,10 +83,10 @@ mymain(void) int ret =3D 0; =20 if ((caps =3D virTestGenericCapsInit()) =3D=3D NULL) - goto cleanup; + return EXIT_SUCCESS; =20 if (!(xmlopt =3D virTestGenericDomainXMLConfInit())) - goto cleanup; + return EXIT_SUCCESS; =20 #define DO_TEST_GET_FS(fspath, expect) \ do { \ @@ -107,7 +107,6 @@ mymain(void) virObjectUnref(caps); virObjectUnref(xmlopt); =20 - cleanup: return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; } =20 diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltes= t.c index b8e974971a..6ee311f384 100644 --- a/tests/networkxml2firewalltest.c +++ b/tests/networkxml2firewalltest.c @@ -165,20 +165,16 @@ mymain(void) return EXIT_AM_SKIP; } =20 - ret =3D -1; - goto cleanup; + return EXIT_FAILURE; } =20 if (virAsprintf(&basefile, "%s/networkxml2firewalldata/base.args", abs_srcdir) < 0) { - ret =3D -1; - goto cleanup; + return EXIT_FAILURE; } =20 - if (virTestLoadFile(basefile, &baseargs) < 0) { - ret =3D -1; - goto cleanup; - } + if (virTestLoadFile(basefile, &baseargs) < 0) + return EXIT_FAILURE; =20 DO_TEST("nat-default"); DO_TEST("nat-tftp"); @@ -187,7 +183,6 @@ mymain(void) DO_TEST("nat-ipv6"); DO_TEST("route-default"); =20 - cleanup: return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; } =20 diff --git a/tests/nsstest.c b/tests/nsstest.c index 734e4cbc07..d146100747 100644 --- a/tests/nsstest.c +++ b/tests/nsstest.c @@ -41,7 +41,6 @@ testGetHostByName(const void *opaque) { const struct testNSSData *data =3D opaque; const bool existent =3D data->hostname && data->ipAddr && data->ipAddr= [0]; - int ret =3D -1; struct hostent resolved; char buf[BUF_SIZE] =3D { 0 }; char **addrList; @@ -64,16 +63,16 @@ testGetHostByName(const void *opaque) virReportError(VIR_ERR_INTERNAL_ERROR, "Resolving of %s failed due to internal error", data->hostname); - goto cleanup; + return -1; } else if (rv =3D=3D NSS_STATUS_NOTFOUND) { /* Resolving failed. Should it? */ if (!existent) - ret =3D 0; + return 0; else virReportError(VIR_ERR_INTERNAL_ERROR, "Resolving of %s failed", data->hostname); - goto cleanup; + return -1; } =20 /* Resolving succeeded. Should it? */ @@ -81,7 +80,7 @@ testGetHostByName(const void *opaque) virReportError(VIR_ERR_INTERNAL_ERROR, "Resolving of %s succeeded but was expected to fail= ", data->hostname); - goto cleanup; + return -1; } =20 /* Now lets see if resolved address match our expectations. */ @@ -89,7 +88,7 @@ testGetHostByName(const void *opaque) if (!resolved.h_name) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", "resolved.h_name empty"); - goto cleanup; + return -1; } =20 if (data->af !=3D AF_UNSPEC && @@ -97,7 +96,7 @@ testGetHostByName(const void *opaque) virReportError(VIR_ERR_INTERNAL_ERROR, "Expected AF_INET (%d) got %d", data->af, resolved.h_addrtype); - goto cleanup; + return -1; } =20 if ((resolved.h_addrtype =3D=3D AF_INET && resolved.h_length !=3D 4) || @@ -107,13 +106,13 @@ testGetHostByName(const void *opaque) "Expected %d bytes long address, got %d", resolved.h_addrtype =3D=3D AF_INET ? 4 : 16, resolved.h_length); - goto cleanup; + return -1; } =20 if (!resolved.h_addr_list) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", "resolved.h_addr_list empty"); - goto cleanup; + return -1; } =20 addrList =3D resolved.h_addr_list; @@ -133,7 +132,7 @@ testGetHostByName(const void *opaque) =20 if (!(ipAddr =3D virSocketAddrFormat(&sa))) { /* error reported by helper */ - goto cleanup; + return -1; } =20 if (STRNEQ_NULLABLE(data->ipAddr[i], ipAddr)) { @@ -141,7 +140,7 @@ testGetHostByName(const void *opaque) "Unexpected address %s, expecting %s", ipAddr, NULLSTR(data->ipAddr[i])); VIR_FREE(ipAddr); - goto cleanup; + return -1; } VIR_FREE(ipAddr); =20 @@ -153,12 +152,10 @@ testGetHostByName(const void *opaque) virReportError(VIR_ERR_INTERNAL_ERROR, "Expected %s address, got NULL", data->ipAddr[i]); - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 static int diff --git a/tests/nwfilterebiptablestest.c b/tests/nwfilterebiptablestest.c index 61b3284397..97f2ff8ac8 100644 --- a/tests/nwfilterebiptablestest.c +++ b/tests/nwfilterebiptablestest.c @@ -539,8 +539,7 @@ mymain(void) return EXIT_AM_SKIP; } =20 - ret =3D -1; - goto cleanup; + return EXIT_FAILURE; } =20 if (virTestRun("ebiptablesAllTeardown", @@ -578,7 +577,6 @@ mymain(void) NULL) < 0) ret =3D -1; =20 - cleanup: return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; } =20 diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2firewallt= est.c index bef3790da2..84a4656c5b 100644 --- a/tests/nwfilterxml2firewalltest.c +++ b/tests/nwfilterxml2firewalltest.c @@ -328,24 +328,22 @@ static int testSetOneParameter(virHashTablePtr vars, const char *name, const char *value) { - int ret =3D -1; virNWFilterVarValuePtr val; =20 if ((val =3D virHashLookup(vars, name)) =3D=3D NULL) { val =3D virNWFilterVarValueCreateSimpleCopyValue(value); if (!val) - goto cleanup; + return -1; if (virHashUpdateEntry(vars, name, val) < 0) { virNWFilterVarValueFree(val); - goto cleanup; + return -1; } } else { if (virNWFilterVarValueAddValueCopy(val, value) < 0) - goto cleanup; + return -1; } - ret =3D 0; - cleanup: - return ret; + + return 0; } =20 static int testSetDefaultParameters(virHashTablePtr vars) @@ -474,8 +472,7 @@ mymain(void) fprintf(stderr, "iptables/ip6tables/ebtables tools not present= "); return EXIT_AM_SKIP; } - ret =3D -1; - goto cleanup; + return EXIT_FAILURE; } =20 DO_TEST("ah"); @@ -518,7 +515,6 @@ mymain(void) DO_TEST("udplite-ipv6"); DO_TEST("vlan"); =20 - cleanup: return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; } =20 diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 4ff2b38c83..90cbf56408 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -62,17 +62,16 @@ qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt, virDomainObjPtr *vm, const char *domxml) { - int ret =3D -1; qemuDomainObjPrivatePtr priv =3D NULL; const unsigned int parseFlags =3D 0; =20 if (!(*vm =3D virDomainObjNew(xmlopt))) - goto cleanup; + return -1; =20 priv =3D (*vm)->privateData; =20 if (!(priv->qemuCaps =3D virQEMUCapsNew())) - goto cleanup; + return -1; =20 virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_VIRTIO_SCSI); virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE); @@ -84,31 +83,29 @@ qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt, virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); =20 if (qemuTestCapsCacheInsert(driver.qemuCapsCache, priv->qemuCaps) < 0) - goto cleanup; + return -1; =20 if (!((*vm)->def =3D virDomainDefParseString(domxml, driver.caps, driver.xmlopt, NULL, parseFlags))) - goto cleanup; + return -1; =20 if (qemuDomainAssignAddresses((*vm)->def, priv->qemuCaps, &driver, *vm, true) < 0) { - goto cleanup; + return -1; } =20 if (qemuAssignDeviceAliases((*vm)->def, priv->qemuCaps) < 0) - goto cleanup; + return -1; =20 (*vm)->def->id =3D QEMU_HOTPLUG_TEST_DOMAIN_ID; =20 if (qemuDomainSetPrivatePaths(&driver, *vm) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 static int diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index fd330df3e0..b795075d49 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -365,10 +365,8 @@ testUpdateQEMUCaps(const struct testQemuInfo *info, virDomainObjPtr vm, virCapsPtr caps) { - int ret =3D -1; - if (!caps) - goto cleanup; + return -1; =20 virQEMUCapsSetArch(info->qemuCaps, vm->def->os.arch); =20 @@ -376,17 +374,14 @@ testUpdateQEMUCaps(const struct testQemuInfo *info, =20 if (testAddCPUModels(info->qemuCaps, !!(info->flags & FLAG_SKIP_LEGACY_CPUS)) < 0) - goto cleanup; + return -1; =20 virQEMUCapsInitHostCPUModel(info->qemuCaps, caps->host.arch, VIR_DOMAIN_VIRT_KVM); virQEMUCapsInitHostCPUModel(info->qemuCaps, caps->host.arch, VIR_DOMAIN_VIRT_QEMU); =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheep= dogtest.c index a5403e7136..62f3208a91 100644 --- a/tests/storagebackendsheepdogtest.c +++ b/tests/storagebackendsheepdogtest.c @@ -160,11 +160,11 @@ mymain(void) =20 if (virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/pool-sheepdog.xml", abs_srcdir) < 0) - goto cleanup; + return EXIT_SUCCESS; =20 if (virAsprintf(&volxml, "%s/storagevolxml2xmlin/vol-sheepdog.xml", abs_srcdir) < 0) - goto cleanup; + return EXIT_SUCCESS; =20 #define DO_TEST_NODE(collie) \ do { \ @@ -202,7 +202,6 @@ mymain(void) ++test; } =20 - cleanup: return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; } =20 diff --git a/tests/virauthconfigtest.c b/tests/virauthconfigtest.c index 42e62cd874..e3bd927dcb 100644 --- a/tests/virauthconfigtest.c +++ b/tests/virauthconfigtest.c @@ -41,7 +41,6 @@ struct ConfigLookupData { =20 static int testAuthLookup(const void *args) { - int ret =3D -1; const struct ConfigLookupData *data =3D args; const char *actual =3D NULL; int rv; @@ -53,7 +52,7 @@ static int testAuthLookup(const void *args) &actual); =20 if (rv < 0) - goto cleanup; + return -1; =20 if (data->expect) { if (!actual || @@ -62,7 +61,7 @@ static int testAuthLookup(const void *args) data->expect, data->hostname, data->service, data->credname, NULLSTR(actual)); - goto cleanup; + return -1; } } else { if (actual) { @@ -70,13 +69,11 @@ static int testAuthLookup(const void *args) data->hostname, data->service, data->credname, actual); - goto cleanup; + return -1; } } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c index 7bbaa6dd0f..1b7394232e 100644 --- a/tests/vircgroupmock.c +++ b/tests/vircgroupmock.c @@ -103,7 +103,6 @@ static int make_file(const char *path, =20 static int make_controller_v1(const char *path, mode_t mode) { - int ret =3D -1; const char *controller; =20 if (!STRPREFIX(path, fakesysfscgroupdir)) { @@ -118,12 +117,12 @@ static int make_controller_v1(const char *path, mode_= t mode) return symlink("cpu,cpuacct", path); =20 if (real_mkdir(path, mode) < 0) - goto cleanup; + return -1; =20 # define MAKE_FILE(name, value) \ do { \ if (make_file(path, name, value) < 0) \ - goto cleanup; \ + return -1; \ } while (0) =20 if (STRPREFIX(controller, "cpu,cpuacct")) { @@ -224,14 +223,12 @@ static int make_controller_v1(const char *path, mode_= t mode) =20 } else { errno =3D EINVAL; - goto cleanup; + return -1; } =20 # undef MAKE_FILE =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 diff --git a/tests/virendiantest.c b/tests/virendiantest.c index 7e2eff66dc..38adef9353 100644 --- a/tests/virendiantest.c +++ b/tests/virendiantest.c @@ -30,38 +30,35 @@ test1(const void *data G_GNUC_UNUSED) * unaligned access. */ char array[] =3D { 1, 2, 3, 4, 5, 6, 7, 8, 0x89, 0x8a, 0x8b, 0x8c, 0x8d }; - int ret =3D -1; =20 if (virReadBufInt64BE(array) !=3D 0x0102030405060708ULL) - goto cleanup; + return -1; if (virReadBufInt64BE(array + 5) !=3D 0x060708898a8b8c8dULL) - goto cleanup; + return -1; if (virReadBufInt64LE(array) !=3D 0x0807060504030201ULL) - goto cleanup; + return -1; if (virReadBufInt64LE(array + 5) !=3D 0x8d8c8b8a89080706ULL) - goto cleanup; + return -1; =20 if (virReadBufInt32BE(array) !=3D 0x01020304U) - goto cleanup; + return -1; if (virReadBufInt32BE(array + 9) !=3D 0x8a8b8c8dU) - goto cleanup; + return -1; if (virReadBufInt32LE(array) !=3D 0x04030201U) - goto cleanup; + return -1; if (virReadBufInt32LE(array + 9) !=3D 0x8d8c8b8aU) - goto cleanup; + return -1; =20 if (virReadBufInt16BE(array) !=3D 0x0102U) - goto cleanup; + return -1; if (virReadBufInt16BE(array + 11) !=3D 0x8c8dU) - goto cleanup; + return -1; if (virReadBufInt16LE(array) !=3D 0x0201U) - goto cleanup; + return -1; if (virReadBufInt16LE(array + 11) !=3D 0x8d8cU) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 static int @@ -70,38 +67,35 @@ test2(const void *data G_GNUC_UNUSED) /* Unsigned char should work without cast, even if unaligned access. = */ unsigned char array[] =3D { 1, 2, 3, 4, 5, 6, 7, 8, 0x89, 0x8a, 0x8b, 0x8c, 0x8d }; - int ret =3D -1; =20 if (virReadBufInt64BE(array) !=3D 0x0102030405060708ULL) - goto cleanup; + return -1; if (virReadBufInt64BE(array + 5) !=3D 0x060708898a8b8c8dULL) - goto cleanup; + return -1; if (virReadBufInt64LE(array) !=3D 0x0807060504030201ULL) - goto cleanup; + return -1; if (virReadBufInt64LE(array + 5) !=3D 0x8d8c8b8a89080706ULL) - goto cleanup; + return -1; =20 if (virReadBufInt32BE(array) !=3D 0x01020304U) - goto cleanup; + return -1; if (virReadBufInt32BE(array + 9) !=3D 0x8a8b8c8dU) - goto cleanup; + return -1; if (virReadBufInt32LE(array) !=3D 0x04030201U) - goto cleanup; + return -1; if (virReadBufInt32LE(array + 9) !=3D 0x8d8c8b8aU) - goto cleanup; + return -1; =20 if (virReadBufInt16BE(array) !=3D 0x0102U) - goto cleanup; + return -1; if (virReadBufInt16BE(array + 11) !=3D 0x8c8dU) - goto cleanup; + return -1; if (virReadBufInt16LE(array) !=3D 0x0201U) - goto cleanup; + return -1; if (virReadBufInt16LE(array + 11) !=3D 0x8d8cU) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 static int diff --git a/tests/virkeycodetest.c b/tests/virkeycodetest.c index c2e756cdd0..298409e919 100644 --- a/tests/virkeycodetest.c +++ b/tests/virkeycodetest.c @@ -35,7 +35,6 @@ VIR_LOG_INIT("tests.keycodetest"); =20 static int testKeycodeMapping(const void *data G_GNUC_UNUSED) { - int ret =3D -1; int got; =20 #define TRANSLATE(from, to, val, want) \ @@ -45,7 +44,7 @@ static int testKeycodeMapping(const void *data G_GNUC_UNU= SED) val)) !=3D want) { \ fprintf(stderr, "Translating %d from %s to %s, got %d want %d\= n", \ val, #from, #to, got, want); \ - goto cleanup; \ + return -1; \ } \ } while (0) =20 @@ -60,15 +59,12 @@ static int testKeycodeMapping(const void *data G_GNUC_U= NUSED) =20 #undef TRANSLATE =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 static int testKeycodeStrings(const void *data G_GNUC_UNUSED) { - int ret =3D -1; int got; =20 #define TRANSLATE(from, str, want) \ @@ -77,7 +73,7 @@ static int testKeycodeStrings(const void *data G_GNUC_UNU= SED) str)) !=3D want) { \ fprintf(stderr, "Converting %s from %s, got %d want %d\n", \ str, #from, got, want); \ - goto cleanup; \ + return -1; \ } \ } while (0) =20 @@ -90,9 +86,7 @@ static int testKeycodeStrings(const void *data G_GNUC_UNU= SED) =20 #undef TRANSLATE =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 static int diff --git a/tests/virmacmaptest.c b/tests/virmacmaptest.c index 995aff1178..73b8265a42 100644 --- a/tests/virmacmaptest.c +++ b/tests/virmacmaptest.c @@ -170,8 +170,7 @@ mymain(void) #define DO_TEST_FLUSH_PROLOGUE \ do { \ if (!(mgr =3D virMacMapNew(NULL))) { \ - ret =3D -1; \ - goto cleanup; \ + return EXIT_FAILURE; \ } \ } while (0) =20 @@ -228,7 +227,7 @@ mymain(void) DO_TEST_FLUSH("dom1", "9e:89:49:99:51:0e", "89:b4:3f:08:88:2c", "54:0b= :4c:e2:0a:39"); DO_TEST_FLUSH("dom1", "bb:88:07:19:51:9d", "b7:f1:1a:40:a2:95", "88:94= :39:a3:90:b4"); DO_TEST_FLUSH_EPILOGUE("complex"); - cleanup: + return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; } =20 diff --git a/tests/virnetdevtest.c b/tests/virnetdevtest.c index 5d266a28ee..aadbeb1ef4 100644 --- a/tests/virnetdevtest.c +++ b/tests/virnetdevtest.c @@ -35,31 +35,28 @@ struct testVirNetDevGetLinkInfoData { static int testVirNetDevGetLinkInfo(const void *opaque) { - int ret =3D -1; const struct testVirNetDevGetLinkInfoData *data =3D opaque; virNetDevIfLink lnk; =20 if (virNetDevGetLinkInfo(data->ifname, &lnk) < 0) - goto cleanup; + return -1; =20 if (lnk.state !=3D data->state) { fprintf(stderr, "Fetched link state (%s) doesn't match the expected one (%= s)", virNetDevIfStateTypeToString(lnk.state), virNetDevIfStateTypeToString(data->state)); - goto cleanup; + return -1; } =20 if (lnk.speed !=3D data->speed) { fprintf(stderr, "Fetched link speed (%u) doesn't match the expected one (%= u)", lnk.speed, data->speed); - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 static int diff --git a/tests/virpcimock.c b/tests/virpcimock.c index d7dc0b00f0..50bd79737d 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -314,7 +314,6 @@ find_fd(int fd, size_t *indx) static int add_fd(int fd, const char *path) { - int ret =3D -1; size_t i; =20 if (find_fd(fd, &i)) { @@ -325,38 +324,34 @@ add_fd(int fd, const char *path) =20 if (VIR_REALLOC_N_QUIET(callbacks, nCallbacks + 1) < 0) { errno =3D ENOMEM; - goto cleanup; + return -1; } =20 callbacks[nCallbacks].path =3D g_strdup(path); callbacks[nCallbacks++].fd =3D fd; - ret =3D 0; - cleanup: - return ret; + + return 0; } =20 static int remove_fd(int fd) { - int ret =3D -1; size_t i; =20 if (find_fd(fd, &i)) { struct fdCallback cb =3D callbacks[i]; =20 if (pci_driver_handle_change(cb.fd, cb.path) < 0) - goto cleanup; + return -1; =20 VIR_FREE(cb.path); if (VIR_DELETE_ELEMENT(callbacks, i, nCallbacks) < 0) { errno =3D EINVAL; - goto cleanup; + return -1; } } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -931,36 +926,30 @@ pci_driver_handle_change(int fd G_GNUC_UNUSED, const = char *path) static int pci_driver_handle_bind(const char *path) { - int ret =3D -1; struct pciDevice *dev =3D pci_device_find_by_content(path); struct pciDriver *driver =3D pci_driver_find_by_path(path); =20 if (!driver || !dev) { /* No driver, no device or failing driver requested */ errno =3D ENODEV; - goto cleanup; + return -1; } =20 - ret =3D pci_driver_bind(driver, dev); - cleanup: - return ret; + return pci_driver_bind(driver, dev); } =20 static int pci_driver_handle_unbind(const char *path) { - int ret =3D -1; struct pciDevice *dev =3D pci_device_find_by_content(path); =20 if (!dev || !dev->driver) { /* No device, device not binded or failing driver requested */ errno =3D ENODEV; - goto cleanup; + return -1; } =20 - ret =3D pci_driver_unbind(dev->driver, dev); - cleanup: - return ret; + return pci_driver_unbind(dev->driver, dev); } =20 =20 diff --git a/tests/virpcitest.c b/tests/virpcitest.c index de2ffc7d41..f9c36d5af8 100644 --- a/tests/virpcitest.c +++ b/tests/virpcitest.c @@ -224,13 +224,12 @@ testVirPCIDeviceIsAssignable(const void *opaque) virPCIDevicePtr dev; =20 if (!(dev =3D virPCIDeviceNew(data->domain, data->bus, data->slot, dat= a->function))) - goto cleanup; + return -1; =20 if (virPCIDeviceIsAssignable(dev, true)) ret =3D 0; =20 virPCIDeviceFree(dev); - cleanup: return ret; } =20 diff --git a/tests/virpolkittest.c b/tests/virpolkittest.c index 97fa877445..fe7a3b5b91 100644 --- a/tests/virpolkittest.c +++ b/tests/virpolkittest.c @@ -145,26 +145,20 @@ VIR_MOCK_WRAP_RET_ARGS(dbus_connection_send_with_repl= y_and_block, =20 static int testPolkitAuthSuccess(const void *opaque G_GNUC_UNUSED) { - int ret =3D -1; - if (virPolkitCheckAuth("org.libvirt.test.success", THE_PID, THE_TIME, THE_UID, NULL, true) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 static int testPolkitAuthDenied(const void *opaque G_GNUC_UNUSED) { - int ret =3D -1; int rv; virErrorPtr err; =20 @@ -177,28 +171,24 @@ static int testPolkitAuthDenied(const void *opaque G_= GNUC_UNUSED) =20 if (rv =3D=3D 0) { fprintf(stderr, "Unexpected auth success\n"); - goto cleanup; + return -1; } else if (rv !=3D -2) { - goto cleanup; + return -1; } =20 err =3D virGetLastError(); if (!err || !strstr(err->message, _("access denied by policy"))) { fprintf(stderr, "Incorrect error response\n"); - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 static int testPolkitAuthChallenge(const void *opaque G_GNUC_UNUSED) { - int ret =3D -1; int rv; virErrorPtr err; =20 @@ -211,9 +201,9 @@ static int testPolkitAuthChallenge(const void *opaque G= _GNUC_UNUSED) =20 if (rv =3D=3D 0) { fprintf(stderr, "Unexpected auth success\n"); - goto cleanup; + return -1; } else if (rv !=3D -2) { - goto cleanup; + return -1; } =20 err =3D virGetLastError(); @@ -221,19 +211,15 @@ static int testPolkitAuthChallenge(const void *opaque= G_GNUC_UNUSED) err->code !=3D VIR_ERR_AUTH_UNAVAILABLE || !strstr(err->message, _("no polkit agent available to authenticate= "))) { fprintf(stderr, "Incorrect error response\n"); - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 static int testPolkitAuthCancelled(const void *opaque G_GNUC_UNUSED) { - int ret =3D -1; int rv; virErrorPtr err; =20 @@ -246,28 +232,24 @@ static int testPolkitAuthCancelled(const void *opaque= G_GNUC_UNUSED) =20 if (rv =3D=3D 0) { fprintf(stderr, "Unexpected auth success\n"); - goto cleanup; + return -1; } else if (rv !=3D -2) { - goto cleanup; + return -1; } =20 err =3D virGetLastError(); if (!err || !strstr(err->message, _("user cancelled authentication process"))) { fprintf(stderr, "Incorrect error response\n"); - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 static int testPolkitAuthDetailsSuccess(const void *opaque G_GNUC_UNUSED) { - int ret =3D -1; const char *details[] =3D { "org.libvirt.test.person", "Fred", NULL, @@ -279,18 +261,14 @@ static int testPolkitAuthDetailsSuccess(const void *o= paque G_GNUC_UNUSED) THE_UID, details, true) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 static int testPolkitAuthDetailsDenied(const void *opaque G_GNUC_UNUSED) { - int ret =3D -1; int rv; virErrorPtr err; const char *details[] =3D { @@ -307,22 +285,19 @@ static int testPolkitAuthDetailsDenied(const void *op= aque G_GNUC_UNUSED) =20 if (rv =3D=3D 0) { fprintf(stderr, "Unexpected auth success\n"); - goto cleanup; + return -1; } else if (rv !=3D -2) { - goto cleanup; + return -1; } =20 err =3D virGetLastError(); if (!err || !strstr(err->message, _("access denied by policy"))) { fprintf(stderr, "Incorrect error response\n"); - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 diff --git a/tests/virstringtest.c b/tests/virstringtest.c index 1e408f2757..fc5f9bf937 100644 --- a/tests/virstringtest.c +++ b/tests/virstringtest.c @@ -39,7 +39,6 @@ struct testStreqData { static int testStreq(const void *args) { const struct testStreqData *data =3D args; - int ret =3D -1; bool equal =3D true; bool streq_rv, strneq_rv; size_t i; @@ -63,19 +62,17 @@ static int testStreq(const void *args) virFilePrintf(stderr, "STREQ not working correctly. Expected %d got %d", (int) equal, (int) streq_rv); - goto cleanup; + return -1; } =20 if (strneq_rv =3D=3D equal) { virFilePrintf(stderr, "STRNEQ not working correctly. Expected %d got %d", (int) equal, (int) strneq_rv); - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 struct testSplitData { @@ -381,7 +378,6 @@ testStringSortCompare(const void *opaque G_GNUC_UNUSED) const char *sortrlist[] =3D { "turducken", "tasty", "goat", "chicken", "astro", }; - int ret =3D -1; size_t i; =20 qsort(randlist, G_N_ELEMENTS(randlist), sizeof(randlist[0]), @@ -393,18 +389,16 @@ testStringSortCompare(const void *opaque G_GNUC_UNUSE= D) if (STRNEQ(randlist[i], sortlist[i])) { fprintf(stderr, "sortlist[%zu] '%s' !=3D randlist[%zu] '%s'\n", i, sortlist[i], i, randlist[i]); - goto cleanup; + return -1; } if (STRNEQ(randrlist[i], sortrlist[i])) { fprintf(stderr, "sortrlist[%zu] '%s' !=3D randrlist[%zu] '%s'\= n", i, sortrlist[i], i, randrlist[i]); - goto cleanup; + return -1; } } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 9 02:14:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.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=1571737187; cv=none; d=zoho.com; s=zohoarc; b=aDFmJKZ3b7WlnyIpvey2+t9gzY3oSPFqAAWOZP+XmgkOMJ5v1L9ChOrl6rEWWlCuqEfi+mYJTBE0bOstXLjWmBHySVKCSVPSyNxWy6LkQu2bnfYwEw3fDC31MvTgcl4VMZIP2USelAHNh+nlAG7vpE8xFzvI8O2QsJ2KqV76QEA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571737187; 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=S3puQgj6ypVeCZRJ0jc2G6w9+RIs14Q8ehxbmdqDNCU=; b=VVTQh7bE+sgw8euUX6+LIf8aNhfqm9rwd9q673s3b+ZpdO14D5s+P5JPJfNc6xDuw2TI40laTGCeEjJZ7frpwBHlIVym1bM9Kd4id3BQypwhHswb6H9rH6Sfvqm2Hn1R0uJih3+0esXhk2hJRQ4932J9LJHCzuNktsXAgsl4sDI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.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-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1571737187899506.28908697669715; Tue, 22 Oct 2019 02:39:47 -0700 (PDT) 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-16-Bo9LZyaqM12AzIgNrIkuow-1; Tue, 22 Oct 2019 05:39:44 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 493975EE; Tue, 22 Oct 2019 09:39:40 +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 8E66E1001DC0; Tue, 22 Oct 2019 09:39:39 +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 520CB1A502; Tue, 22 Oct 2019 09:39:39 +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 x9LIJvV8000734 for ; Mon, 21 Oct 2019 14:19:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1DEAD61364; Mon, 21 Oct 2019 18:19:57 +0000 (UTC) Received: from mx1.redhat.com (ext-mx25.extmail.prod.ext.phx2.redhat.com [10.5.110.66]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 074F160BDB for ; Mon, 21 Oct 2019 18:19:56 +0000 (UTC) Received: from mail-qt1-f171.google.com (mail-qt1-f171.google.com [209.85.160.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C54BB10973A3 for ; Mon, 21 Oct 2019 18:19:55 +0000 (UTC) Received: by mail-qt1-f171.google.com with SMTP id m15so22545093qtq.2 for ; Mon, 21 Oct 2019 11:19:55 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:7979:d16f:4e5e:8e8d:1141]) by smtp.gmail.com with ESMTPSA id d205sm9248741qke.96.2019.10.21.11.19.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 11:19:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571737186; 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=S3puQgj6ypVeCZRJ0jc2G6w9+RIs14Q8ehxbmdqDNCU=; b=JPUnQ5+LRTAD8Am07CIa0i9nYBUHctMwuRPkQ7lJx6q8h4QVaW3oRG9tZJcYi2LE4dhMvK pU7TmLo0Pl2Y36bFIvS9Hi8jULOblGPaEoXNAIBxPM/C3HqhGnqGY9hrGVRDwTQdFbYG6N fRaiFVz5GVrTv+74CCHwGvDhza4Dk4Y= 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=++o/UqUqQb9Pe0ViXqGtOBJp3UMCFx3y/NhuOmh/6tc=; b=W1dNKyJk5rEEESTNGqHOFHOT0gSny89MaeHToAAvhjMXOWSoowds85Bn1HoceU4kNb K8W2K7P7fWxDV+iCYoRsGRjOiS85wfwfIWrTifOXQtHPe4wJBpLQrTQN4IMpQa3ihFRd tN/kqWZMMwT2z5B7WLKZ0aSeOVotfLQpjnn82eH05d7dIMRnEWdLfj38GwazeZ6fwx7v 6HYxFYKNj4pMIaihBdqdYxzax8LQklKvmPwR6X+ChNjoix+4BTFqp6B7PTnUjOGXvF24 4HFotk39Qni/D3fA7wBBlq6+x4P2iJ4M/QK4KN+l/JzrjYEGp0+6DuG2XpCCHMhOn/gn ueJQ== X-Gm-Message-State: APjAAAXVnv3OO6A2g/QMohdcLSrPL1jKYkb016V2oeMLecFCvrc6+IE+ nTXG7Dy0sPt5YX2almaCE3PrfhXx3gs= X-Google-Smtp-Source: APXvYqy/U6jqleUrq92SJIebnL5V6jj/oaT0YKIyKAVbkqwq3xI3c3Q+6I3NeMxkJDifRBRQftvoaA== X-Received: by 2002:ac8:714c:: with SMTP id h12mr2008969qtp.231.1571681994881; Mon, 21 Oct 2019 11:19:54 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 15:19:11 -0300 Message-Id: <20191021181911.14986-22-danielhb413@gmail.com> In-Reply-To: <20191021181911.14986-1-danielhb413@gmail.com> References: <20191021181911.14986-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.66]); Mon, 21 Oct 2019 18:19:55 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.66]); Mon, 21 Oct 2019 18:19:55 +0000 (UTC) for IP:'209.85.160.171' DOMAIN:'mail-qt1-f171.google.com' HELO:'mail-qt1-f171.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.15 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS) 209.85.160.171 mail-qt1-f171.google.com 209.85.160.171 mail-qt1-f171.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.66 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 21/21] bhyve_device.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.84 on 10.5.11.22 X-MC-Unique: Bo9LZyaqM12AzIgNrIkuow-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza Reviewed-by: J=C3=A1n Tomko --- src/bhyve/bhyve_device.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/src/bhyve/bhyve_device.c b/src/bhyve/bhyve_device.c index 4913be8422..ddbe20d31d 100644 --- a/src/bhyve/bhyve_device.c +++ b/src/bhyve/bhyve_device.c @@ -36,7 +36,6 @@ bhyveCollectPCIAddress(virDomainDefPtr def G_GNUC_UNUSED, virDomainDeviceInfoPtr info, void *opaque) { - int ret =3D -1; if (info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) return 0; =20 @@ -56,12 +55,10 @@ bhyveCollectPCIAddress(virDomainDefPtr def G_GNUC_UNUSE= D, =20 if (virDomainPCIAddressReserveAddr(addrs, addr, VIR_PCI_CONNECT_TYPE_PCI_DEVICE, 0)= < 0) { - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 virDomainPCIAddressSetPtr @@ -169,13 +166,11 @@ int bhyveDomainAssignPCIAddresses(virDomainDefPtr def, virDomainPCIAddressSetPtr addrs =3D NULL; bhyveDomainObjPrivatePtr priv =3D NULL; =20 - int ret =3D -1; - if (!(addrs =3D bhyveDomainPCIAddressSetCreate(def, 1))) - goto cleanup; + return -1; =20 if (bhyveAssignDevicePCISlots(def, addrs) < 0) - goto cleanup; + return -1; =20 if (obj && obj->privateData) { priv =3D obj->privateData; @@ -188,10 +183,7 @@ int bhyveDomainAssignPCIAddresses(virDomainDefPtr def, } } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 int bhyveDomainAssignAddresses(virDomainDefPtr def, virDomainObjPtr obj) --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list