From nobody Mon May 6 15:01:16 2024 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 From nobody Mon May 6 15:01:16 2024 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=1571179879; cv=none; d=zoho.com; s=zohoarc; b=OJoomsvl6h+pc3/ib+i6CQqW9jt/1ebHCxcke2UR0gmwxwNRPEB0JCF6bR8kS6Xo2xv/O3T4BQcj6Ezg8zjHkzDcoGk2gZH7EPRC7u7BiZndqtEa6NgWHwcrhtkjh0E0n7KfO6vz1EDqGW9wgPKwLGX0fUVXMJkOfxOLzgNPbRI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571179879; 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=0RzUVpvWFobX0hrt/ahyw7NVjcZ79ZC0f0Nh0XjeG6w=; b=JmhEim1pHC9kFV7S9QN6xbJg+wPeMX5forcPOuBxfONDDViL6071HflFqz65Rmq+GyPaehtY2s+CHNKS0OhXxof2hkjqdY1NVEDMikTDrcX5pegM26PsiXpHV8qNGcm4MtHrVBOLLNLZZsgbGbLXakogyJys2uQ3p5SXFJJBYKU= 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 1571179879956201.77839313245295; Tue, 15 Oct 2019 15:51:19 -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 C05B73086218; Tue, 15 Oct 2019 22:51:17 +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 973FB60127; Tue, 15 Oct 2019 22:51:17 +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 55DC14A486; Tue, 15 Oct 2019 22:51:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9FMmK5U016858 for ; Tue, 15 Oct 2019 18:48:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9A0F85D9E2; Tue, 15 Oct 2019 22:48:20 +0000 (UTC) Received: from mx1.redhat.com (ext-mx16.extmail.prod.ext.phx2.redhat.com [10.5.110.45]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 939745D9CD for ; Tue, 15 Oct 2019 22:48:18 +0000 (UTC) Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) (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 443E6300C727 for ; Tue, 15 Oct 2019 22:48:16 +0000 (UTC) Received: by mail-qt1-f196.google.com with SMTP id t20so27816555qtr.10 for ; Tue, 15 Oct 2019 15:48:16 -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.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2019 15:48:14 -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=SKodZTT62x3q5O/kUGD7Tkn07l8lVELZINbg59fKSJg=; b=G7nb7eRiSy2oOD0VMg5RNk2muGB2iRPiEQGUgNLYGx0kI7fqvEelHmIINPbyix+cLX 2lU7kfzolhmzsNaQaDxzwJW0Zzxvw4iBXX1Lkl8+43QZS7soM25BXmAShGofyUqnuGKA qfVrOOQDoXYSE0Vl4VEhjwkABgpsbFjr2BfsYt783VxWjoL6Fw4SX3MrTISLg+LPQXUO S5uATw7S+h4dmpAOF7nm6qQHZaMa0h8OMLiHfSrL/JdcUh58TTATWZvnWDUbLFIQRc1O SzimaqO1WcC6OnFEPOPvOMbs4ROYnIqBb2zXpNcAQ78njE3penj8aEicAXufUjJC+k1b xjug== 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=SKodZTT62x3q5O/kUGD7Tkn07l8lVELZINbg59fKSJg=; b=eQTuaZiEH+69X55AciI8pj8OYCpmxjEH4X1QiHzysMVXrW3tAYcMOaB2gADybmfuZo MpRyNYiIrF4XvrSTyj0ZdpYkgB31h8AC3r1xfU2pOcC9YqTW+LC2Kkt/2Lc2HulMEEfB bGjicx7Dw00asz26Z7UQiFAP5HX3I3lOUc0joy1yu39Wn0KqunR+TGe6FbZtsg/RQ+nB q5rkYFqGqcpYqhZp5ktSyOePrK9Q1eOH9E7avMkC5yel/qR49dVsqoFiGNadQ/lisyJm KV1sW4Y4Q8UDYVGvAlhRBE8HwEuqSdQZfsIQsv/C8uxDZHcLtxiiivBBSqK6km3ERh+U dy9w== X-Gm-Message-State: APjAAAXC9JAOz9UMcHx9K57D2FWtE2eYePkQST368wLrJFh3HRZVi1xt OGG2yjQAcyGBpmAYgezAa3gXea85 X-Google-Smtp-Source: APXvYqx+ycC41mZObLLNSTe/X0r4KaDg4WDHsaCHESgW+tplt+vfHIjcvo4+XE4Q53I5JhZYXqd3JA== X-Received: by 2002:ac8:701e:: with SMTP id x30mr4606571qtm.203.1571179694652; Tue, 15 Oct 2019 15:48:14 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Tue, 15 Oct 2019 19:47:59 -0300 Message-Id: <20191015224800.28545-3-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.5.16 (mx1.redhat.com [10.5.110.45]); Tue, 15 Oct 2019 22:48:16 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Tue, 15 Oct 2019 22:48:16 +0000 (UTC) for IP:'209.85.160.196' DOMAIN:'mail-qt1-f196.google.com' HELO:'mail-qt1-f196.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.196 mail-qt1-f196.google.com 209.85.160.196 mail-qt1-f196.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.45 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v2 2/3] qemu_process: use VIR_AUTOUNREF() 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.42]); Tue, 15 Oct 2019 22:51:18 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Change all feasible vir*Ptr pointers to be AUTOUNREF(), clearing up the 'cleanup' labels when possible. Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_process.c | 316 +++++++++++++++------------------------- 1 file changed, 116 insertions(+), 200 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f4b3144154..72919c370d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -108,11 +108,10 @@ qemuProcessRemoveDomainStatus(virQEMUDriverPtr driver, char ebuf[1024]; VIR_AUTOFREE(char *) file =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); - int ret =3D -1; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); =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,10 +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: - virObjectUnref(cfg); - return ret; + return 0; } =20 =20 @@ -407,7 +403,7 @@ qemuProcessHandleReset(qemuMonitorPtr mon G_GNUC_UNUSED, virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event; qemuDomainObjPrivatePtr priv; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); int ret =3D -1; =20 virObjectLock(vm); @@ -444,7 +440,6 @@ qemuProcessHandleReset(qemuMonitorPtr mon G_GNUC_UNUSED, cleanup: virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(cfg); return ret; } =20 @@ -463,7 +458,7 @@ qemuProcessFakeReboot(void *opaque) virDomainObjPtr vm =3D opaque; qemuDomainObjPrivatePtr priv =3D vm->privateData; virQEMUDriverPtr driver =3D priv->driver; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); virDomainRunningReason reason =3D VIR_DOMAIN_RUNNING_BOOTED; int ret =3D -1, rc; =20 @@ -513,7 +508,6 @@ qemuProcessFakeReboot(void *opaque) if (ret =3D=3D -1) ignore_value(qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_FORCE)); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); } =20 =20 @@ -576,7 +570,7 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon G_GNUC_UNU= SED, virQEMUDriverPtr driver =3D opaque; qemuDomainObjPrivatePtr priv; virObjectEventPtr event =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); int detail =3D 0; =20 VIR_DEBUG("vm=3D%p", vm); @@ -633,7 +627,6 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon G_GNUC_UNU= SED, unlock: virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(cfg); =20 return 0; } @@ -648,7 +641,7 @@ qemuProcessHandleStop(qemuMonitorPtr mon G_GNUC_UNUSED, virObjectEventPtr event =3D NULL; virDomainPausedReason reason; virDomainEventSuspendedDetailType detail; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); qemuDomainObjPrivatePtr priv =3D vm->privateData; =20 virObjectLock(vm); @@ -694,7 +687,6 @@ qemuProcessHandleStop(qemuMonitorPtr mon G_GNUC_UNUSED, =20 virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(cfg); =20 return 0; } @@ -707,7 +699,7 @@ qemuProcessHandleResume(qemuMonitorPtr mon G_GNUC_UNUSE= D, { virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); qemuDomainObjPrivatePtr priv; virDomainRunningReason reason =3D VIR_DOMAIN_RUNNING_UNPAUSED; virDomainEventResumedDetailType eventDetail; @@ -740,7 +732,6 @@ qemuProcessHandleResume(qemuMonitorPtr mon G_GNUC_UNUSE= D, =20 virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(cfg); return 0; } =20 @@ -752,7 +743,7 @@ qemuProcessHandleRTCChange(qemuMonitorPtr mon G_GNUC_UN= USED, { virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); =20 virObjectLock(vm); =20 @@ -784,7 +775,6 @@ qemuProcessHandleRTCChange(qemuMonitorPtr mon G_GNUC_UN= USED, virObjectUnlock(vm); =20 virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(cfg); return 0; } =20 @@ -798,7 +788,7 @@ qemuProcessHandleWatchdog(qemuMonitorPtr mon G_GNUC_UNU= SED, virQEMUDriverPtr driver =3D opaque; virObjectEventPtr watchdogEvent =3D NULL; virObjectEventPtr lifecycleEvent =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); =20 virObjectLock(vm); watchdogEvent =3D virDomainEventWatchdogNewFromObj(vm, action); @@ -846,7 +836,6 @@ qemuProcessHandleWatchdog(qemuMonitorPtr mon G_GNUC_UNU= SED, virObjectEventStateQueue(driver->domainEventState, watchdogEvent); virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); =20 - virObjectUnref(cfg); return 0; } =20 @@ -867,7 +856,7 @@ qemuProcessHandleIOError(qemuMonitorPtr mon G_GNUC_UNUS= ED, const char *srcPath; const char *devAlias; virDomainDiskDefPtr disk; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); =20 virObjectLock(vm); =20 @@ -918,7 +907,6 @@ qemuProcessHandleIOError(qemuMonitorPtr mon G_GNUC_UNUS= ED, virObjectEventStateQueue(driver->domainEventState, ioErrorEvent); virObjectEventStateQueue(driver->domainEventState, ioErrorEvent2); virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); - virObjectUnref(cfg); return 0; } =20 @@ -1147,7 +1135,7 @@ qemuProcessHandleTrayChange(qemuMonitorPtr mon G_GNUC= _UNUSED, virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event =3D NULL; virDomainDiskDefPtr disk; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); =20 virObjectLock(vm); disk =3D qemuProcessFindDomainDiskByAliasOrQOM(vm, devAlias, devid); @@ -1170,7 +1158,6 @@ qemuProcessHandleTrayChange(qemuMonitorPtr mon G_GNUC= _UNUSED, =20 virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(cfg); return 0; } =20 @@ -1182,7 +1169,7 @@ qemuProcessHandlePMWakeup(qemuMonitorPtr mon G_GNUC_U= NUSED, virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event =3D NULL; virObjectEventPtr lifecycleEvent =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); =20 virObjectLock(vm); event =3D virDomainEventPMWakeupNewFromObj(vm); @@ -1209,7 +1196,6 @@ qemuProcessHandlePMWakeup(qemuMonitorPtr mon G_GNUC_U= NUSED, virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); - virObjectUnref(cfg); return 0; } =20 @@ -1221,7 +1207,7 @@ qemuProcessHandlePMSuspend(qemuMonitorPtr mon G_GNUC_= UNUSED, virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event =3D NULL; virObjectEventPtr lifecycleEvent =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); =20 virObjectLock(vm); event =3D virDomainEventPMSuspendNewFromObj(vm); @@ -1251,7 +1237,6 @@ qemuProcessHandlePMSuspend(qemuMonitorPtr mon G_GNUC_= UNUSED, =20 virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); - virObjectUnref(cfg); return 0; } =20 @@ -1263,7 +1248,7 @@ qemuProcessHandleBalloonChange(qemuMonitorPtr mon G_G= NUC_UNUSED, { virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); =20 virObjectLock(vm); event =3D virDomainEventBalloonChangeNewFromObj(vm, actual); @@ -1278,7 +1263,6 @@ qemuProcessHandleBalloonChange(qemuMonitorPtr mon G_G= NUC_UNUSED, virObjectUnlock(vm); =20 virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(cfg); return 0; } =20 @@ -1290,7 +1274,7 @@ qemuProcessHandlePMSuspendDisk(qemuMonitorPtr mon G_G= NUC_UNUSED, virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event =3D NULL; virObjectEventPtr lifecycleEvent =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); =20 virObjectLock(vm); event =3D virDomainEventPMSuspendDiskNewFromObj(vm); @@ -1320,7 +1304,6 @@ qemuProcessHandlePMSuspendDisk(qemuMonitorPtr mon G_G= NUC_UNUSED, =20 virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); - virObjectUnref(cfg); =20 return 0; } @@ -1651,7 +1634,7 @@ qemuProcessHandleMigrationStatus(qemuMonitorPtr mon G= _GNUC_UNUSED, qemuDomainObjPrivatePtr priv; virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); int reason; =20 virObjectLock(vm); @@ -1690,7 +1673,6 @@ qemuProcessHandleMigrationStatus(qemuMonitorPtr mon G= _GNUC_UNUSED, cleanup: virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(cfg); return 0; } =20 @@ -2735,9 +2717,8 @@ static int qemuProcessResctrlCreate(virQEMUDriverPtr driver, virDomainObjPtr vm) { - int ret =3D -1; size_t i =3D 0; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; =20 if (!vm->def->nresctrls) @@ -2754,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; @@ -2762,14 +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: - virObjectUnref(caps); - return ret; + return 0; } =20 =20 @@ -2842,7 +2820,7 @@ qemuProcessStartManagedPRDaemon(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv =3D vm->privateData; virQEMUDriverPtr driver =3D priv->driver; - virQEMUDriverConfigPtr cfg; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; int errfd =3D -1; VIR_AUTOFREE(char *) pidfile =3D NULL; int pidfd =3D -1; @@ -2954,7 +2932,6 @@ qemuProcessStartManagedPRDaemon(virDomainObjPtr vm) virCommandFree(cmd); VIR_FORCE_CLOSE(pidfd); VIR_FORCE_CLOSE(errfd); - virObjectUnref(cfg); return ret; } =20 @@ -2965,7 +2942,7 @@ qemuProcessInitPasswords(virQEMUDriverPtr driver, int asyncJob) { int ret =3D 0; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); size_t i; =20 for (i =3D 0; i < vm->def->ngraphics; ++i) { @@ -2985,11 +2962,9 @@ qemuProcessInitPasswords(virQEMUDriverPtr driver, } =20 if (ret < 0) - goto cleanup; + return ret; } =20 - cleanup: - virObjectUnref(cfg); return ret; } =20 @@ -3050,7 +3025,7 @@ qemuProcessUpdateVideoRamSize(virQEMUDriverPtr driver, ssize_t i; qemuDomainObjPrivatePtr priv =3D vm->privateData; virDomainVideoDefPtr video =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; =20 if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) return -1; @@ -3109,7 +3084,6 @@ qemuProcessUpdateVideoRamSize(virQEMUDriverPtr driver, =20 cfg =3D virQEMUDriverGetConfig(driver); ret =3D virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver-= >caps); - virObjectUnref(cfg); =20 return ret; =20 @@ -3216,11 +3190,11 @@ qemuProcessStartCPUs(virQEMUDriverPtr driver, virDo= mainObjPtr vm, { int ret =3D -1; qemuDomainObjPrivatePtr priv =3D vm->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); =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, @@ -3229,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 @@ -3250,8 +3224,6 @@ qemuProcessStartCPUs(virQEMUDriverPtr driver, virDoma= inObjPtr vm, * lifecycle event. */ =20 - cleanup: - virObjectUnref(cfg); return ret; =20 release: @@ -3259,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 @@ -3313,7 +3285,7 @@ static void qemuProcessNotifyNets(virDomainDefPtr def) { size_t i; - virConnectPtr conn =3D NULL; + VIR_AUTOUNREF(virConnectPtr) conn =3D NULL; =20 for (i =3D 0; i < def->nnets; i++) { virDomainNetDefPtr net =3D def->nets[i]; @@ -3331,8 +3303,6 @@ qemuProcessNotifyNets(virDomainDefPtr def) virDomainNetNotifyActualDevice(conn, def, net); } } - - virObjectUnref(conn); } =20 /* Attempt to instantiate the filters. Ignore failures because it's @@ -3857,12 +3827,11 @@ qemuProcessBuildDestroyMemoryPaths(virQEMUDriverPtr= driver, virDomainMemoryDefPtr mem, bool build) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); VIR_AUTOFREE(char *) path =3D NULL; size_t i; bool shouldBuildHP =3D false; bool shouldBuildMB =3D false; - int ret =3D -1; =20 if (build) { shouldBuildHP =3D qemuProcessNeedHugepagesPath(vm->def, mem); @@ -3874,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); } @@ -3886,17 +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: - virObjectUnref(cfg); - return ret; + return 0; } =20 =20 @@ -3905,23 +3871,19 @@ qemuProcessDestroyMemoryBackingPath(virQEMUDriverPt= r driver, virDomainObjPtr vm, virDomainMemoryDefPtr mem) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); VIR_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: - virObjectUnref(cfg); - return ret; + return 0; } =20 =20 @@ -3960,12 +3922,11 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driv= er, virDomainGraphicsDefPtr graphics, bool allocate) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); unsigned short port =3D 0; 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; @@ -4011,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 @@ -4030,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 @@ -4042,11 +4002,7 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr drive= r, graphics->data.spice.tlsPortReserved =3D true; } =20 - ret =3D 0; - - cleanup: - virObjectUnref(cfg); - return ret; + return 0; } =20 =20 @@ -4361,7 +4317,7 @@ qemuProcessUpdateCPU(virQEMUDriverPtr driver, { virCPUDataPtr cpu =3D NULL; virCPUDataPtr disabled =3D NULL; - virDomainCapsCPUModelsPtr models =3D NULL; + VIR_AUTOUNREF(virDomainCapsCPUModelsPtr) models =3D NULL; int ret =3D -1; =20 /* The host CPU model comes from host caps rather than QEMU caps so @@ -4384,7 +4340,6 @@ qemuProcessUpdateCPU(virQEMUDriverPtr driver, cleanup: virCPUDataFree(cpu); virCPUDataFree(disabled); - virObjectUnref(models); return ret; } =20 @@ -4733,9 +4688,9 @@ static int qemuProcessGetNetworkAddress(const char *netname, char **netaddr) { - virConnectPtr conn =3D NULL; + VIR_AUTOUNREF(virConnectPtr) conn =3D NULL; int ret =3D -1; - virNetworkPtr net; + VIR_AUTOUNREF(virNetworkPtr) net =3D NULL; virNetworkDefPtr netdef =3D NULL; virNetworkIPDefPtr ipdef; virSocketAddr addr; @@ -4821,8 +4776,6 @@ qemuProcessGetNetworkAddress(const char *netname, ret =3D 0; cleanup: virNetworkDefFree(netdef); - virObjectUnref(net); - virObjectUnref(conn); return ret; } =20 @@ -4860,12 +4813,11 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr dri= ver, virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); const char *type =3D virDomainGraphicsTypeToString(graphics->type); 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: @@ -4899,12 +4851,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; } } @@ -4916,14 +4868,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; @@ -4934,11 +4886,7 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr driv= er, } } =20 - ret =3D 0; - - cleanup: - virObjectUnref(cfg); - return ret; + return 0; } =20 =20 @@ -5574,7 +5522,7 @@ qemuProcessInit(virQEMUDriverPtr driver, bool migration, unsigned int flags) { - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; int stopFlags; virCPUDefPtr origCPU =3D NULL; @@ -5657,7 +5605,6 @@ qemuProcessInit(virQEMUDriverPtr driver, =20 cleanup: virCPUDefFree(origCPU); - virObjectUnref(caps); return ret; =20 stop: @@ -5678,9 +5625,8 @@ qemuProcessNetworkPrepareDevices(virQEMUDriverPtr dri= ver, { virDomainDefPtr def =3D vm->def; qemuDomainObjPrivatePtr priv =3D vm->privateData; - int ret =3D -1; size_t i; - virConnectPtr conn =3D NULL; + VIR_AUTOUNREF(virConnectPtr) conn =3D NULL; =20 for (i =3D 0; i < def->nnets; i++) { virDomainNetDefPtr net =3D def->nets[i]; @@ -5692,9 +5638,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); @@ -5718,10 +5664,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))= { @@ -5731,10 +5677,7 @@ qemuProcessNetworkPrepareDevices(virQEMUDriverPtr dr= iver, } =20 } - ret =3D 0; - cleanup: - virObjectUnref(conn); - return ret; + return 0; } =20 =20 @@ -6238,18 +6181,17 @@ qemuProcessPrepareDomain(virQEMUDriverPtr driver, virDomainObjPtr vm, unsigned int flags) { - int ret =3D -1; size_t i; qemuDomainObjPrivatePtr priv =3D vm->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); - virCapsPtr caps; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + VIR_AUTOUNREF(virCapsPtr) 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, @@ -6257,12 +6199,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 @@ -6296,51 +6238,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; @@ -6349,18 +6291,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: - virObjectUnref(caps); - virObjectUnref(cfg); - return ret; + return 0; } =20 =20 @@ -6512,17 +6450,16 @@ qemuProcessPrepareHost(virQEMUDriverPtr driver, virDomainObjPtr vm, unsigned int flags) { - int ret =3D -1; unsigned int hostdev_flags =3D 0; qemuDomainObjPrivatePtr priv =3D vm->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); =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 @@ -6530,7 +6467,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"); @@ -6540,17 +6477,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 */ @@ -6561,14 +6498,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 && @@ -6576,7 +6513,7 @@ qemuProcessPrepareHost(virQEMUDriverPtr driver, virReportSystemError(errno, _("Cannot remove stale PID file %s"), priv->pidfile); - goto cleanup; + return -1; } =20 /* @@ -6585,27 +6522,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: - virObjectUnref(cfg); - return ret; + return 0; } =20 =20 @@ -6715,12 +6649,12 @@ qemuProcessLaunch(virConnectPtr conn, int ret =3D -1; int rv; int logfile =3D -1; - qemuDomainLogContextPtr logCtxt =3D NULL; + VIR_AUTOUNREF(qemuDomainLogContextPtr) logCtxt =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; virCommandPtr cmd =3D NULL; struct qemuProcessHookData hookData; - virQEMUDriverConfigPtr cfg; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; size_t nnicindexes =3D 0; VIR_AUTOFREE(int *) nicindexes =3D NULL; size_t i; @@ -7035,9 +6969,6 @@ qemuProcessLaunch(virConnectPtr conn, qemuExtDevicesStop(driver, vm); qemuDomainSecretDestroy(vm); virCommandFree(cmd); - virObjectUnref(logCtxt); - virObjectUnref(cfg); - virObjectUnref(caps); return ret; } =20 @@ -7094,8 +7025,7 @@ qemuProcessFinishStartup(virQEMUDriverPtr driver, bool startCPUs, virDomainPausedReason pausedReason) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); - int ret =3D -1; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); =20 if (startCPUs) { VIR_DEBUG("Starting domain CPUs"); @@ -7105,7 +7035,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); @@ -7113,18 +7043,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: - virObjectUnref(cfg); - return ret; + return 0; } =20 =20 @@ -7363,8 +7289,8 @@ void qemuProcessStop(virQEMUDriverPtr driver, virNetDevVPortProfilePtr vport =3D NULL; size_t i; VIR_AUTOFREE(char *) timestamp =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); - virConnectPtr conn =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + VIR_AUTOUNREF(virConnectPtr) conn =3D NULL; =20 VIR_DEBUG("Shutting down vm=3D%p name=3D%s id=3D%d pid=3D%lld, " "reason=3D%s, asyncJob=3D%s, flags=3D0x%x", @@ -7670,8 +7596,6 @@ void qemuProcessStop(virQEMUDriverPtr driver, virSetError(orig_err); virFreeError(orig_err); } - virObjectUnref(conn); - virObjectUnref(cfg); } =20 =20 @@ -7806,7 +7730,7 @@ static int qemuProcessRefreshCPU(virQEMUDriverPtr driver, virDomainObjPtr vm) { - virCapsPtr caps =3D virQEMUDriverGetCapabilities(driver, false); + VIR_AUTOUNREF(virCapsPtr) caps =3D virQEMUDriverGetCapabilities(driver= , false); qemuDomainObjPrivatePtr priv =3D vm->privateData; virCPUDefPtr host =3D NULL; virCPUDefPtr cpu =3D NULL; @@ -7857,7 +7781,6 @@ qemuProcessRefreshCPU(virQEMUDriverPtr driver, cleanup: virCPUDefFree(cpu); virCPUDefFree(host); - virObjectUnref(caps); return ret; } =20 @@ -7993,11 +7916,11 @@ qemuProcessReconnect(void *opaque) qemuDomainJobObj oldjob; int state; int reason; - virQEMUDriverConfigPtr cfg; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; size_t i; unsigned int stopFlags =3D 0; bool jobStarted =3D false; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; bool retry =3D true; bool tryMonReconn =3D false; =20 @@ -8241,8 +8164,6 @@ qemuProcessReconnect(void *opaque) qemuDomainRemoveInactiveJob(driver, obj); } virDomainObjEndAPI(&obj); - virObjectUnref(cfg); - virObjectUnref(caps); virNWFilterUnlockFilterUpdates(); virIdentitySetCurrent(NULL); return; @@ -8605,9 +8526,8 @@ qemuProcessQMPInitMonitor(qemuMonitorPtr mon) static int qemuProcessQMPConnectMonitor(qemuProcessQMPPtr proc) { - virDomainXMLOptionPtr xmlopt =3D NULL; + VIR_AUTOUNREF(virDomainXMLOptionPtr) xmlopt =3D NULL; virDomainChrSourceDef monConfig; - int ret =3D -1; =20 VIR_DEBUG("proc=3D%p, emulator=3D%s, proc->pid=3D%lld", proc, proc->binary, (long long)proc->pid); @@ -8619,24 +8539,20 @@ qemuProcessQMPConnectMonitor(qemuProcessQMPPtr proc) if (!(xmlopt =3D virDomainXMLOptionNew(NULL, NULL, NULL, NULL, NULL)) = || !(proc->vm =3D virDomainObjNew(xmlopt)) || !(proc->vm->def =3D virDomainDefNew())) - goto cleanup; + return -1; =20 proc->vm->pid =3D proc->pid; =20 if (!(proc->mon =3D qemuMonitorOpen(proc->vm, &monConfig, true, 0, &callbacks, NULL))) - goto cleanup; + return -1; =20 virObjectLock(proc->mon); =20 if (qemuProcessQMPInitMonitor(proc->mon) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - virObjectUnref(xmlopt); - 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 From nobody Mon May 6 15:01:16 2024 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=1571179718; cv=none; d=zoho.com; s=zohoarc; b=DkJeDWXt3N/Jd8B67tTkpT0AktZ+xx9V8rhUa/t4EJ7FPs/OhrmLs9kdmxw/00qAlMID93zOIZphygeqDKXdah3pfRR4TQEl8JNNb3KimQY9og8lRRq7em9gGZbbHQEdxb72owVD/HQuihfskdm7OTsC5pDi2X5xmpxPl1HujHc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571179718; 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=TkMaGYYyve4VSmlJWcTN7tsqE46XlkqWcZMkBqWGpwc=; b=XLDuDgbfYHbBRwls24BK00qntyBrKfY2flTWCRCvVCgYDY2CCW4jlqf6v4wYpF4hbpbSE8QvLKgPKprov55+OuPDGYIvGHZluX0o6SGyAnBQTx6Umesj9aICsxcQqveyfrcCFik92YpoAlHsEG7xIdPn4keblxRN7QdMP/CO6Qg= 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 1571179718161555.4032285448483; Tue, 15 Oct 2019 15:48:38 -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 85D072A09BA; Tue, 15 Oct 2019 22:48:34 +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 3ADF8600F8; Tue, 15 Oct 2019 22:48:32 +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 101831803B48; Tue, 15 Oct 2019 22:48:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9FMmLak016866 for ; Tue, 15 Oct 2019 18:48:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3527960C57; Tue, 15 Oct 2019 22:48:21 +0000 (UTC) Received: from mx1.redhat.com (ext-mx10.extmail.prod.ext.phx2.redhat.com [10.5.110.39]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2C3B560BE2 for ; Tue, 15 Oct 2019 22:48:18 +0000 (UTC) Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) (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 330D95AFE9 for ; Tue, 15 Oct 2019 22:48:17 +0000 (UTC) Received: by mail-qt1-f175.google.com with SMTP id n17so13794285qtr.4 for ; Tue, 15 Oct 2019 15:48:17 -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.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2019 15:48:15 -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=qpkTAHs92zcNnZBcoleFv2xvIbfligRwQymavdR8uZQ=; b=VH5NHreFbg1YDh3hrfJTKaLMsSEiojuQaEL4db3GrXDg00dtxyxuTJ/HVvyimgTn0I GVrsw5UYDzQphs/QFAYxbLcS3Zz1SSCnCgPfxu8Bq4RLGN4/iX4RLwKXPMyLJ75VCxzU HoB3hgbZkAJdlo+5cYrjYHulV0sOJ1qzKnIJgR9U+kctroHQNjecZqrpSNHBCjgFwk4I MT9Yi2Wgmcq6UkfAlLzQZzgl+v9zAdbso2XKzmwMr3Jy4kpBR6kj4SAec2nwDEmQHdKM Bn/iZgBFTuMclyETldcEmkIp5XDOcaLjjexaYeLb+yMpXgk0pezG0flwd0kcT5NKVYHW YlXA== 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=qpkTAHs92zcNnZBcoleFv2xvIbfligRwQymavdR8uZQ=; b=MHGhoqzNP+k2dvBZ0uqeuvyMpaqekknGw3XHXkpYVN48Z8cNTe5UK65Jeb63CdmOyQ Ses797pEIfc4aYiohOfwFxVwfKQpoffvshJcRzJc+D8zPB0hjeCvbWqkmsTfLPP+pI4Q nB6ezclC/6V1W1bDc9V4tFeNGJcD1p339ciTvJ1LMkbZBM3P0VEJ4wuiLfOYx0+YJXe8 lI7yxj4WKJk+3ZfzdX8Y6TvdcZo53fPWqdqjBe+XJFUy4o7fxxkF5AFx+khJyddeP2si c+gUlMwoBzbuph8xSwXUswowQKZZ0F3ZCfGsl1ZGLQcd/QAeyvgDWjvbTgsI28CDNQLL Ww/g== X-Gm-Message-State: APjAAAUstTdU2ixJfVYgbnk3PjWbDC8/Uy2UofxdIkgWv6Alz0r1ZWwG MQn2GOCJ8XTT+DdicaKnkASDYvtm X-Google-Smtp-Source: APXvYqxUC5pjgBqxAu9u4oKUDCz3tYWv+rmMh+JCi9cZPqR0hYHZZNujMcyH5xpUO0rVLhAwSpjmnA== X-Received: by 2002:ac8:13c6:: with SMTP id i6mr41593886qtj.265.1571179696019; Tue, 15 Oct 2019 15:48:16 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Tue, 15 Oct 2019 19:48:00 -0300 Message-Id: <20191015224800.28545-4-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.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 15 Oct 2019 22:48:17 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 15 Oct 2019 22:48:17 +0000 (UTC) for IP:'209.85.160.175' DOMAIN:'mail-qt1-f175.google.com' HELO:'mail-qt1-f175.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.160.175 mail-qt1-f175.google.com 209.85.160.175 mail-qt1-f175.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.39 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v2 3/3] qemu_process.c: use GLib macros 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.38]); Tue, 15 Oct 2019 22:48:36 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Previous patches added VIR_AUTO* facilities in qemu_process.c to cleanup virObjectUnref() and VIR_FREE() calls. This patch now converts those VIR_AUTO* macros to their GLib alternatives, g_autoptr and g_autofree. The following functions weren't changed in this patch: - qemuProcessUpdateCPU - error when trying to use g_autoptr with virDomainCapsCPUModelsPtr; - qemuProcessLaunch - error when trying to use g_autoptr with qemuDomainLogContextPtr; - qemuProcessQMPConnectMonitor - error when trying to use g_autoptr with virDomainXMLOptionPtr. The rest of the file was converted to GLib auto* macros. Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_process.c | 136 ++++++++++++++++++++-------------------- 1 file changed, 68 insertions(+), 68 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 72919c370d..7cf47207da 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -106,9 +106,9 @@ qemuProcessRemoveDomainStatus(virQEMUDriverPtr driver, virDomainObjPtr vm) { char ebuf[1024]; - VIR_AUTOFREE(char *) file =3D NULL; + g_autofree char *file =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 if (virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name) < 0) return -1; @@ -403,7 +403,7 @@ qemuProcessHandleReset(qemuMonitorPtr mon G_GNUC_UNUSED, virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event; qemuDomainObjPrivatePtr priv; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); int ret =3D -1; =20 virObjectLock(vm); @@ -458,7 +458,7 @@ qemuProcessFakeReboot(void *opaque) virDomainObjPtr vm =3D opaque; qemuDomainObjPrivatePtr priv =3D vm->privateData; virQEMUDriverPtr driver =3D priv->driver; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virDomainRunningReason reason =3D VIR_DOMAIN_RUNNING_BOOTED; int ret =3D -1, rc; =20 @@ -570,7 +570,7 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon G_GNUC_UNU= SED, virQEMUDriverPtr driver =3D opaque; qemuDomainObjPrivatePtr priv; virObjectEventPtr event =3D NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); int detail =3D 0; =20 VIR_DEBUG("vm=3D%p", vm); @@ -641,7 +641,7 @@ qemuProcessHandleStop(qemuMonitorPtr mon G_GNUC_UNUSED, virObjectEventPtr event =3D NULL; virDomainPausedReason reason; virDomainEventSuspendedDetailType detail; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv =3D vm->privateData; =20 virObjectLock(vm); @@ -699,7 +699,7 @@ qemuProcessHandleResume(qemuMonitorPtr mon G_GNUC_UNUSE= D, { virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event =3D NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv; virDomainRunningReason reason =3D VIR_DOMAIN_RUNNING_UNPAUSED; virDomainEventResumedDetailType eventDetail; @@ -743,7 +743,7 @@ qemuProcessHandleRTCChange(qemuMonitorPtr mon G_GNUC_UN= USED, { virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event =3D NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 virObjectLock(vm); =20 @@ -788,7 +788,7 @@ qemuProcessHandleWatchdog(qemuMonitorPtr mon G_GNUC_UNU= SED, virQEMUDriverPtr driver =3D opaque; virObjectEventPtr watchdogEvent =3D NULL; virObjectEventPtr lifecycleEvent =3D NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 virObjectLock(vm); watchdogEvent =3D virDomainEventWatchdogNewFromObj(vm, action); @@ -856,7 +856,7 @@ qemuProcessHandleIOError(qemuMonitorPtr mon G_GNUC_UNUS= ED, const char *srcPath; const char *devAlias; virDomainDiskDefPtr disk; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 virObjectLock(vm); =20 @@ -923,7 +923,7 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon G_GNUC_UNU= SED, virQEMUDriverPtr driver =3D opaque; struct qemuProcessEvent *processEvent =3D NULL; virDomainDiskDefPtr disk; - VIR_AUTOUNREF(qemuBlockJobDataPtr) job =3D NULL; + g_autoptr(qemuBlockJobData) job =3D NULL; char *data =3D NULL; =20 virObjectLock(vm); @@ -1135,7 +1135,7 @@ qemuProcessHandleTrayChange(qemuMonitorPtr mon G_GNUC= _UNUSED, virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event =3D NULL; virDomainDiskDefPtr disk; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 virObjectLock(vm); disk =3D qemuProcessFindDomainDiskByAliasOrQOM(vm, devAlias, devid); @@ -1169,7 +1169,7 @@ qemuProcessHandlePMWakeup(qemuMonitorPtr mon G_GNUC_U= NUSED, virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event =3D NULL; virObjectEventPtr lifecycleEvent =3D NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 virObjectLock(vm); event =3D virDomainEventPMWakeupNewFromObj(vm); @@ -1207,7 +1207,7 @@ qemuProcessHandlePMSuspend(qemuMonitorPtr mon G_GNUC_= UNUSED, virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event =3D NULL; virObjectEventPtr lifecycleEvent =3D NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 virObjectLock(vm); event =3D virDomainEventPMSuspendNewFromObj(vm); @@ -1248,7 +1248,7 @@ qemuProcessHandleBalloonChange(qemuMonitorPtr mon G_G= NUC_UNUSED, { virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event =3D NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 virObjectLock(vm); event =3D virDomainEventBalloonChangeNewFromObj(vm, actual); @@ -1274,7 +1274,7 @@ qemuProcessHandlePMSuspendDisk(qemuMonitorPtr mon G_G= NUC_UNUSED, virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event =3D NULL; virObjectEventPtr lifecycleEvent =3D NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 virObjectLock(vm); event =3D virDomainEventPMSuspendDiskNewFromObj(vm); @@ -1495,7 +1495,7 @@ qemuProcessHandleBlockThreshold(qemuMonitorPtr mon G_= GNUC_UNUSED, virDomainDiskDefPtr disk; virStorageSourcePtr src; unsigned int idx; - VIR_AUTOFREE(char *) dev =3D NULL; + g_autofree char *dev =3D NULL; const char *path =3D NULL; =20 virObjectLock(vm); @@ -1634,7 +1634,7 @@ qemuProcessHandleMigrationStatus(qemuMonitorPtr mon G= _GNUC_UNUSED, qemuDomainObjPrivatePtr priv; virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event =3D NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); int reason; =20 virObjectLock(vm); @@ -2044,7 +2044,7 @@ static int qemuProcessReportLogError(qemuDomainLogContextPtr logCtxt, const char *msgprefix) { - VIR_AUTOFREE(char *) logmsg =3D NULL; + g_autofree char *logmsg =3D NULL; size_t max; =20 max =3D VIR_ERROR_MAX_LENGTH - 1; @@ -2080,7 +2080,7 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices, int count, virHashTablePtr info) { - VIR_AUTOFREE(char *) id =3D NULL; + g_autofree char *id =3D NULL; size_t i; =20 for (i =3D 0; i < count; i++) { @@ -2167,7 +2167,7 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr= driver, int agentReason =3D VIR_CONNECT_DOMAIN_EVENT_AGENT_LIFECYCLE_REASON_CH= ANNEL; qemuMonitorChardevInfoPtr entry; virObjectEventPtr event =3D NULL; - VIR_AUTOFREE(char *) id =3D NULL; + g_autofree char *id =3D NULL; =20 if (booted) agentReason =3D VIR_CONNECT_DOMAIN_EVENT_AGENT_LIFECYCLE_REASON_DO= MAIN_STARTED; @@ -2487,7 +2487,7 @@ qemuProcessGetAllCpuAffinity(virBitmapPtr *cpumapRet) static int qemuProcessInitCpuAffinity(virDomainObjPtr vm) { - VIR_AUTOPTR(virBitmap) cpumapToSet =3D NULL; + g_autoptr(virBitmap) cpumapToSet =3D NULL; virDomainNumatuneMemMode mem_mode; qemuDomainObjPrivatePtr priv =3D vm->privateData; =20 @@ -2614,8 +2614,8 @@ qemuProcessSetupPid(virDomainObjPtr vm, virDomainNumatuneMemMode mem_mode; virCgroupPtr cgroup =3D NULL; virBitmapPtr use_cpumask =3D NULL; - VIR_AUTOPTR(virBitmap) hostcpumap =3D NULL; - VIR_AUTOFREE(char *) mem_mask =3D NULL; + g_autoptr(virBitmap) hostcpumap =3D NULL; + g_autofree char *mem_mask =3D NULL; int ret =3D -1; =20 if ((period || quota) && @@ -2718,7 +2718,7 @@ qemuProcessResctrlCreate(virQEMUDriverPtr driver, virDomainObjPtr vm) { size_t i =3D 0; - VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; =20 if (!vm->def->nresctrls) @@ -2766,7 +2766,7 @@ qemuProcessKillManagedPRDaemon(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv =3D vm->privateData; virErrorPtr orig_err; - VIR_AUTOFREE(char *) pidfile =3D NULL; + g_autofree char *pidfile =3D NULL; =20 if (!(pidfile =3D qemuProcessBuildPRHelperPidfilePath(vm))) { VIR_WARN("Unable to construct pr-helper pidfile path"); @@ -2795,7 +2795,7 @@ qemuProcessStartPRDaemonHook(void *opaque) { virDomainObjPtr vm =3D opaque; size_t i, nfds =3D 0; - VIR_AUTOFREE(int *) fds =3D NULL; + g_autofree int *fds =3D NULL; int ret =3D -1; =20 if (qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) { @@ -2820,11 +2820,11 @@ qemuProcessStartManagedPRDaemon(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv =3D vm->privateData; virQEMUDriverPtr driver =3D priv->driver; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; int errfd =3D -1; - VIR_AUTOFREE(char *) pidfile =3D NULL; + g_autofree char *pidfile =3D NULL; int pidfd =3D -1; - VIR_AUTOFREE(char *) socketPath =3D NULL; + g_autofree char *socketPath =3D NULL; pid_t cpid =3D -1; virCommandPtr cmd =3D NULL; virTimeBackOffVar timebackoff; @@ -2942,7 +2942,7 @@ qemuProcessInitPasswords(virQEMUDriverPtr driver, int asyncJob) { int ret =3D 0; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); size_t i; =20 for (i =3D 0; i < vm->def->ngraphics; ++i) { @@ -3025,7 +3025,7 @@ qemuProcessUpdateVideoRamSize(virQEMUDriverPtr driver, ssize_t i; qemuDomainObjPrivatePtr priv =3D vm->privateData; virDomainVideoDefPtr video =3D NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) return -1; @@ -3190,7 +3190,7 @@ qemuProcessStartCPUs(virQEMUDriverPtr driver, virDoma= inObjPtr vm, { int ret =3D -1; qemuDomainObjPrivatePtr priv =3D vm->privateData; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 /* Bring up netdevs before starting CPUs */ if (qemuInterfaceStartDevices(vm->def) < 0) @@ -3285,7 +3285,7 @@ static void qemuProcessNotifyNets(virDomainDefPtr def) { size_t i; - VIR_AUTOUNREF(virConnectPtr) conn =3D NULL; + g_autoptr(virConnect) conn =3D NULL; =20 for (i =3D 0; i < def->nnets; i++) { virDomainNetDefPtr net =3D def->nets[i]; @@ -3340,7 +3340,7 @@ qemuProcessUpdateState(virQEMUDriverPtr driver, virDo= mainObjPtr vm) int oldReason; int newReason; bool running; - VIR_AUTOFREE(char *) msg =3D NULL; + g_autofree char *msg =3D NULL; int ret; =20 qemuDomainObjEnterMonitor(driver, vm); @@ -3827,8 +3827,8 @@ qemuProcessBuildDestroyMemoryPaths(virQEMUDriverPtr d= river, virDomainMemoryDefPtr mem, bool build) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); - VIR_AUTOFREE(char *) path =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); + g_autofree char *path =3D NULL; size_t i; bool shouldBuildHP =3D false; bool shouldBuildMB =3D false; @@ -3871,8 +3871,8 @@ qemuProcessDestroyMemoryBackingPath(virQEMUDriverPtr = driver, virDomainObjPtr vm, virDomainMemoryDefPtr mem) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); - VIR_AUTOFREE(char *) path =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); + g_autofree char *path =3D NULL; =20 if (qemuGetMemoryBackingPath(vm->def, cfg, mem->info.alias, &path) < 0) return -1; @@ -3922,7 +3922,7 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driver, virDomainGraphicsDefPtr graphics, bool allocate) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); unsigned short port =3D 0; unsigned short tlsPort; size_t i; @@ -4014,7 +4014,7 @@ qemuProcessVerifyHypervFeatures(virDomainDefPtr def, int rc; =20 for (i =3D 0; i < VIR_DOMAIN_HYPERV_LAST; i++) { - VIR_AUTOFREE(char *) cpuFeature =3D NULL; + g_autofree char *cpuFeature =3D NULL; =20 /* always supported string property */ if (i =3D=3D VIR_DOMAIN_HYPERV_VENDOR_ID || @@ -4447,11 +4447,11 @@ qemuLogOperation(virDomainObjPtr vm, virCommandPtr cmd, qemuDomainLogContextPtr logCtxt) { - VIR_AUTOFREE(char *) timestamp =3D NULL; + g_autofree char *timestamp =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; int qemuVersion =3D virQEMUCapsGetVersion(priv->qemuCaps); const char *package =3D virQEMUCapsGetPackage(priv->qemuCaps); - VIR_AUTOFREE(char *) hostname =3D virGetHostname(); + g_autofree char *hostname =3D virGetHostname(); struct utsname uts; =20 uname(&uts); @@ -4471,7 +4471,7 @@ qemuLogOperation(virDomainObjPtr vm, return; =20 if (cmd) { - VIR_AUTOFREE(char *) args =3D virCommandToString(cmd, true); + g_autofree char *args =3D virCommandToString(cmd, true); qemuDomainLogContextWrite(logCtxt, "%s\n", args); } } @@ -4573,7 +4573,7 @@ qemuProcessStartHook(virQEMUDriverPtr driver, virHookSubopType subop) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - VIR_AUTOFREE(char *) xml =3D NULL; + g_autofree char *xml =3D NULL; int ret; =20 if (!virHookPresent(VIR_HOOK_DRIVER_QEMU)) @@ -4688,15 +4688,15 @@ static int qemuProcessGetNetworkAddress(const char *netname, char **netaddr) { - VIR_AUTOUNREF(virConnectPtr) conn =3D NULL; + g_autoptr(virConnect) conn =3D NULL; int ret =3D -1; - VIR_AUTOUNREF(virNetworkPtr) net =3D NULL; + g_autoptr(virNetwork) net =3D NULL; virNetworkDefPtr netdef =3D NULL; virNetworkIPDefPtr ipdef; virSocketAddr addr; virSocketAddrPtr addrptr =3D NULL; char *dev_name =3D NULL; - VIR_AUTOFREE(char *) xml =3D NULL; + g_autofree char *xml =3D NULL; =20 *netaddr =3D NULL; =20 @@ -4813,7 +4813,7 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr drive= r, virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); const char *type =3D virDomainGraphicsTypeToString(graphics->type); char *listenAddr =3D NULL; bool useSocket =3D false; @@ -5426,7 +5426,7 @@ qemuProcessStartValidate(virQEMUDriverPtr driver, return -1; =20 if (n > 0) { - VIR_AUTOFREE(char *) str =3D NULL; + g_autofree char *str =3D NULL; =20 str =3D virStringListJoin((const char **)features, ", "); virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -5455,7 +5455,7 @@ static int qemuProcessStartUpdateCustomCaps(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(p= riv->driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(priv->dr= iver); qemuDomainXmlNsDefPtr nsdef =3D vm->def->namespaceData; char **next; int tmp; @@ -5522,7 +5522,7 @@ qemuProcessInit(virQEMUDriverPtr driver, bool migration, unsigned int flags) { - VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; int stopFlags; virCPUDefPtr origCPU =3D NULL; @@ -5626,7 +5626,7 @@ qemuProcessNetworkPrepareDevices(virQEMUDriverPtr dri= ver, virDomainDefPtr def =3D vm->def; qemuDomainObjPrivatePtr priv =3D vm->privateData; size_t i; - VIR_AUTOUNREF(virConnectPtr) conn =3D NULL; + g_autoptr(virConnect) conn =3D NULL; =20 for (i =3D 0; i < def->nnets; i++) { virDomainNetDefPtr net =3D def->nets[i]; @@ -6067,7 +6067,7 @@ qemuProcessPrepareDomainNUMAPlacement(virDomainObjPtr= vm, virCapsPtr caps) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - VIR_AUTOFREE(char *) nodeset =3D NULL; + g_autofree char *nodeset =3D NULL; virBitmapPtr numadNodeset =3D NULL; virBitmapPtr hostMemoryNodeset =3D NULL; int ret =3D -1; @@ -6183,8 +6183,8 @@ qemuProcessPrepareDomain(virQEMUDriverPtr driver, { size_t i; qemuDomainObjPrivatePtr priv =3D vm->privateData; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); - VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virCaps) caps =3D NULL; =20 if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) return -1; @@ -6309,7 +6309,7 @@ qemuProcessSEVCreateFile(virDomainObjPtr vm, { qemuDomainObjPrivatePtr priv =3D vm->privateData; virQEMUDriverPtr driver =3D priv->driver; - VIR_AUTOFREE(char *) configFile =3D NULL; + g_autofree char *configFile =3D NULL; =20 if (!(configFile =3D virFileBuildPath(priv->libDir, name, ".base64"))) return -1; @@ -6452,7 +6452,7 @@ qemuProcessPrepareHost(virQEMUDriverPtr driver, { unsigned int hostdev_flags =3D 0; qemuDomainObjPrivatePtr priv =3D vm->privateData; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 if (qemuPrepareNVRAM(cfg, vm) < 0) return -1; @@ -7025,7 +7025,7 @@ qemuProcessFinishStartup(virQEMUDriverPtr driver, bool startCPUs, virDomainPausedReason pausedReason) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 if (startCPUs) { VIR_DEBUG("Starting domain CPUs"); @@ -7288,9 +7288,9 @@ void qemuProcessStop(virQEMUDriverPtr driver, virDomainDefPtr def; virNetDevVPortProfilePtr vport =3D NULL; size_t i; - VIR_AUTOFREE(char *) timestamp =3D NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); - VIR_AUTOUNREF(virConnectPtr) conn =3D NULL; + g_autofree char *timestamp =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virConnect) conn =3D NULL; =20 VIR_DEBUG("Shutting down vm=3D%p name=3D%s id=3D%d pid=3D%lld, " "reason=3D%s, asyncJob=3D%s, flags=3D0x%x", @@ -7402,7 +7402,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, =20 /* now that we know it's stopped call the hook if present */ if (virHookPresent(VIR_HOOK_DRIVER_QEMU)) { - VIR_AUTOFREE(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, @@ -7577,7 +7577,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, =20 /* The "release" hook cleans up additional resources */ if (virHookPresent(VIR_HOOK_DRIVER_QEMU)) { - VIR_AUTOFREE(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, @@ -7730,7 +7730,7 @@ static int qemuProcessRefreshCPU(virQEMUDriverPtr driver, virDomainObjPtr vm) { - VIR_AUTOUNREF(virCapsPtr) caps =3D virQEMUDriverGetCapabilities(driver= , false); + g_autoptr(virCaps) caps =3D virQEMUDriverGetCapabilities(driver, false= ); qemuDomainObjPrivatePtr priv =3D vm->privateData; virCPUDefPtr host =3D NULL; virCPUDefPtr cpu =3D NULL; @@ -7916,11 +7916,11 @@ qemuProcessReconnect(void *opaque) qemuDomainJobObj oldjob; int state; int reason; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; size_t i; unsigned int stopFlags =3D 0; bool jobStarted =3D false; - VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; bool retry =3D true; bool tryMonReconn =3D false; =20 @@ -8135,7 +8135,7 @@ qemuProcessReconnect(void *opaque) =20 /* Run an hook to allow admins to do some magic */ if (virHookPresent(VIR_HOOK_DRIVER_QEMU)) { - VIR_AUTOFREE(char *) xml =3D qemuDomainDefFormatXML(driver, + g_autofree char *xml =3D qemuDomainDefFormatXML(driver, priv->qemuCaps, obj->def, 0); int hookret; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list