From nobody Sun Feb 8 18:49:32 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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 (zohomail.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=1578594860; cv=none; d=zohomail.com; s=zohoarc; b=W9tJsioyDcMz4fOQvhEseUkwSNBBbip5wj36vhg1ZRKQC6q4TUfO4Qi6OEBMDNUBNycZ8Jtf5p/k0iFmB3WOC3FK8knAf5nBBn0WNXOUTBU9DsBOZz/1Bp6LrooINV+5FktqFY1DRqghmdIUCaS5oO8YsqyHL/wgJFrqfmVBy3g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578594860; 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=Fc+8UfyjYzGiscBJvXJJdESvT0m+2MEdTLCKPLBUYvo=; b=T4UFmt2zlcD7KFq8dt1IVWoZGAayI3R+gW7zsoXR+sv1RHpleLKtpZSN+C9c75InlFVIT51dyvPGNXS2xeRO3mp+JNfAN1wbrmZxuPon6nuLkz3xTCm+k+PlKVVo/Su9BhbNTRj/uPkKTsSYZgoN4Uz9wwzvhTOhwCr9rmGmsjM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.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 1578594860181907.7031799253704; Thu, 9 Jan 2020 10:34:20 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-39-1pQoPnrUOZ65S2VFHQveRA-1; Thu, 09 Jan 2020 13:34:16 -0500 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 E8E6118A6EC8; Thu, 9 Jan 2020 18:34: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 BDE5786CBF; Thu, 9 Jan 2020 18:34: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 6B2F518089CE; Thu, 9 Jan 2020 18:34:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 009IY65o019833 for ; Thu, 9 Jan 2020 13:34:06 -0500 Received: by smtp.corp.redhat.com (Postfix) id BB6A720230A6; Thu, 9 Jan 2020 18:34:06 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B5B07202A941 for ; Thu, 9 Jan 2020 18:34:06 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 816BF86D729 for ; Thu, 9 Jan 2020 18:34:06 +0000 (UTC) Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-251-h6arXWSYOoic_p6mC3HjqQ-1; Thu, 09 Jan 2020 13:34:04 -0500 Received: by mail-qt1-f193.google.com with SMTP id k40so6684548qtk.8 for ; Thu, 09 Jan 2020 10:34:04 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:541e:7a5e:37ad:989b:4530]) by smtp.gmail.com with ESMTPSA id g52sm3902267qta.58.2020.01.09.10.34.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2020 10:34:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578594859; 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=Fc+8UfyjYzGiscBJvXJJdESvT0m+2MEdTLCKPLBUYvo=; b=QngceaD/qzDPOONyH9lQic4gDrA/EjAo7X7sQNvEYJNldN5oXPgWEqi7LUnuyJZn7SD8em gNgEEY3FY2kYoaSgDntTZ8gIeAG+v+SVct51bsbB0/8vnwDQq/AWEAMKNFcvaVeUX/1ChO uE9JhhvHV64Q0hmkCAjWsa3aj+Y9phg= 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=nFi51Z15UwQ7OE9pccHheplyKnP6On3Ox1vcSBziCh8=; b=d/d320V/cFrpUCUOVcmgva7buBOr8brYCGpZQjfTwNcQarbc63yR9Q8o+vo01RpJkQ W7YnBcDQ+Mr94DPC1aX5TFQY8JsD7imiqmtjDJARJfaFPqKRD9xLToL2uWTzNoItuwgu l1S40ZAV5/Rrf2p8aQXCs+imBT3LYbhkEUrQ9CuQRFp4DRYeC6ZdchuaHNnMO3NliAwv p9lj6S7nrgijhhfM7XYOpfY7zobD1VtT+suNl3D80Dn5g6+1pAppDlro4WWL3XmoU9vO RWNkrQUXNF9fjLtYza2CWRRy0U6Y7qsV0FtMuGI7zBZs1mYCGHC6un1uG1yTSUn3e5B2 upqw== X-Gm-Message-State: APjAAAUdTPDaeuTXQ3DuIACKT5o/eBfd94Utvtz7+PXChGjn0J297MTh UcfqDAa+ZN1AGFUmL1lXaaHNa1xzRGQ= X-Google-Smtp-Source: APXvYqydlkzjWVbexc1zgCzqdwQGq5+iLf7MEBQ5mb0YBVkrt8HxDH0rbnS2bWiJuN/aC7+6bzaNoA== X-Received: by 2002:aed:3c7b:: with SMTP id u56mr9172760qte.82.1578594843883; Thu, 09 Jan 2020 10:34:03 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Thu, 9 Jan 2020 15:33:46 -0300 Message-Id: <20200109183348.1362138-7-danielhb413@gmail.com> In-Reply-To: <20200109183348.1362138-1-danielhb413@gmail.com> References: <20200109183348.1362138-1-danielhb413@gmail.com> MIME-Version: 1.0 X-MC-Unique: h6arXWSYOoic_p6mC3HjqQ-1 X-MC-Unique: 1pQoPnrUOZ65S2VFHQveRA-1 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 009IY65o019833 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 6/8] qemu_domain.c: removing 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.13 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Previous patches deprecated some 'cleanup' labels. Let's remove them. Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_domain.c | 267 +++++++++++++++-------------------------- 1 file changed, 98 insertions(+), 169 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 6bf704a6f5..931554eeb6 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2034,42 +2034,41 @@ qemuDomainSecretPrepare(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv =3D vm->privateData; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); size_t i; - int ret =3D -1; =20 /* disk secrets are prepared when preparing disks */ =20 for (i =3D 0; i < vm->def->nhostdevs; i++) { if (qemuDomainSecretHostdevPrepare(priv, vm->def->hostdevs[i]) < 0) - goto cleanup; + return -1; } =20 for (i =3D 0; i < vm->def->nserials; i++) { if (qemuDomainSecretChardevPrepare(cfg, priv, vm->def->serials[i]->info.alias, vm->def->serials[i]->source) < = 0) - goto cleanup; + return -1; } =20 for (i =3D 0; i < vm->def->nparallels; i++) { if (qemuDomainSecretChardevPrepare(cfg, priv, vm->def->parallels[i]->info.ali= as, vm->def->parallels[i]->source) = < 0) - goto cleanup; + return -1; } =20 for (i =3D 0; i < vm->def->nchannels; i++) { if (qemuDomainSecretChardevPrepare(cfg, priv, vm->def->channels[i]->info.alia= s, vm->def->channels[i]->source) <= 0) - goto cleanup; + return -1; } =20 for (i =3D 0; i < vm->def->nconsoles; i++) { if (qemuDomainSecretChardevPrepare(cfg, priv, vm->def->consoles[i]->info.alia= s, vm->def->consoles[i]->source) <= 0) - goto cleanup; + return -1; } =20 for (i =3D 0; i < vm->def->nsmartcards; i++) @@ -2078,32 +2077,29 @@ qemuDomainSecretPrepare(virQEMUDriverPtr driver, qemuDomainSecretChardevPrepare(cfg, priv, vm->def->smartcards[i]->info.al= ias, vm->def->smartcards[i]->data.pa= ssthru) < 0) - goto cleanup; + return -1; =20 for (i =3D 0; i < vm->def->nrngs; i++) { if (vm->def->rngs[i]->backend =3D=3D VIR_DOMAIN_RNG_BACKEND_EGD && qemuDomainSecretChardevPrepare(cfg, priv, vm->def->rngs[i]->info.alias, vm->def->rngs[i]->source.charde= v) < 0) - goto cleanup; + return -1; } =20 for (i =3D 0; i < vm->def->nredirdevs; i++) { if (qemuDomainSecretChardevPrepare(cfg, priv, vm->def->redirdevs[i]->info.ali= as, vm->def->redirdevs[i]->source) = < 0) - goto cleanup; + return -1; } =20 for (i =3D 0; i < vm->def->ngraphics; i++) { if (qemuDomainSecretGraphicsPrepare(cfg, priv, vm->def->graphics[i= ]) < 0) - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -2131,10 +2127,9 @@ qemuDomainSetPrivatePaths(virQEMUDriverPtr driver, g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv =3D vm->privateData; g_autofree char *domname =3D virDomainDefGetShortName(vm->def); - int ret =3D -1; =20 if (!domname) - goto cleanup; + return -1; =20 if (!priv->libDir) priv->libDir =3D g_strdup_printf("%s/domain-%s", cfg->libDir, domn= ame); @@ -2143,9 +2138,7 @@ qemuDomainSetPrivatePaths(virQEMUDriverPtr driver, priv->channelTargetDir =3D g_strdup_printf("%s/domain-%s", cfg->channelTargetDir, do= mname); =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -2327,7 +2320,6 @@ qemuStorageSourcePrivateDataParse(xmlXPathContextPtr = ctxt, qemuDomainStorageSourcePrivatePtr priv; g_autofree char *authalias =3D NULL; g_autofree char *encalias =3D NULL; - int ret =3D -1; =20 src->nodestorage =3D virXPathString("string(./nodenames/nodename[@type= =3D'storage']/@name)", ctxt); src->nodeformat =3D virXPathString("string(./nodenames/nodename[@type= =3D'format']/@name)", ctxt); @@ -2342,25 +2334,21 @@ qemuStorageSourcePrivateDataParse(xmlXPathContextPt= r ctxt, if (authalias || encalias) { if (!src->privateData && !(src->privateData =3D qemuDomainStorageSourcePrivateNew())) - goto cleanup; + return -1; =20 priv =3D QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src); =20 if (qemuStorageSourcePrivateDataAssignSecinfo(&priv->secinfo, &aut= halias) < 0) - goto cleanup; + return -1; =20 if (qemuStorageSourcePrivateDataAssignSecinfo(&priv->encinfo, &enc= alias) < 0) - goto cleanup; + return -1; } =20 if (virStorageSourcePrivateDataParseRelPath(ctxt, src) < 0) - goto cleanup; - - ret =3D 0; - - cleanup: + return -1; =20 - return ret; + return 0; } =20 =20 @@ -2482,28 +2470,24 @@ qemuDomainObjPrivateXMLFormatAutomaticPlacement(vir= BufferPtr buf, { g_autofree char *nodeset =3D NULL; g_autofree char *cpuset =3D NULL; - int ret =3D -1; =20 if (!priv->autoNodeset && !priv->autoCpuset) return 0; =20 if (priv->autoNodeset && !((nodeset =3D virBitmapFormat(priv->autoNodeset)))) - goto cleanup; + return -1; =20 if (priv->autoCpuset && !((cpuset =3D virBitmapFormat(priv->autoCpuset)))) - goto cleanup; + return -1; =20 virBufferAddLit(buf, "\n"); =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -3006,7 +2990,6 @@ qemuDomainObjPrivateXMLParseVcpu(xmlNodePtr node, g_autofree char *idstr =3D NULL; g_autofree char *pidstr =3D NULL; unsigned int tmp; - int ret =3D -1; =20 idstr =3D virXMLPropString(node, "id"); =20 @@ -3014,26 +2997,23 @@ qemuDomainObjPrivateXMLParseVcpu(xmlNodePtr node, (virStrToLong_uip(idstr, NULL, 10, &idx) < 0)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot parse vcpu index '%s'"), idstr); - goto cleanup; + return -1; } if (!(vcpu =3D virDomainDefGetVcpu(def, idx))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("invalid vcpu index '%u'"), idx); - goto cleanup; + return -1; } =20 if (!(pidstr =3D virXMLPropString(node, "pid"))) - goto cleanup; + return -1; =20 if (virStrToLong_uip(pidstr, NULL, 10, &tmp) < 0) - goto cleanup; + return -1; =20 QEMU_DOMAIN_VCPU_PRIVATE(vcpu)->tid =3D tmp; =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -3047,7 +3027,6 @@ qemuDomainObjPrivateXMLParseAutomaticPlacement(xmlXPa= thContextPtr ctxt, g_autofree char *cpuset =3D NULL; int nodesetSize =3D 0; size_t i; - int ret =3D -1; =20 nodeset =3D virXPathString("string(./numad/@nodeset)", ctxt); cpuset =3D virXPathString("string(./numad/@cpuset)", ctxt); @@ -3056,7 +3035,7 @@ qemuDomainObjPrivateXMLParseAutomaticPlacement(xmlXPa= thContextPtr ctxt, return 0; =20 if (!(caps =3D virQEMUDriverGetHostNUMACaps(driver))) - goto cleanup; + return -1; =20 /* Figure out how big the nodeset bitmap needs to be. * This is necessary because NUMA node IDs are not guaranteed to @@ -3069,24 +3048,20 @@ qemuDomainObjPrivateXMLParseAutomaticPlacement(xmlX= PathContextPtr ctxt, =20 if (nodeset && virBitmapParse(nodeset, &priv->autoNodeset, nodesetSize) < 0) - goto cleanup; + return -1; =20 if (cpuset) { if (virBitmapParse(cpuset, &priv->autoCpuset, VIR_DOMAIN_CPUMASK_L= EN) < 0) - goto cleanup; + return -1; } else { /* autoNodeset is present in this case, since otherwise we wouldn't * reach this code */ if (!(priv->autoCpuset =3D virCapabilitiesHostNUMAGetCpus(caps, priv->auto= Nodeset))) - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - - return ret; + return 0; } =20 =20 @@ -3403,7 +3378,6 @@ int qemuDomainObjPrivateXMLParseAllowReboot(xmlXPathContextPtr ctxt, virTristateBool *allowReboot) { - int ret =3D -1; int val; g_autofree char *valStr =3D NULL; =20 @@ -3411,15 +3385,12 @@ qemuDomainObjPrivateXMLParseAllowReboot(xmlXPathCon= textPtr ctxt, if ((val =3D virTristateBoolTypeFromString(valStr)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("invalid allowReboot value '%s'"), valStr); - goto cleanup; + return -1; } *allowReboot =3D val; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -3486,10 +3457,9 @@ qemuDomainObjPrivateXMLParseJobNBD(virDomainObjPtr v= m, g_autofree xmlNodePtr *nodes =3D NULL; size_t i; int n; - int ret =3D -1; =20 if ((n =3D virXPathNodeSet("./disk[@migrating=3D'yes']", ctxt, &nodes)= ) < 0) - goto cleanup; + return -1; =20 if (n > 0) { if (priv->job.asyncJob !=3D QEMU_ASYNC_JOB_MIGRATION_OUT) { @@ -3508,15 +3478,12 @@ qemuDomainObjPrivateXMLParseJobNBD(virDomainObjPtr = vm, if (qemuDomainObjPrivateXMLParseJobNBDSource(nodes[i], ctx= t, disk, priv->driver-= >xmlopt) < 0) - goto cleanup; + return -1; } } } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -3527,12 +3494,9 @@ qemuDomainObjPrivateXMLParseJob(virDomainObjPtr vm, { VIR_XPATH_NODE_AUTORESTORE(ctxt); g_autofree char *tmp =3D NULL; - int ret =3D -1; =20 - if (!(ctxt->node =3D virXPathNode("./job[1]", ctxt))) { - ret =3D 0; - goto cleanup; - } + if (!(ctxt->node =3D virXPathNode("./job[1]", ctxt))) + return 0; =20 if ((tmp =3D virXPathString("string(@type)", ctxt))) { int type; @@ -3540,7 +3504,7 @@ qemuDomainObjPrivateXMLParseJob(virDomainObjPtr vm, if ((type =3D qemuDomainJobTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown job type %s"), tmp); - goto cleanup; + return -1; } VIR_FREE(tmp); priv->job.active =3D type; @@ -3552,7 +3516,7 @@ qemuDomainObjPrivateXMLParseJob(virDomainObjPtr vm, if ((async =3D qemuDomainAsyncJobTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown async job type %s"), tmp); - goto cleanup; + return -1; } VIR_FREE(tmp); priv->job.asyncJob =3D async; @@ -3562,7 +3526,7 @@ qemuDomainObjPrivateXMLParseJob(virDomainObjPtr vm, if (priv->job.phase < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown job phase %s"), tmp); - goto cleanup; + return -1; } VIR_FREE(tmp); } @@ -3570,19 +3534,16 @@ qemuDomainObjPrivateXMLParseJob(virDomainObjPtr vm, =20 if (virXPathULongHex("string(@flags)", ctxt, &priv->job.apiFlags) =3D= =3D -2) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid job flags"= )); - goto cleanup; + return -1; } =20 if (qemuDomainObjPrivateXMLParseJobNBD(vm, priv, ctxt) < 0) - goto cleanup; + return -1; =20 if (qemuMigrationParamsParse(ctxt, &priv->job.migParams) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -5664,38 +5625,37 @@ qemuDomainDefValidate(const virDomainDef *def, virQEMUDriverPtr driver =3D opaque; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); g_autoptr(virQEMUCaps) qemuCaps =3D NULL; - int ret =3D -1; size_t i; =20 if (!(qemuCaps =3D virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator))) - goto cleanup; + return -1; =20 if (def->os.type !=3D VIR_DOMAIN_OSTYPE_HVM) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Emulator '%s' does not support os type '%s'"), def->emulator, virDomainOSTypeToString(def->os.type= )); - goto cleanup; + return -1; } =20 if (!virQEMUCapsIsArchSupported(qemuCaps, def->os.arch)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Emulator '%s' does not support arch '%s'"), def->emulator, virArchToString(def->os.arch)); - goto cleanup; + return -1; } =20 if (!virQEMUCapsIsVirtTypeSupported(qemuCaps, def->virtType)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Emulator '%s' does not support virt type '%s'"), def->emulator, virDomainVirtTypeToString(def->virtT= ype)); - goto cleanup; + return -1; } =20 if (def->mem.min_guarantee) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Parameter 'min_guarantee' not supported by QEMU.= ")); - goto cleanup; + return -1; } =20 /* On x86, UEFI requires ACPI */ @@ -5705,7 +5665,7 @@ qemuDomainDefValidate(const virDomainDef *def, def->features[VIR_DOMAIN_FEATURE_ACPI] !=3D VIR_TRISTATE_SWITCH_ON= ) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("UEFI requires ACPI on this architecture")); - goto cleanup; + return -1; } =20 /* On aarch64, ACPI requires UEFI */ @@ -5715,7 +5675,7 @@ qemuDomainDefValidate(const virDomainDef *def, !virDomainDefHasOldStyleUEFI(def))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("ACPI requires UEFI on this architecture")); - goto cleanup; + return -1; } =20 if (def->os.loader && @@ -5726,7 +5686,7 @@ qemuDomainDefValidate(const virDomainDef *def, if (!qemuDomainIsQ35(def)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Secure boot is supported with q35 machine ty= pes only")); - goto cleanup; + return -1; } =20 /* Now, technically it is possible to have secure boot on @@ -5735,7 +5695,7 @@ qemuDomainDefValidate(const virDomainDef *def, if (def->os.arch !=3D VIR_ARCH_X86_64) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Secure boot is supported for x86_64 architec= ture only")); - goto cleanup; + return -1; } =20 /* SMM will be enabled by qemuFirmwareFillDomain() if needed. */ @@ -5743,7 +5703,7 @@ qemuDomainDefValidate(const virDomainDef *def, def->features[VIR_DOMAIN_FEATURE_SMM] !=3D VIR_TRISTATE_SWITCH= _ON) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Secure boot requires SMM feature enabled")); - goto cleanup; + return -1; } } =20 @@ -5751,7 +5711,7 @@ qemuDomainDefValidate(const virDomainDef *def, !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VMGENID)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("this QEMU does not support the 'genid' capabilit= y")); - goto cleanup; + return -1; } =20 /* Serial graphics adapter */ @@ -5759,23 +5719,23 @@ qemuDomainDefValidate(const virDomainDef *def, if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SGA)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("qemu does not support SGA")); - goto cleanup; + return -1; } if (!def->nserials) { virReportError(VIR_ERR_XML_ERROR, "%s", _("need at least one serial port to use SGA")); - goto cleanup; + return -1; } } =20 if (qemuDomainDefValidateClockTimers(def, qemuCaps) < 0) - goto cleanup; + return -1; =20 if (qemuDomainDefValidatePM(def, qemuCaps) < 0) - goto cleanup; + return -1; =20 if (qemuDomainDefValidateBoot(def, qemuCaps) < 0) - goto cleanup; + return -1; =20 /* QEMU 2.7 (detected via the availability of query-hotpluggable-cpus) * enforces stricter rules than previous versions when it comes to gue= st @@ -5792,7 +5752,7 @@ qemuDomainDefValidate(const virDomainDef *def, if (topologycpus !=3D virDomainDefGetVcpusMax(def)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("CPU topology doesn't match maximum vcpu = count")); - goto cleanup; + return -1; } =20 numacpus =3D virDomainNumaGetCPUCountTotal(def->numa); @@ -5810,12 +5770,12 @@ qemuDomainDefValidate(const virDomainDef *def, _("vCPUs count must be a multiple of the vCPU " "hotplug granularity (%u)"), granularity); - goto cleanup; + return -1; } } =20 if (qemuDomainValidateCpuCount(def, qemuCaps) < 0) - goto cleanup; + return -1; =20 if (ARCH_IS_X86(def->os.arch) && virDomainDefGetVcpusMax(def) > QEMU_MAX_VCPUS_WITHOUT_EIM) { @@ -5824,14 +5784,14 @@ qemuDomainDefValidate(const virDomainDef *def, _("more than %d vCPUs are only supported on " "q35-based machine types"), QEMU_MAX_VCPUS_WITHOUT_EIM); - goto cleanup; + return -1; } if (!def->iommu || def->iommu->eim !=3D VIR_TRISTATE_SWITCH_ON) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("more than %d vCPUs require extended interrup= t " "mode enabled on the iommu device"), QEMU_MAX_VCPUS_WITHOUT_EIM); - goto cleanup; + return -1; } } =20 @@ -5839,20 +5799,20 @@ qemuDomainDefValidate(const virDomainDef *def, def->virtType !=3D VIR_DOMAIN_VIRT_KVM) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("cachetune is only supported for KVM domains")); - goto cleanup; + return -1; } =20 if (qemuDomainDefValidateFeatures(def, qemuCaps) < 0) - goto cleanup; + return -1; =20 if (qemuDomainDefValidateMemory(def, qemuCaps) < 0) - goto cleanup; + return -1; =20 if (qemuDomainDefValidateNuma(def, qemuCaps) < 0) - goto cleanup; + return -1; =20 if (qemuDomainDefValidateConsole(def, qemuCaps) < 0) - goto cleanup; + return -1; =20 if (cfg->vncTLS && cfg->vncTLSx509secretUUID && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_TLS_CREDS_X509)) { @@ -5861,15 +5821,12 @@ qemuDomainDefValidate(const virDomainDef *def, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("encrypted VNC TLS keys are not supported= with " "this QEMU binary")); - goto cleanup; + return -1; } } } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -8835,7 +8792,6 @@ qemuDomainDeviceDiskDefPostParseRestoreSecAlias(virDo= mainDiskDefPtr disk, bool restoreEncSecret =3D false; g_autofree char *authalias =3D NULL; g_autofree char *encalias =3D NULL; - int ret =3D -1; =20 if (!(parseFlags & VIR_DOMAIN_DEF_PARSE_STATUS) || !qemuCaps || @@ -8875,24 +8831,21 @@ qemuDomainDeviceDiskDefPostParseRestoreSecAlias(vir= DomainDiskDefPtr disk, =20 if (restoreAuthSecret) { if (!(authalias =3D qemuDomainGetSecretAESAlias(disk->info.alias, = false))) - goto cleanup; + return -1; =20 if (qemuStorageSourcePrivateDataAssignSecinfo(&priv->secinfo, &aut= halias) < 0) - goto cleanup; + return -1; } =20 if (restoreEncSecret) { if (!(encalias =3D qemuDomainGetSecretAESAlias(disk->info.alias, t= rue))) - goto cleanup; + return -1; =20 if (qemuStorageSourcePrivateDataAssignSecinfo(&priv->encinfo, &enc= alias) < 0) - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -10450,10 +10403,10 @@ qemuDomainLogContextPtr qemuDomainLogContextNew(v= irQEMUDriverPtr driver, qemuDomainLogContextPtr ctxt =3D NULL; =20 if (qemuDomainInitialize() < 0) - goto cleanup; + return NULL; =20 if (!(ctxt =3D virObjectNew(qemuDomainLogContextClass))) - goto cleanup; + return NULL; =20 VIR_DEBUG("Context new %p stdioLogD=3D%d", ctxt, cfg->stdioLogD); ctxt->writefd =3D -1; @@ -10519,13 +10472,11 @@ qemuDomainLogContextPtr qemuDomainLogContextNew(v= irQEMUDriverPtr driver, } } =20 - cleanup: return ctxt; =20 error: virObjectUnref(ctxt); - ctxt =3D NULL; - goto cleanup; + return NULL; } =20 =20 @@ -10709,7 +10660,6 @@ qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm, const char *snapshotDir) { g_autofree char *newxml =3D NULL; - int ret =3D -1; g_autofree char *snapDir =3D NULL; g_autofree char *snapFile =3D NULL; char uuidstr[VIR_UUID_STRING_BUFLEN]; @@ -10728,15 +10678,12 @@ qemuDomainSnapshotWriteMetadata(virDomainObjPtr v= m, if (virFileMakePath(snapDir) < 0) { virReportSystemError(errno, _("cannot create snapshot directory '%= s'"), snapDir); - goto cleanup; + return -1; } =20 snapFile =3D g_strdup_printf("%s/%s.xml", snapDir, def->parent.name); =20 - ret =3D virXMLSaveFile(snapFile, NULL, "snapshot-edit", newxml); - - cleanup: - return ret; + return virXMLSaveFile(snapFile, NULL, "snapshot-edit", newxml); } =20 =20 @@ -10841,7 +10788,6 @@ qemuDomainSnapshotDiscard(virQEMUDriverPtr driver, bool metadata_only) { g_autofree char *snapFile =3D NULL; - int ret =3D -1; qemuDomainObjPrivatePtr priv; virDomainMomentObjPtr parentsnap =3D NULL; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); @@ -10851,7 +10797,7 @@ qemuDomainSnapshotDiscard(virQEMUDriverPtr driver, /* Ignore any skipped disks */ if (qemuDomainSnapshotForEachQcow2(driver, vm, snap, "-d", true) < 0) - goto cleanup; + return -1; } else { priv =3D vm->privateData; qemuDomainObjEnterMonitor(driver, vm); @@ -10891,10 +10837,7 @@ qemuDomainSnapshotDiscard(virQEMUDriverPtr driver, virDomainMomentDropParent(snap); virDomainSnapshotObjListRemove(vm->snapshots, snap); =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 /* Hash iterator callback to discard multiple snapshots. */ @@ -11275,17 +11218,13 @@ qemuDomainStorageFileInit(virQEMUDriverPtr driver, g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); uid_t uid; gid_t gid; - int ret =3D -1; =20 qemuDomainGetImageIds(cfg, vm, src, parent, &uid, &gid); =20 if (virStorageFileInitAs(src, uid, gid) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -14441,7 +14380,6 @@ qemuDomainSetupDev(virQEMUDriverConfigPtr cfg, { g_autofree char *mount_options =3D NULL; g_autofree char *opts =3D NULL; - int ret =3D -1; =20 VIR_DEBUG("Setting up /dev/ for domain %s", vm->def->name); =20 @@ -14457,14 +14395,12 @@ qemuDomainSetupDev(virQEMUDriverConfigPtr cfg, opts =3D g_strdup_printf("mode=3D755,size=3D65536%s", mount_options); =20 if (virFileSetupDev(data->path, opts) < 0) - goto cleanup; + return -1; =20 if (qemuDomainPopulateDevices(cfg, vm, data) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -14475,7 +14411,6 @@ qemuDomainSetupDisk(virQEMUDriverConfigPtr cfg G_GN= UC_UNUSED, { virStorageSourcePtr next; bool hasNVMe =3D false; - int ret =3D -1; =20 for (next =3D disk->src; virStorageSourceIsBacking(next); next =3D nex= t->backingStore) { if (next->type =3D=3D VIR_STORAGE_TYPE_NVME) { @@ -14484,10 +14419,10 @@ qemuDomainSetupDisk(virQEMUDriverConfigPtr cfg G_= GNUC_UNUSED, hasNVMe =3D true; =20 if (!(nvmePath =3D virPCIDeviceAddressGetIOMMUGroupDev(&next->= nvme->pciAddr))) - goto cleanup; + return -1; =20 if (qemuDomainCreateDevice(nvmePath, data, false) < 0) - goto cleanup; + return -1; } else { if (!next->path || !virStorageSourceIsLocalStorage(next)) { /* Not creating device. Just continue. */ @@ -14495,22 +14430,20 @@ qemuDomainSetupDisk(virQEMUDriverConfigPtr cfg G_= GNUC_UNUSED, } =20 if (qemuDomainCreateDevice(next->path, data, false) < 0) - goto cleanup; + return -1; } } =20 /* qemu-pr-helper might require access to /dev/mapper/control. */ if (disk->src->pr && qemuDomainCreateDevice(QEMU_DEVICE_MAPPER_CONTROL_PATH, data, true= ) < 0) - goto cleanup; + return -1; =20 if (hasNVMe && qemuDomainCreateDevice(QEMU_DEV_VFIO, data, false) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -14994,15 +14927,12 @@ qemuDomainCreateNamespace(virQEMUDriverPtr driver, virDomainObjPtr vm) { g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); - int ret =3D -1; =20 if (virBitmapIsBitSet(cfg->namespaces, QEMU_DOMAIN_NS_MOUNT) && qemuDomainEnableNamespace(vm, QEMU_DOMAIN_NS_MOUNT) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -15879,7 +15809,7 @@ qemuDomainGetStorageSourceByDevstr(const char *devs= tr, if (!disk) { virReportError(VIR_ERR_INVALID_ARG, _("failed to find disk '%s'"), target); - goto cleanup; + return NULL; } =20 if (idx =3D=3D 0) @@ -15887,7 +15817,6 @@ qemuDomainGetStorageSourceByDevstr(const char *devs= tr, else src =3D virStorageFileChainLookup(disk->src, NULL, NULL, idx, NULL= ); =20 - cleanup: return src; } =20 --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list