From nobody Sat Feb 7 15:12:22 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1571316824; cv=none; d=zoho.com; s=zohoarc; b=aBew7FMu8VH/hCbKQ3XvyqdGRVVGphd8eLUwiQOwGBUKN8062NPFxVRZ65KhzpOhrG4gqcB1u8cPHx1Xrs1BvNDaBz/t/QmML+vsNtP7YtT5Cj1XdAF/SiNvzwCuiScmTZwFgm6bUc+Z2fhiRwtojd20perHqzrMsEGSucY6KWg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571316824; 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=Im9JtDdFhhPO02yQBFnyj/8PY6/mj0RRp+QvrnYj+dU=; b=WXr+l1C5bTvnDaKxSyRBdEi0JUXmzV3cn5M9LQYGir5cLXMvbaR/owRSlddaeb8BVkVs29I7H1KOSk13/wpD9/cd0tbGyRcUgoG55wzcp6rx2iM3AV9ePPShuLXHYruDcvTTG4DhPuoKRD6N6WUDa5yk/Bb9GqVNx/scZiBnTsw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1571316824765899.8324564390065; Thu, 17 Oct 2019 05:53:44 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 1463A10F2E82; Thu, 17 Oct 2019 12:53:42 +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 D76F260C4E; Thu, 17 Oct 2019 12:53:41 +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 5E22C83542; Thu, 17 Oct 2019 12:53:41 +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 x9HCktZc029348 for ; Thu, 17 Oct 2019 08:46:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id B84EA64024; Thu, 17 Oct 2019 12:46:55 +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 B209460872 for ; Thu, 17 Oct 2019 12:46:54 +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 9B4C330832EA for ; Thu, 17 Oct 2019 12:46:53 +0000 (UTC) Received: by mail-qk1-f172.google.com with SMTP id f18so1103343qkm.1 for ; Thu, 17 Oct 2019 05:46:53 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c7:d25e:a983:2b3:2523:a41]) by smtp.gmail.com with ESMTPSA id l48sm1335454qtb.50.2019.10.17.05.46.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 05:46:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=A1Au2NTrQ6mFMwU2qudnlpf75g93Ik8v5ODy3VvFiXg=; b=FLlGKWFDlo0WUsSWjdVfcUlx2unNym4Hd7hsGJ/vWJb02YjlbTkRUrDq/713Hno8zh FxNSWgB+UsgnnXPjlLKdsd03kNqWZFx9y5Q22GuJkW4PNNv5iErTMAmjekrWI+MrqXs8 nqvj3ZIZDS85ApPtA3rwVuyw9cfqR7PApm6jq2QdB53slwxa+HlOZkYvRlYMLwxvknWN HXrv7XvWKVxXhcSvvwag++nrgd7oeWodwyDn+XkikdrhF/Se35p/24ctCzDmFOxKMTVa 9aBdkFul/C0rPKPMiwzLC4UXJNJo+HmlDhCy2uNas+2aSXnCCOr5QwKo+3KuIYU6Yyew p2Lg== 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=A1Au2NTrQ6mFMwU2qudnlpf75g93Ik8v5ODy3VvFiXg=; b=PSHT4k04azu7v85VaK6TWa0ue+u7oBW46m+i+eFQowSpzv3QBE1prWZ1rY6HSDa2tS Z1XDYC6nQzSu1RQDfqSKAP2085tDmWQDLKGzi1kiv0y3G1757dUQY5IgfYJfX9HCepng GfppMkRQA8nxNEEerpO7bYt5VE0WI5zgaw08TZC1qs0LBr7JBNX3gops2OA52gt1vl7b EEFByc8qV0KmQxBw3pCnWxhX+Z10f1e2cYf0A7nhHSgA+DR3r34tUlH/hMngEL6OzziI 46djnFVPMyux0Gt/p3Ihl7nDC/iijmeBKuO0z/ekiskE2J6EGnRsAmO4ExAO4MLbp10O aE2A== X-Gm-Message-State: APjAAAXcsri1MCOJ5Lszev68LoGZrRt5luPSv6WpopqTrTmBqPfaHbY/ Lbtv4eqR3KSfZUjgun4PEdVXJwA7 X-Google-Smtp-Source: APXvYqzMZIu70w8dhv/yOr2/Hir2vjXiX8nTOmX7mfS+T7jmgR6N/jfiF1PWr4hZwjdgiWssaRA93A== X-Received: by 2002:a37:67d4:: with SMTP id b203mr3123085qkc.435.1571316412210; Thu, 17 Oct 2019 05:46:52 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Thu, 17 Oct 2019 09:46:39 -0300 Message-Id: <20191017124640.4311-4-danielhb413@gmail.com> In-Reply-To: <20191017124640.4311-1-danielhb413@gmail.com> References: <20191017124640.4311-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]); Thu, 17 Oct 2019 12:46:53 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Thu, 17 Oct 2019 12:46:53 +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.84 on 10.5.110.44 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v3 3/4] qemu_process.c: remove cleanup labels after g_auto*() changes 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.66]); Thu, 17 Oct 2019 12:53:43 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The g_auto*() changes made by the previous patches made a lot of 'cleanup' labels obsolete. Let's remove them. Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_process.c | 199 ++++++++++++++++------------------------ 1 file changed, 77 insertions(+), 122 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 6ed69bef27..8843ed20da 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -109,10 +109,9 @@ qemuProcessRemoveDomainStatus(virQEMUDriverPtr driver, g_autofree char *file =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); - int ret =3D -1; =20 if (virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name) < 0) - goto cleanup; + return -1; =20 if (unlink(file) < 0 && errno !=3D ENOENT && errno !=3D ENOTDIR) VIR_WARN("Failed to remove domain XML for %s: %s", @@ -124,9 +123,7 @@ qemuProcessRemoveDomainStatus(virQEMUDriverPtr driver, VIR_WARN("Failed to remove PID file for %s: %s", vm->def->name, virStrerror(errno, ebuf, sizeof(ebuf))); =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -2085,7 +2082,6 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices, { g_autofree char *id =3D NULL; size_t i; - int ret =3D -1; =20 for (i =3D 0; i < count; i++) { virDomainChrDefPtr chr =3D devices[i]; @@ -2104,7 +2100,7 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices, */ virReportError(VIR_ERR_INTERNAL_ERROR, _("no assigned pty for device %s"), id); - goto cleanup; + return -1; } else { /* 'info chardev' had no pty path for this chardev, * but the log output had, so we're fine @@ -2115,13 +2111,11 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices, =20 VIR_FREE(chr->source->data.file.path); if (VIR_STRDUP(chr->source->data.file.path, entry->ptyPath) < = 0) - goto cleanup; + return -1; } } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 static int @@ -2174,7 +2168,6 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr= driver, qemuMonitorChardevInfoPtr entry; virObjectEventPtr event =3D NULL; g_autofree char *id =3D NULL; - int ret =3D -1; =20 if (booted) agentReason =3D VIR_CONNECT_DOMAIN_EVENT_AGENT_LIFECYCLE_REASON_DO= MAIN_STARTED; @@ -2185,7 +2178,7 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr= driver, =20 VIR_FREE(id); if (virAsprintf(&id, "char%s", chr->info.alias) < 0) - goto cleanup; + return -1; =20 /* port state not reported */ if (!(entry =3D virHashLookup(info, id)) || @@ -2202,9 +2195,7 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr= driver, } } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -2726,7 +2717,6 @@ static int qemuProcessResctrlCreate(virQEMUDriverPtr driver, virDomainObjPtr vm) { - int ret =3D -1; size_t i =3D 0; g_autoptr(virCaps) caps =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; @@ -2745,7 +2735,7 @@ qemuProcessResctrlCreate(virQEMUDriverPtr driver, if (virResctrlAllocCreate(caps->host.resctrl, vm->def->resctrls[i]->alloc, priv->machineName) < 0) - goto cleanup; + return -1; =20 for (j =3D 0; j < vm->def->resctrls[i]->nmonitors; j++) { virDomainResctrlMonDefPtr mon =3D NULL; @@ -2753,13 +2743,11 @@ qemuProcessResctrlCreate(virQEMUDriverPtr driver, mon =3D vm->def->resctrls[i]->monitors[j]; if (virResctrlMonitorCreate(mon->instance, priv->machineName) < 0) - goto cleanup; + return -1; } } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -2974,10 +2962,9 @@ qemuProcessInitPasswords(virQEMUDriverPtr driver, } =20 if (ret < 0) - goto cleanup; + return ret; } =20 - cleanup: return ret; } =20 @@ -3207,7 +3194,7 @@ qemuProcessStartCPUs(virQEMUDriverPtr driver, virDoma= inObjPtr vm, =20 /* Bring up netdevs before starting CPUs */ if (qemuInterfaceStartDevices(vm->def) < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("Using lock state '%s'", NULLSTR(priv->lockState)); if (virDomainLockProcessResume(driver->lockManager, cfg->uri, @@ -3216,7 +3203,7 @@ qemuProcessStartCPUs(virQEMUDriverPtr driver, virDoma= inObjPtr vm, * to make sure we have state still present if the user * tries to resume again */ - goto cleanup; + return -1; } VIR_FREE(priv->lockState); =20 @@ -3237,7 +3224,6 @@ qemuProcessStartCPUs(virQEMUDriverPtr driver, virDoma= inObjPtr vm, * lifecycle event. */ =20 - cleanup: return ret; =20 release: @@ -3245,7 +3231,7 @@ qemuProcessStartCPUs(virQEMUDriverPtr driver, virDoma= inObjPtr vm, if (virDomainLockProcessPause(driver->lockManager, vm, &priv->lockStat= e) < 0) VIR_WARN("Unable to release lease on %s", vm->def->name); VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); - goto cleanup; + return ret; } =20 =20 @@ -3846,7 +3832,6 @@ qemuProcessBuildDestroyMemoryPaths(virQEMUDriverPtr d= river, size_t i; bool shouldBuildHP =3D false; bool shouldBuildMB =3D false; - int ret =3D -1; =20 if (build) { shouldBuildHP =3D qemuProcessNeedHugepagesPath(vm->def, mem); @@ -3858,11 +3843,11 @@ qemuProcessBuildDestroyMemoryPaths(virQEMUDriverPtr= driver, path =3D qemuGetDomainHugepagePath(vm->def, &cfg->hugetlbfs[i]= ); =20 if (!path) - goto cleanup; + return -1; =20 if (qemuProcessBuildDestroyMemoryPathsImpl(driver, vm, path, build) < 0) - goto cleanup; + return -1; =20 VIR_FREE(path); } @@ -3870,16 +3855,14 @@ qemuProcessBuildDestroyMemoryPaths(virQEMUDriverPtr= driver, =20 if (!build || shouldBuildMB) { if (qemuGetMemoryBackingDomainPath(vm->def, cfg, &path) < 0) - goto cleanup; + return -1; =20 if (qemuProcessBuildDestroyMemoryPathsImpl(driver, vm, path, build) < 0) - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -3890,20 +3873,17 @@ qemuProcessDestroyMemoryBackingPath(virQEMUDriverPt= r driver, { g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); g_autofree char *path =3D NULL; - int ret =3D -1; =20 if (qemuGetMemoryBackingPath(vm->def, cfg, mem->info.alias, &path) < 0) - goto cleanup; + return -1; =20 if (unlink(path) < 0 && errno !=3D ENOENT) { virReportSystemError(errno, _("Unable to remove %s"), path); - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -3947,7 +3927,6 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driver, unsigned short tlsPort; size_t i; int defaultMode =3D graphics->data.spice.defaultMode; - int ret =3D -1; =20 bool needTLSPort =3D false; bool needPort =3D false; @@ -3993,13 +3972,12 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driv= er, if (needTLSPort || graphics->data.spice.tlsPort =3D=3D -1) graphics->data.spice.tlsPort =3D 5902; =20 - ret =3D 0; - goto cleanup; + return 0; } =20 if (needPort || graphics->data.spice.port =3D=3D -1) { if (virPortAllocatorAcquire(driver->remotePorts, &port) < 0) - goto cleanup; + return -1; =20 graphics->data.spice.port =3D port; =20 @@ -4012,11 +3990,11 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driv= er, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Auto allocation of spice TLS port requested " "but spice TLS is disabled in qemu.conf")); - goto cleanup; + return -1; } =20 if (virPortAllocatorAcquire(driver->remotePorts, &tlsPort) < 0) - goto cleanup; + return -1; =20 graphics->data.spice.tlsPort =3D tlsPort; =20 @@ -4024,10 +4002,7 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr drive= r, graphics->data.spice.tlsPortReserved =3D true; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -4844,7 +4819,6 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr drive= r, char *listenAddr =3D NULL; bool useSocket =3D false; size_t i; - int ret =3D -1; =20 switch (graphics->type) { case VIR_DOMAIN_GRAPHICS_TYPE_VNC: @@ -4878,12 +4852,12 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr dri= ver, memset(glisten, 0, sizeof(virDomainGraphicsListenDef)); if (virAsprintf(&glisten->socket, "%s/%s.sock", priv->libDir, type) < 0) - goto cleanup; + return -1; glisten->fromConfig =3D true; glisten->type =3D VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCK= ET; } else if (listenAddr) { if (VIR_STRDUP(glisten->address, listenAddr) < 0) - goto cleanup; + return -1; glisten->fromConfig =3D true; } } @@ -4895,14 +4869,14 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr dri= ver, =20 if (qemuProcessGraphicsSetupNetworkAddress(glisten, listenAddr) < 0) - goto cleanup; + return -1; break; =20 case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: if (!glisten->socket) { if (virAsprintf(&glisten->socket, "%s/%s.sock", priv->libDir, type) < 0) - goto cleanup; + return -1; glisten->autoGenerated =3D true; } break; @@ -4913,10 +4887,7 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr driv= er, } } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -5655,7 +5626,6 @@ qemuProcessNetworkPrepareDevices(virQEMUDriverPtr dri= ver, { virDomainDefPtr def =3D vm->def; qemuDomainObjPrivatePtr priv =3D vm->privateData; - int ret =3D -1; size_t i; g_autoptr(virConnect) conn =3D NULL; =20 @@ -5669,9 +5639,9 @@ qemuProcessNetworkPrepareDevices(virQEMUDriverPtr dri= ver, */ if (net->type =3D=3D VIR_DOMAIN_NET_TYPE_NETWORK) { if (!conn && !(conn =3D virGetConnectNetwork())) - goto cleanup; + return -1; if (virDomainNetAllocateActualDevice(conn, def, net) < 0) - goto cleanup; + return -1; } =20 actualType =3D virDomainNetGetActualType(net); @@ -5695,10 +5665,10 @@ qemuProcessNetworkPrepareDevices(virQEMUDriverPtr d= river, pcisrc->addr.domain, pcisrc->addr.bus, pcisrc->addr.slot, pcisrc->addr.function, net->data.network.name, def->name); - goto cleanup; + return -1; } if (virDomainHostdevInsert(def, hostdev) < 0) - goto cleanup; + return -1; } else if (actualType =3D=3D VIR_DOMAIN_NET_TYPE_USER && !priv->disableSlirp && virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DBUS_VMSTATE))= { @@ -5708,9 +5678,7 @@ qemuProcessNetworkPrepareDevices(virQEMUDriverPtr dri= ver, } =20 } - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -6214,18 +6182,17 @@ qemuProcessPrepareDomain(virQEMUDriverPtr driver, virDomainObjPtr vm, unsigned int flags) { - int ret =3D -1; size_t i; qemuDomainObjPrivatePtr priv =3D vm->privateData; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); g_autoptr(virCaps) caps =3D NULL; =20 if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) - goto cleanup; + return -1; =20 priv->machineName =3D qemuDomainGetMachineName(vm); if (!priv->machineName) - goto cleanup; + return -1; =20 if (!(flags & VIR_QEMU_PROCESS_START_PRETEND)) { /* If you are using a SecurityDriver with dynamic labelling, @@ -6233,12 +6200,12 @@ qemuProcessPrepareDomain(virQEMUDriverPtr driver, VIR_DEBUG("Generating domain security label (if required)"); if (qemuSecurityGenLabel(driver->securityManager, vm->def) < 0) { virDomainAuditSecurityLabel(vm, false); - goto cleanup; + return -1; } virDomainAuditSecurityLabel(vm, true); =20 if (qemuProcessPrepareDomainNUMAPlacement(vm, caps) < 0) - goto cleanup; + return -1; } =20 /* Whether we should use virtlogd as stdio handler for character @@ -6272,51 +6239,51 @@ qemuProcessPrepareDomain(virQEMUDriverPtr driver, VIR_DEBUG("Assigning domain PCI addresses"); if ((qemuDomainAssignAddresses(vm->def, priv->qemuCaps, driver, vm, !!(flags & VIR_QEMU_PROCESS_START_NEW))= ) < 0) { - goto cleanup; + return -1; } =20 if (qemuAssignDeviceAliases(vm->def, priv->qemuCaps) < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("Setting graphics devices"); if (qemuProcessSetupGraphics(driver, vm, priv->qemuCaps, flags) < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("Create domain masterKey"); if (qemuDomainMasterKeyCreate(vm) < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("Setting up storage"); if (qemuProcessPrepareDomainStorage(driver, vm, priv, cfg, flags) < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("Prepare chardev source backends for TLS"); qemuDomainPrepareChardevSource(vm->def, cfg); =20 VIR_DEBUG("Prepare device secrets"); if (qemuDomainSecretPrepare(driver, vm) < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("Prepare bios/uefi paths"); if (qemuFirmwareFillDomain(driver, vm, flags) < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("Preparing external devices"); if (qemuExtDevicesPrepareDomain(driver, vm) < 0) - goto cleanup; + return -1; =20 for (i =3D 0; i < vm->def->nchannels; i++) { if (qemuDomainPrepareChannel(vm->def->channels[i], priv->channelTargetDir) < 0) - goto cleanup; + return -1; } =20 if (!(priv->monConfig =3D virDomainChrSourceDefNew(driver->xmlopt))) - goto cleanup; + return -1; =20 VIR_DEBUG("Preparing monitor state"); if (qemuProcessPrepareMonitorChr(priv->monConfig, priv->libDir) < 0) - goto cleanup; + return -1; =20 priv->monError =3D false; priv->monStart =3D 0; @@ -6325,16 +6292,14 @@ qemuProcessPrepareDomain(virQEMUDriverPtr driver, =20 VIR_DEBUG("Updating guest CPU definition"); if (qemuProcessUpdateGuestCPU(vm->def, priv->qemuCaps, caps, flags) < = 0) - goto cleanup; + return -1; =20 for (i =3D 0; i < vm->def->nshmems; i++) { if (qemuDomainPrepareShmemChardev(vm->def->shmems[i]) < 0) - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -6346,7 +6311,6 @@ qemuProcessSEVCreateFile(virDomainObjPtr vm, qemuDomainObjPrivatePtr priv =3D vm->privateData; virQEMUDriverPtr driver =3D priv->driver; g_autofree char *configFile =3D NULL; - int ret =3D -1; =20 if (!(configFile =3D virFileBuildPath(priv->libDir, name, ".base64"))) return -1; @@ -6354,15 +6318,13 @@ qemuProcessSEVCreateFile(virDomainObjPtr vm, if (virFileRewriteStr(configFile, S_IRUSR | S_IWUSR, data) < 0) { virReportSystemError(errno, _("failed to write data to config '%s'= "), configFile); - goto cleanup; + return -1; } =20 if (qemuSecurityDomainSetPathLabel(driver, vm, configFile, true) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -6489,17 +6451,16 @@ qemuProcessPrepareHost(virQEMUDriverPtr driver, virDomainObjPtr vm, unsigned int flags) { - int ret =3D -1; unsigned int hostdev_flags =3D 0; qemuDomainObjPrivatePtr priv =3D vm->privateData; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 if (qemuPrepareNVRAM(cfg, vm) < 0) - goto cleanup; + return -1; =20 if (vm->def->vsock) { if (qemuProcessOpenVhostVsock(vm->def->vsock) < 0) - goto cleanup; + return -1; } /* network devices must be "prepared" before hostdevs, because * setting up a network device might create a new hostdev that @@ -6507,7 +6468,7 @@ qemuProcessPrepareHost(virQEMUDriverPtr driver, */ VIR_DEBUG("Preparing network devices"); if (qemuProcessNetworkPrepareDevices(driver, vm) < 0) - goto cleanup; + return -1; =20 /* Must be run before security labelling */ VIR_DEBUG("Preparing host devices"); @@ -6517,17 +6478,17 @@ qemuProcessPrepareHost(virQEMUDriverPtr driver, hostdev_flags |=3D VIR_HOSTDEV_COLD_BOOT; if (qemuHostdevPrepareDomainDevices(driver, vm->def, priv->qemuCaps, hostdev_flags) < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("Preparing chr devices"); if (virDomainChrDefForeach(vm->def, true, qemuProcessPrepareChardevDevice, NULL) < 0) - goto cleanup; + return -1; =20 if (qemuProcessBuildDestroyMemoryPaths(driver, vm, NULL, true) < 0) - goto cleanup; + return -1; =20 /* Ensure no historical cgroup for this VM is lying around bogus * settings */ @@ -6538,14 +6499,14 @@ qemuProcessPrepareHost(virQEMUDriverPtr driver, virReportSystemError(errno, _("cannot create log directory %s"), cfg->logDir); - goto cleanup; + return -1; } =20 VIR_FREE(priv->pidfile); if (!(priv->pidfile =3D virPidFileBuildPath(cfg->stateDir, vm->def->na= me))) { virReportSystemError(errno, "%s", _("Failed to build pidfile path.")); - goto cleanup; + return -1; } =20 if (unlink(priv->pidfile) < 0 && @@ -6553,7 +6514,7 @@ qemuProcessPrepareHost(virQEMUDriverPtr driver, virReportSystemError(errno, _("Cannot remove stale PID file %s"), priv->pidfile); - goto cleanup; + return -1; } =20 /* @@ -6562,26 +6523,24 @@ qemuProcessPrepareHost(virQEMUDriverPtr driver, */ if (qemuProcessMakeDir(driver, vm, priv->libDir) < 0 || qemuProcessMakeDir(driver, vm, priv->channelTargetDir) < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("Write domain masterKey"); if (qemuDomainWriteMasterKeyFile(driver, vm) < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("Preparing disks (host)"); if (qemuProcessPrepareHostStorage(driver, vm, flags) < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("Preparing external devices"); if (qemuExtDevicesPrepareHost(driver, vm) < 0) - goto cleanup; + return -1; =20 if (qemuProcessPrepareSEVGuestInput(vm) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -7068,7 +7027,6 @@ qemuProcessFinishStartup(virQEMUDriverPtr driver, bool startCPUs, virDomainPausedReason pausedReason) { - int ret =3D -1; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 if (startCPUs) { @@ -7079,7 +7037,7 @@ qemuProcessFinishStartup(virQEMUDriverPtr driver, if (virGetLastErrorCode() =3D=3D VIR_ERR_OK) virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("resume operation failed")); - goto cleanup; + return -1; } } else { virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, pausedReason); @@ -7087,17 +7045,14 @@ qemuProcessFinishStartup(virQEMUDriverPtr driver, =20 VIR_DEBUG("Writing domain status to disk"); if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->cap= s) < 0) - goto cleanup; + return -1; =20 if (qemuProcessStartHook(driver, vm, VIR_HOOK_QEMU_OP_STARTED, VIR_HOOK_SUBOP_BEGIN) < 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