From nobody Sun Feb 8 05:27:13 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=1571179875; cv=none; d=zoho.com; s=zohoarc; b=hGBTccMNtPcXMHDL7pbWa/bmc/U8uhEJCO06mGZ9RWSQotjYEUc/L7Kip7r1aFnx66CA+NUQQSCqAxlwVEy6y74A6vucAaoPPcWxVih+wrO6fEeXb1WzNoD2COqRwKa3//BBODeG7okbCC3zaWnUM/hhcBR+Tyt9aymBDrhVU/A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571179875; 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=rpHr9aR2MeShKr5wlaK+hpMcdJ/lxU8a6gM35yk6rok=; b=m7EFIUNKSI9oYV6Xz7ZEA9Ay2bEQ5ZPJp4BmR6inPtjvXKKCT4jRcDEHAmQyRuII2nmrHHYRnGaOtYvshqmHMDW3251yUm0uGLq3br5ydOaLAV8KXs3x8HW2j0fzlfGaIx1ZHIG+iyIg4Y8pIuZQNHT2MXpQPSwjl/cI7rwTj1o= 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 1571179875900673.6558779864424; Tue, 15 Oct 2019 15:51:15 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 07D288E582; Tue, 15 Oct 2019 22:51: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 D7D9060127; Tue, 15 Oct 2019 22:51:13 +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 97CEA180B536; Tue, 15 Oct 2019 22:51:13 +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 x9FMmJSD016853 for ; Tue, 15 Oct 2019 18:48:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id 53C3E19C68; Tue, 15 Oct 2019 22:48:19 +0000 (UTC) Received: from mx1.redhat.com (ext-mx27.extmail.prod.ext.phx2.redhat.com [10.5.110.68]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4E1AA19C58 for ; Tue, 15 Oct 2019 22:48:15 +0000 (UTC) Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) (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 18BF6A3CD61 for ; Tue, 15 Oct 2019 22:48:14 +0000 (UTC) Received: by mail-qk1-f178.google.com with SMTP id y144so20864789qkb.7 for ; Tue, 15 Oct 2019 15:48:14 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c7:d25e:a983:2b3:2523:a41]) by smtp.gmail.com with ESMTPSA id 54sm14201363qts.75.2019.10.15.15.48.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2019 15:48:12 -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=/FSU9igqaOVQ33aXhcP0YceGBx2uLdy4s8LJsAf8dEY=; b=KwCC48rYZR72jqRaxOt+R4osbPq30KpBixsgmzwR4n7WbJWoFHkEoGEM6bblLtq8Mu IlzJ0Dh/PHRgbCD35o3gzh8qiV+MwoP8s/9zXtxi93PQyn7/le0FV3t3jUvW1dg02CqM Ufo6+OblI8nbj0nNmjfB5RHtKTUXhyvUwsLG6Q5i8Tks6RRmBCIYK6H44BDGmx7QeSYG F3xsF1Mit+x9z7EXcTz3b4JYyBkyrLPNVZFJ4CWsXK35TzsuEVBT0yxd7Fnr+B+smED5 7UO0HLE2T0RcyeOUxFGyEGG0/l/B+jtXE7J4Xj9CbC6BSIH5XCCe4oh84sol8SL/a9xj 3Uvg== 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=/FSU9igqaOVQ33aXhcP0YceGBx2uLdy4s8LJsAf8dEY=; b=iraE96EPIcKceKu1jeBOotoLfEn+l7mzBw35/9WtHK/3ZyW+4YV6sRckveYw3PMmy3 tAs1e2FxRg1k4qSzUHOj3Q49QPElOZ2tvCoXu/RzBR4FIxeI/3928nAzE5KxQhkui5G9 keVXvuDoXkzZaAkqOIovxsXaMesXjM9BP1D4BoIqdlB8WELRwBY+PcL4iW8LbMb8fyPT L4yOI59ed1/uZHedMX0AlzrXdws+GCH14QQk9OcLmqqoHet0SJtppgSqKtyUMymSHaYa B2bSL8bI4JbwtGDKN2YhYC5mA4/4tbVXxStdrN+vd4F4ieVRKdcO05Krfk45Mvgan1bS xpHg== X-Gm-Message-State: APjAAAV4YwtjHIMZU+xNmEoR/tHPnIEVKVrRkNMUEZDi/KIIF0aXIoWV qxZMT9A3f2BgA+tgwlNn5qhGEXA0 X-Google-Smtp-Source: APXvYqyWiQj7NS4IKXLyPuwj/bgdhC8q6PWnYdlY2EtNWEjHIPfnrXD9vuUfCluWi+/WQWm7avFICg== X-Received: by 2002:a05:620a:34b:: with SMTP id t11mr35375805qkm.213.1571179692905; Tue, 15 Oct 2019 15:48:12 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Tue, 15 Oct 2019 19:47:58 -0300 Message-Id: <20191015224800.28545-2-danielhb413@gmail.com> In-Reply-To: <20191015224800.28545-1-danielhb413@gmail.com> References: <20191015224800.28545-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.68]); Tue, 15 Oct 2019 22:48:14 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.68]); Tue, 15 Oct 2019 22:48:14 +0000 (UTC) for IP:'209.85.222.178' DOMAIN:'mail-qk1-f178.google.com' HELO:'mail-qk1-f178.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.178 mail-qk1-f178.google.com 209.85.222.178 mail-qk1-f178.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.68 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v2 1/3] qemu_process: use VIR_AUTOFREE() 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 15 Oct 2019 22:51:14 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Change all strings and scalar pointers to use VIR_AUTOFREE(), clearing up the 'cleanup' labels when possible. Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_process.c | 118 ++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 78 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 9c50c4a1d8..f4b3144154 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -106,7 +106,7 @@ qemuProcessRemoveDomainStatus(virQEMUDriverPtr driver, virDomainObjPtr vm) { char ebuf[1024]; - char *file =3D NULL; + VIR_AUTOFREE(char *) file =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); int ret =3D -1; @@ -117,7 +117,6 @@ qemuProcessRemoveDomainStatus(virQEMUDriverPtr driver, if (unlink(file) < 0 && errno !=3D ENOENT && errno !=3D ENOTDIR) VIR_WARN("Failed to remove domain XML for %s: %s", vm->def->name, virStrerror(errno, ebuf, sizeof(ebuf))); - VIR_FREE(file); =20 if (priv->pidfile && unlink(priv->pidfile) < 0 && @@ -1513,7 +1512,7 @@ qemuProcessHandleBlockThreshold(qemuMonitorPtr mon G_= GNUC_UNUSED, virDomainDiskDefPtr disk; virStorageSourcePtr src; unsigned int idx; - char *dev =3D NULL; + VIR_AUTOFREE(char *) dev =3D NULL; const char *path =3D NULL; =20 virObjectLock(vm); @@ -1526,11 +1525,9 @@ qemuProcessHandleBlockThreshold(qemuMonitorPtr mon G= _GNUC_UNUSED, if (virStorageSourceIsLocalStorage(src)) path =3D src->path; =20 - if ((dev =3D qemuDomainDiskBackingStoreGetName(disk, src, idx))) { + if ((dev =3D qemuDomainDiskBackingStoreGetName(disk, src, idx))) event =3D virDomainEventBlockThresholdNewFromObj(vm, dev, path, threshold, exce= ss); - VIR_FREE(dev); - } } =20 virObjectUnlock(vm); @@ -2065,7 +2062,7 @@ static int qemuProcessReportLogError(qemuDomainLogContextPtr logCtxt, const char *msgprefix) { - char *logmsg =3D NULL; + VIR_AUTOFREE(char *) logmsg =3D NULL; size_t max; =20 max =3D VIR_ERROR_MAX_LENGTH - 1; @@ -2082,7 +2079,6 @@ qemuProcessReportLogError(qemuDomainLogContextPtr log= Ctxt, else virReportError(VIR_ERR_INTERNAL_ERROR, _("%s: %s"), msgprefix, log= msg); =20 - VIR_FREE(logmsg); return 0; } =20 @@ -2102,9 +2098,8 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices, int count, virHashTablePtr info) { - char *id =3D NULL; + VIR_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]; @@ -2123,7 +2118,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 @@ -2134,14 +2129,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: - VIR_FREE(id); - return ret; + return 0; } =20 static int @@ -2193,8 +2185,7 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr= driver, int agentReason =3D VIR_CONNECT_DOMAIN_EVENT_AGENT_LIFECYCLE_REASON_CH= ANNEL; qemuMonitorChardevInfoPtr entry; virObjectEventPtr event =3D NULL; - char *id =3D NULL; - int ret =3D -1; + VIR_AUTOFREE(char *) id =3D NULL; =20 if (booted) agentReason =3D VIR_CONNECT_DOMAIN_EVENT_AGENT_LIFECYCLE_REASON_DO= MAIN_STARTED; @@ -2205,7 +2196,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)) || @@ -2222,10 +2213,7 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPt= r driver, } } =20 - ret =3D 0; - cleanup: - VIR_FREE(id); - return ret; + return 0; } =20 =20 @@ -2645,7 +2633,7 @@ qemuProcessSetupPid(virDomainObjPtr vm, virCgroupPtr cgroup =3D NULL; virBitmapPtr use_cpumask =3D NULL; VIR_AUTOPTR(virBitmap) hostcpumap =3D NULL; - char *mem_mask =3D NULL; + VIR_AUTOFREE(char *) mem_mask =3D NULL; int ret =3D -1; =20 if ((period || quota) && @@ -2722,7 +2710,6 @@ qemuProcessSetupPid(virDomainObjPtr vm, =20 ret =3D 0; cleanup: - VIR_FREE(mem_mask); if (cgroup) { if (ret < 0) virCgroupRemove(cgroup); @@ -2801,7 +2788,7 @@ qemuProcessKillManagedPRDaemon(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv =3D vm->privateData; virErrorPtr orig_err; - char *pidfile; + VIR_AUTOFREE(char *) pidfile =3D NULL; =20 if (!(pidfile =3D qemuProcessBuildPRHelperPidfilePath(vm))) { VIR_WARN("Unable to construct pr-helper pidfile path"); @@ -2822,8 +2809,6 @@ qemuProcessKillManagedPRDaemon(virDomainObjPtr vm) } } virErrorRestore(&orig_err); - - VIR_FREE(pidfile); } =20 =20 @@ -2832,7 +2817,7 @@ qemuProcessStartPRDaemonHook(void *opaque) { virDomainObjPtr vm =3D opaque; size_t i, nfds =3D 0; - int *fds =3D NULL; + VIR_AUTOFREE(int *) fds =3D NULL; int ret =3D -1; =20 if (qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) { @@ -2848,7 +2833,6 @@ qemuProcessStartPRDaemonHook(void *opaque) cleanup: for (i =3D 0; i < nfds; i++) VIR_FORCE_CLOSE(fds[i]); - VIR_FREE(fds); return ret; } =20 @@ -2860,9 +2844,9 @@ qemuProcessStartManagedPRDaemon(virDomainObjPtr vm) virQEMUDriverPtr driver =3D priv->driver; virQEMUDriverConfigPtr cfg; int errfd =3D -1; - char *pidfile =3D NULL; + VIR_AUTOFREE(char *) pidfile =3D NULL; int pidfd =3D -1; - char *socketPath =3D NULL; + VIR_AUTOFREE(char *) socketPath =3D NULL; pid_t cpid =3D -1; virCommandPtr cmd =3D NULL; virTimeBackOffVar timebackoff; @@ -2968,9 +2952,7 @@ qemuProcessStartManagedPRDaemon(virDomainObjPtr vm) unlink(pidfile); } virCommandFree(cmd); - VIR_FREE(socketPath); VIR_FORCE_CLOSE(pidfd); - VIR_FREE(pidfile); VIR_FORCE_CLOSE(errfd); virObjectUnref(cfg); return ret; @@ -3388,7 +3370,7 @@ qemuProcessUpdateState(virQEMUDriverPtr driver, virDo= mainObjPtr vm) int oldReason; int newReason; bool running; - char *msg =3D NULL; + VIR_AUTOFREE(char *) msg =3D NULL; int ret; =20 qemuDomainObjEnterMonitor(driver, vm); @@ -3436,7 +3418,6 @@ qemuProcessUpdateState(virQEMUDriverPtr driver, virDo= mainObjPtr vm) NULLSTR(msg), virDomainStateTypeToString(newState), virDomainStateReasonToString(newState, newReason)); - VIR_FREE(msg); virDomainObjSetState(vm, newState, newReason); } =20 @@ -3877,7 +3858,7 @@ qemuProcessBuildDestroyMemoryPaths(virQEMUDriverPtr d= river, bool build) { virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); - char *path =3D NULL; + VIR_AUTOFREE(char *) path =3D NULL; size_t i; bool shouldBuildHP =3D false; bool shouldBuildMB =3D false; @@ -3910,13 +3891,10 @@ qemuProcessBuildDestroyMemoryPaths(virQEMUDriverPtr= driver, if (qemuProcessBuildDestroyMemoryPathsImpl(driver, vm, path, build) < 0) goto cleanup; - - VIR_FREE(path); } =20 ret =3D 0; cleanup: - VIR_FREE(path); virObjectUnref(cfg); return ret; } @@ -3928,7 +3906,7 @@ qemuProcessDestroyMemoryBackingPath(virQEMUDriverPtr = driver, virDomainMemoryDefPtr mem) { virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); - char *path =3D NULL; + VIR_AUTOFREE(char *) path =3D NULL; int ret =3D -1; =20 if (qemuGetMemoryBackingPath(vm->def, cfg, mem->info.alias, &path) < 0) @@ -3942,7 +3920,6 @@ qemuProcessDestroyMemoryBackingPath(virQEMUDriverPtr = driver, =20 ret =3D 0; cleanup: - VIR_FREE(path); virObjectUnref(cfg); return ret; } @@ -4077,11 +4054,12 @@ static int qemuProcessVerifyHypervFeatures(virDomainDefPtr def, virCPUDataPtr cpu) { - char *cpuFeature; size_t i; int rc; =20 for (i =3D 0; i < VIR_DOMAIN_HYPERV_LAST; i++) { + VIR_AUTOFREE(char *) cpuFeature =3D NULL; + /* always supported string property */ if (i =3D=3D VIR_DOMAIN_HYPERV_VENDOR_ID || i =3D=3D VIR_DOMAIN_HYPERV_SPINLOCKS) @@ -4095,7 +4073,6 @@ qemuProcessVerifyHypervFeatures(virDomainDefPtr def, return -1; =20 rc =3D virCPUDataCheckFeature(cpu, cpuFeature); - VIR_FREE(cpuFeature); =20 if (rc < 0) { return -1; @@ -4515,17 +4492,17 @@ qemuLogOperation(virDomainObjPtr vm, virCommandPtr cmd, qemuDomainLogContextPtr logCtxt) { - char *timestamp; + VIR_AUTOFREE(char *) timestamp =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; int qemuVersion =3D virQEMUCapsGetVersion(priv->qemuCaps); const char *package =3D virQEMUCapsGetPackage(priv->qemuCaps); - char *hostname =3D virGetHostname(); + VIR_AUTOFREE(char *) hostname =3D virGetHostname(); struct utsname uts; =20 uname(&uts); =20 if ((timestamp =3D virTimeStringNow()) =3D=3D NULL) - goto cleanup; + return; =20 if (qemuDomainLogContextWrite(logCtxt, "%s: %s %s, qemu version: %d.%d.%d%s, ke= rnel: %s, hostname: %s\n", @@ -4536,17 +4513,12 @@ qemuLogOperation(virDomainObjPtr vm, NULLSTR_EMPTY(package), uts.release, NULLSTR_EMPTY(hostname)) < 0) - goto cleanup; + return; =20 if (cmd) { - char *args =3D virCommandToString(cmd, true); + VIR_AUTOFREE(char *) args =3D virCommandToString(cmd, true); qemuDomainLogContextWrite(logCtxt, "%s\n", args); - VIR_FREE(args); } - - cleanup: - VIR_FREE(hostname); - VIR_FREE(timestamp); } =20 =20 @@ -4646,7 +4618,7 @@ qemuProcessStartHook(virQEMUDriverPtr driver, virHookSubopType subop) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - char *xml; + VIR_AUTOFREE(char *) xml =3D NULL; int ret; =20 if (!virHookPresent(VIR_HOOK_DRIVER_QEMU)) @@ -4657,7 +4629,6 @@ qemuProcessStartHook(virQEMUDriverPtr driver, =20 ret =3D virHookCall(VIR_HOOK_DRIVER_QEMU, vm->def->name, op, subop, NULL, xml, NULL); - VIR_FREE(xml); =20 return ret; } @@ -4770,7 +4741,7 @@ qemuProcessGetNetworkAddress(const char *netname, virSocketAddr addr; virSocketAddrPtr addrptr =3D NULL; char *dev_name =3D NULL; - char *xml =3D NULL; + VIR_AUTOFREE(char *) xml =3D NULL; =20 *netaddr =3D NULL; =20 @@ -4852,7 +4823,6 @@ qemuProcessGetNetworkAddress(const char *netname, virNetworkDefFree(netdef); virObjectUnref(net); virObjectUnref(conn); - VIR_FREE(xml); return ret; } =20 @@ -6154,7 +6124,7 @@ qemuProcessPrepareDomainNUMAPlacement(virDomainObjPtr= vm, virCapsPtr caps) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - char *nodeset =3D NULL; + VIR_AUTOFREE(char *) nodeset =3D NULL; virBitmapPtr numadNodeset =3D NULL; virBitmapPtr hostMemoryNodeset =3D NULL; int ret =3D -1; @@ -6192,7 +6162,6 @@ qemuProcessPrepareDomainNUMAPlacement(virDomainObjPtr= vm, ret =3D 0; =20 cleanup: - VIR_FREE(nodeset); virBitmapFree(numadNodeset); virBitmapFree(hostMemoryNodeset); return ret; @@ -6402,8 +6371,7 @@ qemuProcessSEVCreateFile(virDomainObjPtr vm, { qemuDomainObjPrivatePtr priv =3D vm->privateData; virQEMUDriverPtr driver =3D priv->driver; - char *configFile; - int ret =3D -1; + VIR_AUTOFREE(char *) configFile =3D NULL; =20 if (!(configFile =3D virFileBuildPath(priv->libDir, name, ".base64"))) return -1; @@ -6411,16 +6379,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: - VIR_FREE(configFile); - return ret; + return 0; } =20 =20 @@ -6757,7 +6722,7 @@ qemuProcessLaunch(virConnectPtr conn, virQEMUDriverConfigPtr cfg; virCapsPtr caps =3D NULL; size_t nnicindexes =3D 0; - int *nicindexes =3D NULL; + VIR_AUTOFREE(int *) nicindexes =3D NULL; size_t i; =20 VIR_DEBUG("conn=3D%p driver=3D%p vm=3D%p name=3D%s if=3D%d asyncJob=3D= %d " @@ -7073,7 +7038,6 @@ qemuProcessLaunch(virConnectPtr conn, virObjectUnref(logCtxt); virObjectUnref(cfg); virObjectUnref(caps); - VIR_FREE(nicindexes); return ret; } =20 @@ -7398,7 +7362,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, virDomainDefPtr def; virNetDevVPortProfilePtr vport =3D NULL; size_t i; - char *timestamp; + VIR_AUTOFREE(char *) timestamp =3D NULL; virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); virConnectPtr conn =3D NULL; =20 @@ -7441,7 +7405,6 @@ void qemuProcessStop(virQEMUDriverPtr driver, qemuDomainLogAppendMessage(driver, vm, "%s: shutting down, reason= =3D%s\n", timestamp, virDomainShutoffReasonTypeToString(reas= on)); - VIR_FREE(timestamp); } =20 /* Clear network bandwidth */ @@ -7513,13 +7476,12 @@ void qemuProcessStop(virQEMUDriverPtr driver, =20 /* now that we know it's stopped call the hook if present */ if (virHookPresent(VIR_HOOK_DRIVER_QEMU)) { - char *xml =3D qemuDomainDefFormatXML(driver, NULL, vm->def, 0); + VIR_AUTOFREE(char *) xml =3D qemuDomainDefFormatXML(driver, NULL, = vm->def, 0); =20 /* we can't stop the operation even if the script raised an error = */ ignore_value(virHookCall(VIR_HOOK_DRIVER_QEMU, vm->def->name, VIR_HOOK_QEMU_OP_STOPPED, VIR_HOOK_SUBOP_= END, NULL, xml, NULL)); - VIR_FREE(xml); } =20 /* Reset Security Labels unless caller don't want us to */ @@ -7689,13 +7651,12 @@ void qemuProcessStop(virQEMUDriverPtr driver, =20 /* The "release" hook cleans up additional resources */ if (virHookPresent(VIR_HOOK_DRIVER_QEMU)) { - char *xml =3D qemuDomainDefFormatXML(driver, NULL, vm->def, 0); + VIR_AUTOFREE(char *) xml =3D qemuDomainDefFormatXML(driver, NULL, = vm->def, 0); =20 /* we can't stop the operation even if the script raised an error = */ virHookCall(VIR_HOOK_DRIVER_QEMU, vm->def->name, VIR_HOOK_QEMU_OP_RELEASE, VIR_HOOK_SUBOP_END, NULL, xml, NULL); - VIR_FREE(xml); } =20 virDomainObjRemoveTransientDef(vm); @@ -8251,13 +8212,14 @@ qemuProcessReconnect(void *opaque) =20 /* Run an hook to allow admins to do some magic */ if (virHookPresent(VIR_HOOK_DRIVER_QEMU)) { - char *xml =3D qemuDomainDefFormatXML(driver, priv->qemuCaps, obj->= def, 0); + VIR_AUTOFREE(char *) xml =3D qemuDomainDefFormatXML(driver, + priv->qemuCaps, + obj->def, 0); int hookret; =20 hookret =3D virHookCall(VIR_HOOK_DRIVER_QEMU, obj->def->name, VIR_HOOK_QEMU_OP_RECONNECT, VIR_HOOK_SUBOP_B= EGIN, NULL, xml, NULL); - VIR_FREE(xml); =20 /* * If the script raised an error abort the launch --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list