From nobody Sat Feb 7 15:15:34 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=1571317087; cv=none; d=zoho.com; s=zohoarc; b=EJOiQODtN7d4KP+A5fTcAE9EVM0QEI6K6GF/nHQR6kFDX52rWBG8Z1HBvUJMOGhp5zQaQolp9QStXAPd4V5ylETxPeu2OrOHPkb9tB5QHRw2xQ4lTIsSWrDrJ+MUSfbrPorQW7TDD9wJq98XkctEUiUtiRANqEgMtEjFiYyHwUY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571317087; 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=Gff5JVyB45eX1oU99QMnfhtkOdqGfB5d42Bsb1KNSxs=; b=iBVBe0M+d5HkC2QeZ996gyTNsj33OtKbii8UaVWwQ45hKfC5XmhNo3Nf856x9yAByvbLpijsbdQ6J+A1WIEgu6S+E+zMUAkzO3wbE44Iggjl4WEjB3rJbHF5bQz+vefi9POn84M4VfkoOUeiK279KL9l4WTQWFoRV3MJPP/1BX8= 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 1571317087784209.55300527433565; Thu, 17 Oct 2019 05:58:07 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id F2BE43073880; Thu, 17 Oct 2019 12:58:05 +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 C4C14643D7; Thu, 17 Oct 2019 12:58:05 +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 80A164E9F2; Thu, 17 Oct 2019 12:58:05 +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 x9HCksjs029342 for ; Thu, 17 Oct 2019 08:46:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 11C1319C77; Thu, 17 Oct 2019 12:46: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 0BD3819C70 for ; Thu, 17 Oct 2019 12:46: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 79A4C4E925 for ; Thu, 17 Oct 2019 12:46:50 +0000 (UTC) Received: by mail-qt1-f194.google.com with SMTP id m61so3327034qte.7 for ; Thu, 17 Oct 2019 05:46:50 -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.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 05:46:48 -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=trN1gqGANZ2qBKaOtumuxc0sdQfeao8izlA/pjy7Doo=; b=Mzrx1AfM/6Xb+enPDcrEEbmjs6XtcJ4tlNcpTup3VI89rzrDvN0JfDmQtG70edp873 QNweM9/tqcCvJzhEBRvI0D4veB33RNjaWlZj+Zb95tczTj1xtR7l1TkrEtdJmn2QN82r NbmkaMB88zkap0Qu3xkpMV8ZcqeqC0ZXaAtu7lKvBTqDkMH+xJHdUnI/9oakiI6eLEJc RorTZcQntLMcyyCJQEMJY1lRXkkeclUIUolNqhngPHL8Sxb3ucI9a5mMjbsmhaj51Lb7 F0vcFzOUwo4vbaRnYk8RrRfc1w3KQKADtGkr3975rmgyNYDMoc+lf0MVEjMHSiIQyuNp bKFQ== 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=trN1gqGANZ2qBKaOtumuxc0sdQfeao8izlA/pjy7Doo=; b=ONwi2DaCimDPxkpHLCLSAgkqDT3MNW+ejf7bjl/3Xu7ljx0kqB4NmkVzQDs7I4p7H6 +qVqgV8U+Zu7w/c+BxyWj6F0xzSfA1CLV5nrJFWsN4/5UpAEu9NFTbrUA61lHQbtmJH2 bMNjcKtqRGKxu1HOe+YJRTzGDV6ZHUs84xbylsR9ureemDLadkKLxPY4xbB3rt+YcLWc x+5ZC32TWTigON2ulzkiuSOwqaU9IPFyabNzs9QBnBYPkwlUrT6O+Y600NaLDJvrypNx kksytewbtEr5DX4jSpe7l4ezQv25RWD0UhBEpyniaW/a13TejGQkfgLGvOzfg0H1zh85 Uf7Q== X-Gm-Message-State: APjAAAXx0uIeklzFCQIWi9OlkLcKdaDjf5x/LGJ52qkO2wcUHtBxLl+O DUfq5UBrCYIEhsA4b9ME4EX5iwB4 X-Google-Smtp-Source: APXvYqwr0X5dh8o5PHzTiyJFMhJN9M2xv7q5WvSf9TzFzhS2ZQcFz+4/C2IO2y8vVd94Gcz2gu7WJg== X-Received: by 2002:ac8:4a99:: with SMTP id l25mr3529882qtq.77.1571316409359; Thu, 17 Oct 2019 05:46:49 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Thu, 17 Oct 2019 09:46:37 -0300 Message-Id: <20191017124640.4311-2-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.38]); Thu, 17 Oct 2019 12:46:50 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 17 Oct 2019 12:46: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.153 (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.78 on 10.5.110.38 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v3 1/4] qemu_process.c: use g_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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Thu, 17 Oct 2019 12:58:06 +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 g_autofree. Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_process.c | 93 ++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 61 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 9eaea4edfd..f747cdcc59 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; + g_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; + g_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; + g_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,7 +2098,7 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices, int count, virHashTablePtr info) { - char *id =3D NULL; + g_autofree char *id =3D NULL; size_t i; int ret =3D -1; =20 @@ -2140,7 +2136,6 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices, =20 ret =3D 0; cleanup: - VIR_FREE(id); return ret; } =20 @@ -2193,7 +2188,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; + g_autofree char *id =3D NULL; int ret =3D -1; =20 if (booted) @@ -2224,7 +2219,6 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr= driver, =20 ret =3D 0; cleanup: - VIR_FREE(id); return ret; } =20 @@ -2645,7 +2639,7 @@ qemuProcessSetupPid(virDomainObjPtr vm, virCgroupPtr cgroup =3D NULL; virBitmapPtr use_cpumask =3D NULL; g_autoptr(virBitmap) hostcpumap =3D NULL; - char *mem_mask =3D NULL; + g_autofree char *mem_mask =3D NULL; int ret =3D -1; =20 if ((period || quota) && @@ -2722,7 +2716,6 @@ qemuProcessSetupPid(virDomainObjPtr vm, =20 ret =3D 0; cleanup: - VIR_FREE(mem_mask); if (cgroup) { if (ret < 0) virCgroupRemove(cgroup); @@ -2801,7 +2794,7 @@ qemuProcessKillManagedPRDaemon(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv =3D vm->privateData; virErrorPtr orig_err; - char *pidfile; + g_autofree char *pidfile =3D NULL; =20 if (!(pidfile =3D qemuProcessBuildPRHelperPidfilePath(vm))) { VIR_WARN("Unable to construct pr-helper pidfile path"); @@ -2822,8 +2815,6 @@ qemuProcessKillManagedPRDaemon(virDomainObjPtr vm) } } virErrorRestore(&orig_err); - - VIR_FREE(pidfile); } =20 =20 @@ -2832,7 +2823,7 @@ qemuProcessStartPRDaemonHook(void *opaque) { virDomainObjPtr vm =3D opaque; size_t i, nfds =3D 0; - int *fds =3D NULL; + g_autofree int *fds =3D NULL; int ret =3D -1; =20 if (qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) { @@ -2848,7 +2839,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 +2850,9 @@ qemuProcessStartManagedPRDaemon(virDomainObjPtr vm) virQEMUDriverPtr driver =3D priv->driver; virQEMUDriverConfigPtr cfg; int errfd =3D -1; - char *pidfile =3D NULL; + g_autofree char *pidfile =3D NULL; int pidfd =3D -1; - char *socketPath =3D NULL; + g_autofree char *socketPath =3D NULL; pid_t cpid =3D -1; virCommandPtr cmd =3D NULL; virTimeBackOffVar timebackoff; @@ -2968,9 +2958,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 +3376,7 @@ qemuProcessUpdateState(virQEMUDriverPtr driver, virDo= mainObjPtr vm) int oldReason; int newReason; bool running; - char *msg =3D NULL; + g_autofree char *msg =3D NULL; int ret; =20 qemuDomainObjEnterMonitor(driver, vm); @@ -3436,7 +3424,6 @@ qemuProcessUpdateState(virQEMUDriverPtr driver, virDo= mainObjPtr vm) NULLSTR(msg), virDomainStateTypeToString(newState), virDomainStateReasonToString(newState, newReason)); - VIR_FREE(msg); virDomainObjSetState(vm, newState, newReason); } =20 @@ -3877,7 +3864,7 @@ qemuProcessBuildDestroyMemoryPaths(virQEMUDriverPtr d= river, bool build) { virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); - char *path =3D NULL; + g_autofree char *path =3D NULL; size_t i; bool shouldBuildHP =3D false; bool shouldBuildMB =3D false; @@ -3910,13 +3897,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 +3912,7 @@ qemuProcessDestroyMemoryBackingPath(virQEMUDriverPtr = driver, virDomainMemoryDefPtr mem) { virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); - char *path =3D NULL; + g_autofree char *path =3D NULL; int ret =3D -1; =20 if (qemuGetMemoryBackingPath(vm->def, cfg, mem->info.alias, &path) < 0) @@ -3942,7 +3926,6 @@ qemuProcessDestroyMemoryBackingPath(virQEMUDriverPtr = driver, =20 ret =3D 0; cleanup: - VIR_FREE(path); virObjectUnref(cfg); return ret; } @@ -4077,11 +4060,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++) { + g_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 +4079,6 @@ qemuProcessVerifyHypervFeatures(virDomainDefPtr def, return -1; =20 rc =3D virCPUDataCheckFeature(cpu, cpuFeature); - VIR_FREE(cpuFeature); =20 if (rc < 0) { return -1; @@ -4515,17 +4498,17 @@ qemuLogOperation(virDomainObjPtr vm, virCommandPtr cmd, qemuDomainLogContextPtr logCtxt) { - char *timestamp; + g_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(); + g_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 +4519,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); + g_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 +4624,7 @@ qemuProcessStartHook(virQEMUDriverPtr driver, virHookSubopType subop) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - char *xml; + g_autofree char *xml =3D NULL; int ret; =20 if (!virHookPresent(VIR_HOOK_DRIVER_QEMU)) @@ -4657,7 +4635,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 +4747,7 @@ qemuProcessGetNetworkAddress(const char *netname, virSocketAddr addr; virSocketAddrPtr addrptr =3D NULL; char *dev_name =3D NULL; - char *xml =3D NULL; + g_autofree char *xml =3D NULL; =20 *netaddr =3D NULL; =20 @@ -4852,7 +4829,6 @@ qemuProcessGetNetworkAddress(const char *netname, virNetworkDefFree(netdef); virObjectUnref(net); virObjectUnref(conn); - VIR_FREE(xml); return ret; } =20 @@ -6154,7 +6130,7 @@ qemuProcessPrepareDomainNUMAPlacement(virDomainObjPtr= vm, virCapsPtr caps) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - char *nodeset =3D NULL; + g_autofree char *nodeset =3D NULL; virBitmapPtr numadNodeset =3D NULL; virBitmapPtr hostMemoryNodeset =3D NULL; int ret =3D -1; @@ -6192,7 +6168,6 @@ qemuProcessPrepareDomainNUMAPlacement(virDomainObjPtr= vm, ret =3D 0; =20 cleanup: - VIR_FREE(nodeset); virBitmapFree(numadNodeset); virBitmapFree(hostMemoryNodeset); return ret; @@ -6402,7 +6377,7 @@ qemuProcessSEVCreateFile(virDomainObjPtr vm, { qemuDomainObjPrivatePtr priv =3D vm->privateData; virQEMUDriverPtr driver =3D priv->driver; - char *configFile; + g_autofree char *configFile =3D NULL; int ret =3D -1; =20 if (!(configFile =3D virFileBuildPath(priv->libDir, name, ".base64"))) @@ -6419,7 +6394,6 @@ qemuProcessSEVCreateFile(virDomainObjPtr vm, =20 ret =3D 0; cleanup: - VIR_FREE(configFile); return ret; } =20 @@ -6757,7 +6731,7 @@ qemuProcessLaunch(virConnectPtr conn, virQEMUDriverConfigPtr cfg; virCapsPtr caps =3D NULL; size_t nnicindexes =3D 0; - int *nicindexes =3D NULL; + g_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 +7047,6 @@ qemuProcessLaunch(virConnectPtr conn, virObjectUnref(logCtxt); virObjectUnref(cfg); virObjectUnref(caps); - VIR_FREE(nicindexes); return ret; } =20 @@ -7398,7 +7371,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, virDomainDefPtr def; virNetDevVPortProfilePtr vport =3D NULL; size_t i; - char *timestamp; + g_autofree char *timestamp =3D NULL; virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); virConnectPtr conn =3D NULL; =20 @@ -7441,7 +7414,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 +7485,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); + g_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 +7660,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); + g_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); @@ -8248,13 +8218,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); + g_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