From nobody Mon Feb 9 10:32:34 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652281451; cv=none; d=zohomail.com; s=zohoarc; b=cCsHajOs9sM2+IXSyTwdoRMUQjo6q5Ert8B9vElB0OBVn4xczqDfwmVzxnN/SrDDgSrzmxEXMZ93sR1nxeRjhHNLuD26In4uiTIjyZl+1HJsF2Ctp1224Iz6lRlRRy2cDxqENSEwgWiMv0gmtzneU99aCx5yecVWss8h/iMPUAM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652281451; h=Content-Type:Content-Transfer-Encoding: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=B4PoGY3eebrHfGCG4P7edoZPHQy2yqUL8px3tK983K0=; b=U8a4I3F9+6YDutx5/CQT9pEyicISm5+mez4xgA/85VGyo14zLJqsI85r9VvT0tZT2T4YN59fVAAQtrrj72AR4etF0SPIMPyiF5SKBK6O0scGJLGuSELmeHxYRt6uMpL7No0oBfGfLwws3SqUU/sI8CL/vkkcc0XeaTW1NCpFmek= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 165228145188462.921232322707965; Wed, 11 May 2022 08:04:11 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-540-TU58EWXAOvyb6ZJRtWA9gw-1; Wed, 11 May 2022 11:03:37 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9A197382ECE3; Wed, 11 May 2022 15:03:30 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 86A202026D2F; Wed, 11 May 2022 15:03:30 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 47D2E193F6F3; Wed, 11 May 2022 15:03:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id CACE4194707B for ; Wed, 11 May 2022 15:03:28 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id AF8811121315; Wed, 11 May 2022 15:03:28 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.180]) by smtp.corp.redhat.com (Postfix) with ESMTP id 578421121314 for ; Wed, 11 May 2022 15:03:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652281450; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=B4PoGY3eebrHfGCG4P7edoZPHQy2yqUL8px3tK983K0=; b=TrdshWxwR4K+jdCOOaymInw54yaFqsDxVrKQR5Mj94THwSvPudIf6jefW4aRkYJprds5a4 DDL2ilaR+DcLz42HFZL9ukQEjdr6c9uqEmU8qmftVPvIE9fTDz+RuDrOmAFVtiMBq/jfJ9 je6pm03CgAX8Dkeimbc+x3gQlanb4kk= X-MC-Unique: TU58EWXAOvyb6ZJRtWA9gw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 4/4] qemu_domain: Drop needless 'error' label in qemuDomainObjPrivateXMLParse() Date: Wed, 11 May 2022 17:03:19 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652281452915100001 Content-Type: text/plain; charset="utf-8"; x-default="true" After previous cleanup the 'error' label in qemuDomainObjPrivateXMLParse() contains nothing but a return statement. Well, the label can be dropped and all 'goto'-s can be replaced with the return statement directly. Signed-off-by: Michal Privoznik --- src/qemu/qemu_domain.c | 53 ++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 4de4840c8e..a86bba93d1 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2912,13 +2912,13 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctx= t, g_autoptr(virQEMUCaps) qemuCaps =3D NULL; =20 if (!(priv->monConfig =3D virDomainChrSourceDefNew(NULL))) - goto error; + return -1; =20 if (!(monitorpath =3D virXPathString("string(./monitor[1]/@path)", ctxt))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no monitor path")); - goto error; + return -1; } =20 tmp =3D virXPathString("string(./monitor[1]/@type)", ctxt); @@ -2940,13 +2940,13 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctx= t, virReportError(VIR_ERR_INTERNAL_ERROR, _("unsupported monitor type '%s'"), virDomainChrTypeToString(priv->monConfig->type)); - goto error; + return -1; } =20 if (virXPathInt("string(./agentTimeout)", ctxt, &priv->agentTimeout) = =3D=3D -2) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to parse agent timeout")); - goto error; + return -1; } =20 priv->dbusDaemonRunning =3D virXPathBoolean("boolean(./dbusDaemon)", c= txt) > 0; @@ -2963,11 +2963,11 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctx= t, virReportError(VIR_ERR_INTERNAL_ERROR, _("malformed namespace name: %s"), next->name); - goto error; + return -1; } =20 if (qemuDomainEnableNamespace(vm, ns) < 0) - goto error; + return -1; } } =20 @@ -2979,22 +2979,22 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctx= t, priv->rememberOwner =3D virXPathBoolean("count(./rememberOwner) > 0", = ctxt); =20 if ((n =3D virXPathNodeSet("./vcpus/vcpu", ctxt, &nodes)) < 0) - goto error; + return -1; =20 for (i =3D 0; i < n; i++) { if (qemuDomainObjPrivateXMLParseVcpu(nodes[i], i, vm->def) < 0) - goto error; + return -1; } VIR_FREE(nodes); =20 if ((n =3D virXPathNodeSet("./qemuCaps/flag", ctxt, &nodes)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to parse qemu capabilities flags")); - goto error; + return -1; } if (n > 0) { if (!(qemuCaps =3D virQEMUCapsNew())) - goto error; + return -1; =20 for (i =3D 0; i < n; i++) { g_autofree char *str =3D virXMLPropString(nodes[i], "name"); @@ -3003,7 +3003,7 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, if (flag < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown qemu capabilities flag %s"),= str); - goto error; + return -1; } virQEMUCapsSet(qemuCaps, flag); } @@ -3016,14 +3016,14 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctx= t, priv->lockState =3D virXPathString("string(./lockstate)", ctxt); =20 if (qemuDomainObjPrivateXMLParseJob(vm, ctxt) < 0) - goto error; + return -1; =20 priv->fakeReboot =3D virXPathBoolean("boolean(./fakereboot)", ctxt) = =3D=3D 1; =20 if ((n =3D virXPathNodeSet("./devices/device", ctxt, &nodes)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to parse qemu device list")); - goto error; + return -1; } if (n > 0) { /* NULL-terminated list */ @@ -3034,7 +3034,7 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, if (!priv->qemuDevices[i]) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to parse qemu device list")); - goto error; + return -1; } } } @@ -3043,7 +3043,7 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, if ((n =3D virXPathNodeSet("./slirp/helper", ctxt, &nodes)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to parse slirp helper list")); - goto error; + return -1; } for (i =3D 0; i < n; i++) { g_autofree char *alias =3D virXMLPropString(nodes[i], "alias"); @@ -3055,22 +3055,22 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctx= t, virStrToLong_i(pid, NULL, 10, &slirp->pid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to parse slirp helper list")); - goto error; + return -1; } =20 if (virDomainDefFindDevice(vm->def, alias, &dev, true) < 0 || dev.type !=3D VIR_DOMAIN_DEVICE_NET) - goto error; + return -1; =20 if (qemuDomainObjPrivateXMLParseSlirpFeatures(nodes[i], ctxt, slir= p) < 0) - goto error; + return -1; =20 QEMU_DOMAIN_NETWORK_PRIVATE(dev.data.net)->slirp =3D g_steal_point= er(&slirp); } VIR_FREE(nodes); =20 if (qemuDomainObjPrivateXMLParseAutomaticPlacement(ctxt, priv) < 0) - goto error; + return -1; =20 if ((tmp =3D virXPathString("string(./libDir/@path)", ctxt))) priv->libDir =3D tmp; @@ -3082,28 +3082,28 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctx= t, =20 if (virCPUDefParseXML(ctxt, "./cpu", VIR_CPU_TYPE_GUEST, &priv->origCP= U, false) < 0) - goto error; + return -1; =20 priv->chardevStdioLogd =3D virXPathBoolean("boolean(./chardevStdioLogd= )", ctxt) =3D=3D 1; =20 if (qemuDomainObjPrivateXMLParseAllowReboot(ctxt, &priv->allowReboot) = < 0) - goto error; + return -1; =20 qemuDomainObjPrivateXMLParsePR(ctxt, &priv->prDaemonRunning); =20 if (qemuDomainObjPrivateXMLParseBlockjobs(vm, priv, ctxt) < 0) - goto error; + return -1; =20 if (qemuDomainObjPrivateXMLParseBackups(priv, ctxt) < 0) - goto error; + return -1; =20 qemuDomainStorageIDReset(priv); if (virXPathULongLong("string(./nodename/@index)", ctxt, &priv->nodenameindex) =3D=3D -2) { virReportError(VIR_ERR_XML_ERROR, "%s", _("failed to parse node name index")); - goto error; + return -1; } =20 priv->memPrealloc =3D virXPathBoolean("boolean(./memPrealloc)", ctxt) = =3D=3D 1; @@ -3112,13 +3112,10 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctx= t, ctxt, &priv->originalMemlock) =3D=3D -2) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to parse agent timeout")); - goto error; + return -1; } =20 return 0; - - error: - return -1; } =20 =20 --=20 2.35.1