From nobody Mon Apr 29 05:02:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1576876633; cv=none; d=zohomail.com; s=zohoarc; b=mYL96NSQpThiuouJ1cOrc+WeF9OOPYT2UyssAgNGTl/VwHXj9kIiNQUBtQP5tXpF1CrtTPFB6h+igUE2DNg+P3gbgGuOMufzhPFI3+jbbEviHA8lG2lAnCnin5oRnRP12VD+EEE6bywpwauI1/ZoOKIfDXehFJ/jien8qk64uhA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576876633; 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=ZKy3q/i/SDj010wRJ+NAfrGW6vTc/e1BVM5c2GC1LF0=; b=G/hN6Q8+JiB+Wjl7hVN+HpqIyJqY8XlroYcDo9QrYqlNsSm/EbmOKWVlrGY9R+Gq2YXDzgk22g2UsYXjk8qxyV14T2jKCtXM9uhi2HiUYJkstmhtdSF3mxJ7Ut2oSXp/1BqWOlCJy+PBPx8kzH5jHq26kc0SwMKcKJ6vm2sdDxA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1576876633880471.9752343476807; Fri, 20 Dec 2019 13:17:13 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-9-x_O7KZS3Ps2DGY066mrzCg-1; Fri, 20 Dec 2019 16:17:10 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id EA9E21005510; Fri, 20 Dec 2019 21:17:00 +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 C346C7D92F; Fri, 20 Dec 2019 21:17:00 +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 892001808855; Fri, 20 Dec 2019 21:17:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xBKLGl5o013622 for ; Fri, 20 Dec 2019 16:16:47 -0500 Received: by smtp.corp.redhat.com (Postfix) id A7C4E2166B2A; Fri, 20 Dec 2019 21:16:47 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A16E22166B2B for ; Fri, 20 Dec 2019 21:16:45 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3258710163DF for ; Fri, 20 Dec 2019 21:16:45 +0000 (UTC) Received: from mail-qv1-f67.google.com (mail-qv1-f67.google.com [209.85.219.67]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-186-oWXko1o9MpWw5eZLcNuC9w-1; Fri, 20 Dec 2019 16:16:42 -0500 Received: by mail-qv1-f67.google.com with SMTP id t6so4166203qvs.5; Fri, 20 Dec 2019 13:16:42 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:2968:dc54:84c2:3c64:baf7]) by smtp.gmail.com with ESMTPSA id j15sm3377717qtn.37.2019.12.20.13.16.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Dec 2019 13:16:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576876632; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ZKy3q/i/SDj010wRJ+NAfrGW6vTc/e1BVM5c2GC1LF0=; b=A0f4AmMhIYAwR8FmEpMBKuiVVuAcar71o2Dv2tHFTtg/Vx2vXtH8tdKYXznSFxWtMCzH4e D+ZNq2WjOPZBlDqu55I4llXa0EawUeD16aS7WtJrEhLhlo8+S3UteeYOBBJdBynJ+6YiY/ XC8aEMxqgrZSLDA+oQwnnQtHiJCettU= 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=zNOzVcXj2+XQVP2iz5oF6n3HljYm1Nqjw2SYYKfXtJA=; b=l1er0Gfs9Clp3xneOS1e0SVaZ9toQ4utSvFP1/CwuDDdT2xi/En18g3yFEXy6TEt/8 4abZ2oLDnrNQ8gewhlhMcEHqzBoVSW4OEVD3ZYdzsZStCVbAqMiMTZgYu129CvXHau+C IbDPvKMo9R/1AClTBkZ3Ok5DX8PYegkO4mBGk2CUikrLl1KuQaEDX/GDo65w90ICP7n8 abS0R3VEr3K9WRsA9eV4NqTz5L89IWnzsBo8Gq7DC2ap4u3vDkRsGCd8VRcR5JXe2BWv WDtM/JkN2RM7o0C92ATRLeYmAY2RJjD3AO9VSyqf/Y5Ud4u7eK+6LoiUnmXPWJ5GCeNz pEew== X-Gm-Message-State: APjAAAUjWT4fOG8m0FDu5wkNaIVGQFX6noKX+AD3jbhpg4IgnABXqNOr yaubIdEvWaSe5XXSjVvN0BTft3aZ X-Google-Smtp-Source: APXvYqwd2dCk56nEpLFd24gr9e1zA4sfl1Bm/rBZPAc3niT8426G/I2NbFx2J+PMgndkyOYfUHhs3w== X-Received: by 2002:ad4:45b1:: with SMTP id y17mr14017311qvu.245.1576876602029; Fri, 20 Dec 2019 13:16:42 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Fri, 20 Dec 2019 18:16:28 -0300 Message-Id: <20191220211632.700239-2-danielhb413@gmail.com> In-Reply-To: <20191220211632.700239-1-danielhb413@gmail.com> References: <20191220211632.700239-1-danielhb413@gmail.com> MIME-Version: 1.0 X-MC-Unique: oWXko1o9MpWw5eZLcNuC9w-1 X-MC-Unique: x_O7KZS3Ps2DGY066mrzCg-1 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id xBKLGl5o013622 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , crobinso@redhat.com Subject: [libvirt] [PATCH v5 1/5] 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: , 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-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Change all feasible strings and scalar pointers to use g_autofree. Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_process.c | 103 +++++++++++++++------------------------- 1 file changed, 38 insertions(+), 65 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7e1db50e8f..bd51b1de25 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -105,7 +105,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); =20 @@ -114,7 +114,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 && @@ -1501,7 +1500,6 @@ qemuProcessHandleBlockThreshold(qemuMonitorPtr mon G_= GNUC_UNUSED, virDomainDiskDefPtr disk; virStorageSourcePtr src; unsigned int idx; - char *dev =3D NULL; const char *path =3D NULL; =20 virObjectLock(vm); @@ -1511,14 +1509,13 @@ qemuProcessHandleBlockThreshold(qemuMonitorPtr mon = G_GNUC_UNUSED, nodename, vm, vm->def->name, threshold, excess); =20 if ((disk =3D qemuDomainDiskLookupByNodename(vm->def, nodename, &src, = &idx))) { + g_autofree char *dev =3D NULL; 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); @@ -2052,7 +2049,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; @@ -2069,7 +2066,6 @@ qemuProcessReportLogError(qemuDomainLogContextPtr log= Ctxt, else virReportError(VIR_ERR_INTERNAL_ERROR, _("%s: %s"), msgprefix, log= msg); =20 - VIR_FREE(logmsg); return 0; } =20 @@ -2089,16 +2085,15 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices, int count, virHashTablePtr info) { - char *id =3D NULL; size_t i; int ret =3D -1; =20 for (i =3D 0; i < count; i++) { + g_autofree char *id =3D NULL; virDomainChrDefPtr chr =3D devices[i]; if (chr->source->type =3D=3D VIR_DOMAIN_CHR_TYPE_PTY) { qemuMonitorChardevInfoPtr entry; =20 - VIR_FREE(id); id =3D g_strdup_printf("char%s", chr->info.alias); =20 entry =3D virHashLookup(info, id); @@ -2118,14 +2113,13 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices, } } =20 - VIR_FREE(chr->source->data.file.path); + g_free(chr->source->data.file.path); chr->source->data.file.path =3D g_strdup(entry->ptyPath); } } =20 ret =3D 0; cleanup: - VIR_FREE(id); return ret; } =20 @@ -2178,7 +2172,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; =20 if (booted) agentReason =3D VIR_CONNECT_DOMAIN_EVENT_AGENT_LIFECYCLE_REASON_DO= MAIN_STARTED; @@ -2204,8 +2198,6 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr= driver, chr->state =3D entry->state; } } - - VIR_FREE(id); } =20 =20 @@ -2622,7 +2614,7 @@ qemuProcessSetupPid(virDomainObjPtr vm, virBitmapPtr use_cpumask =3D NULL; virBitmapPtr afinity_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) && @@ -2702,7 +2694,6 @@ qemuProcessSetupPid(virDomainObjPtr vm, =20 ret =3D 0; cleanup: - VIR_FREE(mem_mask); if (cgroup) { if (ret < 0) virCgroupRemove(cgroup); @@ -2781,7 +2772,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"); @@ -2802,8 +2793,6 @@ qemuProcessKillManagedPRDaemon(virDomainObjPtr vm) } } virErrorRestore(&orig_err); - - VIR_FREE(pidfile); } =20 =20 @@ -2812,7 +2801,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)) { @@ -2828,7 +2817,6 @@ qemuProcessStartPRDaemonHook(void *opaque) cleanup: for (i =3D 0; i < nfds; i++) VIR_FORCE_CLOSE(fds[i]); - VIR_FREE(fds); return ret; } =20 @@ -2840,9 +2828,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; @@ -2948,9 +2936,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; @@ -3366,7 +3352,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); @@ -3414,7 +3400,6 @@ qemuProcessUpdateState(virQEMUDriverPtr driver, virDo= mainObjPtr vm) NULLSTR(msg), virDomainStateTypeToString(newState), virDomainStateReasonToString(newState, newReason)); - VIR_FREE(msg); virDomainObjSetState(vm, newState, newReason); } =20 @@ -3879,7 +3864,6 @@ qemuProcessBuildDestroyMemoryPaths(virQEMUDriverPtr d= river, bool build) { virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); - char *path =3D NULL; size_t i; bool shouldBuildHP =3D false; bool shouldBuildMB =3D false; @@ -3892,6 +3876,7 @@ qemuProcessBuildDestroyMemoryPaths(virQEMUDriverPtr d= river, =20 if (!build || shouldBuildHP) { for (i =3D 0; i < cfg->nhugetlbfs; i++) { + g_autofree char *path =3D NULL; path =3D qemuGetDomainHugepagePath(vm->def, &cfg->hugetlbfs[i]= ); =20 if (!path) @@ -3900,25 +3885,21 @@ qemuProcessBuildDestroyMemoryPaths(virQEMUDriverPtr= driver, if (qemuProcessBuildDestroyMemoryPathsImpl(driver, vm, path, build) < 0) goto cleanup; - - VIR_FREE(path); } } =20 if (!build || shouldBuildMB) { + g_autofree char *path =3D NULL; if (qemuGetMemoryBackingDomainPath(vm->def, cfg, &path) < 0) goto cleanup; =20 if (qemuProcessBuildDestroyMemoryPathsImpl(driver, vm, path, build) < 0) goto cleanup; - - VIR_FREE(path); } =20 ret =3D 0; cleanup: - VIR_FREE(path); virObjectUnref(cfg); return ret; } @@ -3930,7 +3911,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) @@ -3944,7 +3925,6 @@ qemuProcessDestroyMemoryBackingPath(virQEMUDriverPtr = driver, =20 ret =3D 0; cleanup: - VIR_FREE(path); virObjectUnref(cfg); return ret; } @@ -4079,11 +4059,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 +4076,6 @@ qemuProcessVerifyHypervFeatures(virDomainDefPtr def, cpuFeature =3D g_strdup_printf("hv-%s", virDomainHypervTypeToStrin= g(i)); =20 rc =3D virCPUDataCheckFeature(cpu, cpuFeature); - VIR_FREE(cpuFeature); =20 if (rc < 0) { return -1; @@ -4518,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", @@ -4539,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 @@ -4647,7 +4622,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)) @@ -4658,7 +4633,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; } @@ -4771,7 +4745,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 @@ -4853,7 +4827,6 @@ qemuProcessGetNetworkAddress(const char *netname, virNetworkDefFree(netdef); virObjectUnref(net); virObjectUnref(conn); - VIR_FREE(xml); return ret; } =20 @@ -6392,7 +6365,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"))) @@ -6409,7 +6382,6 @@ qemuProcessSEVCreateFile(virDomainObjPtr vm, =20 ret =3D 0; cleanup: - VIR_FREE(configFile); return ret; } =20 @@ -6746,7 +6718,7 @@ qemuProcessLaunch(virConnectPtr conn, struct qemuProcessHookData hookData; virQEMUDriverConfigPtr cfg; 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 " @@ -7053,7 +7025,6 @@ qemuProcessLaunch(virConnectPtr conn, virCommandFree(cmd); virObjectUnref(logCtxt); virObjectUnref(cfg); - VIR_FREE(nicindexes); return ret; } =20 @@ -7374,7 +7345,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, virDomainDefPtr def =3D vm->def; const virNetDevVPortProfile *vport =3D NULL; size_t i; - char *timestamp; + g_autofree char *timestamp =3D NULL; virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); virConnectPtr conn =3D NULL; =20 @@ -7417,7 +7388,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 */ @@ -7488,13 +7458,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 */ @@ -7677,13 +7646,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); @@ -8228,13 +8196,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 @@ -8489,7 +8458,7 @@ qemuProcessQEMULabelUniqPath(qemuProcessQMPPtr proc) static int qemuProcessQMPInit(qemuProcessQMPPtr proc) { - char *template =3D NULL; + g_autofree char *template =3D NULL; =20 VIR_DEBUG("proc=3D%p, emulator=3D%s", proc, proc->binary); =20 @@ -8502,6 +8471,10 @@ qemuProcessQMPInit(qemuProcessQMPPtr proc) template); return -1; } + /* if g_mkdtemp succeeds, proc->uniqDir is now the owner of + * the string. Set template to NULL to avoid freeing + * the memory in this case */ + template =3D NULL; =20 if (qemuProcessQEMULabelUniqPath(proc) < 0) return -1; --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon Apr 29 05:02:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1576876623; cv=none; d=zohomail.com; s=zohoarc; b=mI1640JrJyDc517OgfWSmO+s+ewpjJ3o0Cqo6wRJm5tv/tBvQQB8C1gnbNxgAL7WZeZO9wdFYkjvcmyYIlUjGmZHVv6Bkorv8oVy3aXmPhtT5qwtqYajPQu1hptJU7iSGswfDBDIpchcgzTZVOqr/AIYU+TTyR4WepQRqbVlztE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576876623; 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=/hpDwh95wd/mZhtw+C8Cu2ldx5rXIjfnNVfYeK8dZak=; b=dbr6/pZvSjFNoK8wWRkqAewT9JtTigiIhd46/B+Mw/VkBxzeoMQ2M9FQ67UX0bLA6uPOOnvTyUq2xpFW1XWlmEojiRgBDF2U6xqV40lI4SIw8wiGTzeSxIK+W+Mb3EcXsNgVqtTVmtjvzlAgP2zsiWhPkcLPQI32VdIc17qsHFo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1576876623501589.4524479556945; Fri, 20 Dec 2019 13:17:03 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-159-vo2XNQU5OPOL998iQsBGrw-1; Fri, 20 Dec 2019 16:16:59 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 76DE51883521; Fri, 20 Dec 2019 21:16:53 +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 4CD3B60C18; Fri, 20 Dec 2019 21:16:53 +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 972F6252ED; Fri, 20 Dec 2019 21:16:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xBKLGmEh013633 for ; Fri, 20 Dec 2019 16:16:49 -0500 Received: by smtp.corp.redhat.com (Postfix) id C6CD62026D67; Fri, 20 Dec 2019 21:16:48 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C21592022AA8 for ; Fri, 20 Dec 2019 21:16:46 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B688610163E8 for ; Fri, 20 Dec 2019 21:16:46 +0000 (UTC) Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-191-sO9j0vBjN5Skm6cutYbXqA-1; Fri, 20 Dec 2019 16:16:44 -0500 Received: by mail-qt1-f193.google.com with SMTP id e12so9422135qto.2; Fri, 20 Dec 2019 13:16:44 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:2968:dc54:84c2:3c64:baf7]) by smtp.gmail.com with ESMTPSA id j15sm3377717qtn.37.2019.12.20.13.16.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Dec 2019 13:16:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576876622; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=/hpDwh95wd/mZhtw+C8Cu2ldx5rXIjfnNVfYeK8dZak=; b=OT/o1QcuXXss9ZF/wRjEAU71jozsyURN6oNoNM1OuSTX3oMg+6DKZfRAg/nohTje9R/jVB mR+peWvV/HrGAEgt/RHjseVd/+R4dXdJ8GEfN6wP+b/Gvua5d0GWxqxIg0ltiKM4w0cdfI Nj6i4Lc1Th7jlU4eRrY06gIrs4RZhbk= 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=dPpGnvJYJeyVsfKSIYpPv42dzywyPXg4tM8UknZbyZo=; b=dfC/XwPPmbZW6q55OC3IU0bsfx7P2CqMmGW30KfhHJAclIPMrTu+GDV0M+zWfAMYyy V71lAZOVXZjwGmCtzCJuwiCi+840dU3hOV/9BJ+HarYXF0h+dARgwRBCTBAgND66R639 zLmfwxHphZ2AqAKcXIBxObZIPKtVYJ8BWTdcR0pQg2+ZAZb4eTUotQa85poJ2muQWxKa ARe3xl+BV5vSDgNexaDDweE2ar/yrMvZHf4nKvQrM0VwBmPLw+8IejIl29/TrDYuMxKx 1RonHl91sw/FMUohRwSMla4ehOQPRDvJtKo8uUzp5ogiLDmCfIcuPIWSavqoqJpvAzj9 W/Og== X-Gm-Message-State: APjAAAXsNazWYR8Us94pl5zvXW7SP3wU+a3DvzzIKQ+7fURG3uf/QRzr XpC7rsRAGN0Q527eS0MCbTwRzL7u X-Google-Smtp-Source: APXvYqyEhYIFyFfziDwwQwZQdPjfVGEBmcASu4h0TWoN31Lj3igu8AHbE+hgmANpQ4J5Tj2w/LOLHA== X-Received: by 2002:ac8:3108:: with SMTP id g8mr13254715qtb.30.1576876603825; Fri, 20 Dec 2019 13:16:43 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Fri, 20 Dec 2019 18:16:29 -0300 Message-Id: <20191220211632.700239-3-danielhb413@gmail.com> In-Reply-To: <20191220211632.700239-1-danielhb413@gmail.com> References: <20191220211632.700239-1-danielhb413@gmail.com> MIME-Version: 1.0 X-MC-Unique: sO9j0vBjN5Skm6cutYbXqA-1 X-MC-Unique: vo2XNQU5OPOL998iQsBGrw-1 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id xBKLGmEh013633 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , crobinso@redhat.com Subject: [libvirt] [PATCH v5 2/5] qemu_domain.h: add G_DEFINE_AUTOPTR_CLEANUP_FUNC for qemuDomainLogContext 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This will allow us to g_autoptr qemuDomainLogContext pointers in the following patch. Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_domain.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index a32852047c..7a86818cbb 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -586,6 +586,7 @@ void qemuProcessEventFree(struct qemuProcessEvent *even= t); =20 typedef struct _qemuDomainLogContext qemuDomainLogContext; typedef qemuDomainLogContext *qemuDomainLogContextPtr; +G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuDomainLogContext, virObjectUnref); =20 typedef struct _qemuDomainSaveCookie qemuDomainSaveCookie; typedef qemuDomainSaveCookie *qemuDomainSaveCookiePtr; --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon Apr 29 05:02:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1576876627; cv=none; d=zohomail.com; s=zohoarc; b=PLkadM7LqQWgqBO+fFheZ7eqRqwQYpRqte+basrK95+/IeoPOE1ZSD5o7uThnGkeEvK2Vuu+5Ko/p8NJiTdKa12/2iRyx9wRAwdUpjdWPZsoRldy2/4esYpjt2XixH01yroXKHZxLHt09HFgKsdgr4Swn3O793FRFHNIgGWHZlg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576876627; 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=7ZBtBWbVEbvPX51Znr9NfD9P7VRDCNjNoKr7Xctj6OA=; b=Xjv01LZSK8nMeQ5YrxB3BCtjWpROdfU1tSqx4dda7HNpNIDzEzNrOyvQDjaMMJgJOJdFNn1cFztTB3Zl9JMET9JzCk11LbvPNz3ax3L+HEaNpNNp9qxAYMVdYLZzV8mY+pQQ2dhfKpiTMrASMs1rQ2FN/30tfA6nEVHC7ykxWEY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1576876627416823.2719936257215; Fri, 20 Dec 2019 13:17:07 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-337-f9mP6UKlPJ2s9mWyED9Gpg-1; Fri, 20 Dec 2019 16:17:03 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8A064801E66; Fri, 20 Dec 2019 21:16:56 +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 4F73F60576; Fri, 20 Dec 2019 21:16:56 +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 EAA6E18089CF; Fri, 20 Dec 2019 21:16:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xBKLGqPO013654 for ; Fri, 20 Dec 2019 16:16:52 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5D91210066AC; Fri, 20 Dec 2019 21:16:52 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5823010066B9 for ; Fri, 20 Dec 2019 21:16:50 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 55FCA803B5F for ; Fri, 20 Dec 2019 21:16:50 +0000 (UTC) Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-142-d79SFwKaMzyxLKo-Z9oFgg-1; Fri, 20 Dec 2019 16:16:46 -0500 Received: by mail-qt1-f194.google.com with SMTP id e12so9422197qto.2; Fri, 20 Dec 2019 13:16:46 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:2968:dc54:84c2:3c64:baf7]) by smtp.gmail.com with ESMTPSA id j15sm3377717qtn.37.2019.12.20.13.16.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Dec 2019 13:16:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576876626; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=7ZBtBWbVEbvPX51Znr9NfD9P7VRDCNjNoKr7Xctj6OA=; b=DJe1ULW5WfacEJS8aQSEa/piltLQ/NTGCxo7uwrRYaNdydgV9C4ilUcZaoydpS/iNFF3Li Ha+PArR87UL9IL/z8OzQRWWhHJWhfaehj5nMmxVPrDlX8XTaoCU2uFeJJhAR7SSIJT/UPs yOj50dBSXNIKFE5SjM5VXUOuExVfjCE= 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=+nYAnFW+bcc2XfaPwXK/yhVDKNn55cHjoITsfzhu1pU=; b=KcolXYQE8f3B/weO69XqnWBEnutsdUmwGA2b9ebNXZWLTlIKonNrUI9O8FAEu1Y2LE EPDg0uwV8DIx8UwMtisJ6dnroJPkweFpb0Yi8U3+gHbbLDF6UrIVmlN58vSYw+uD/Wz9 L1Yw0yIvWi742JRiBny9GVovKzUMfcaR6If2W1IASsjcFfxM2iS4fjrK0sVssE0qKYQg PqjyMNhdXNY3e5N2x/pkID431vxM9bZp4iVDQ70/Wbz6GgUa1mW2IqOW4NV0mAr2QiEn AUz6oJdhJWZN/eqOLTH1GCZ+EuttEksha7e5tlATIW6RoV6PV3V4G8+jwKZCNxqh9mLP m/AA== X-Gm-Message-State: APjAAAUJHUQza/ht/AE+07j+0nWmcbSyUwrSBiI/Jx02B4q7N69igNa/ +lK8n0abQFXEDzOn1MELNeR9SayS X-Google-Smtp-Source: APXvYqymM0pQ66FUdbytrjrbtOE6SCI1t0Mg1KHOpLCOV6awy9CD12I6c4BS0eJFss1EboUNrlfBEw== X-Received: by 2002:ac8:1766:: with SMTP id u35mr13507554qtk.34.1576876605441; Fri, 20 Dec 2019 13:16:45 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Fri, 20 Dec 2019 18:16:30 -0300 Message-Id: <20191220211632.700239-4-danielhb413@gmail.com> In-Reply-To: <20191220211632.700239-1-danielhb413@gmail.com> References: <20191220211632.700239-1-danielhb413@gmail.com> MIME-Version: 1.0 X-MC-Unique: d79SFwKaMzyxLKo-Z9oFgg-1 X-MC-Unique: f9mP6UKlPJ2s9mWyED9Gpg-1 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id xBKLGqPO013654 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , crobinso@redhat.com Subject: [libvirt] [PATCH v5 3/5] qemu_process.c: use g_autoptr() 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: , 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-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Change all feasible pointers to use g_autoptr(). Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_process.c | 123 ++++++++++++++-------------------------- 1 file changed, 41 insertions(+), 82 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index bd51b1de25..c30084bec3 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -107,7 +107,7 @@ qemuProcessRemoveDomainStatus(virQEMUDriverPtr driver, char ebuf[1024]; g_autofree char *file =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 file =3D g_strdup_printf("%s/%s.xml", cfg->stateDir, vm->def->name); =20 @@ -120,8 +120,6 @@ qemuProcessRemoveDomainStatus(virQEMUDriverPtr driver, errno !=3D ENOENT) VIR_WARN("Failed to remove PID file for %s: %s", vm->def->name, virStrerror(errno, ebuf, sizeof(ebuf))); - - virObjectUnref(cfg); } =20 =20 @@ -401,7 +399,7 @@ qemuProcessHandleReset(qemuMonitorPtr mon G_GNUC_UNUSED, virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event; qemuDomainObjPrivatePtr priv; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); int ret =3D -1; =20 virObjectLock(vm); @@ -438,7 +436,6 @@ qemuProcessHandleReset(qemuMonitorPtr mon G_GNUC_UNUSED, cleanup: virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(cfg); return ret; } =20 @@ -457,7 +454,7 @@ qemuProcessFakeReboot(void *opaque) virDomainObjPtr vm =3D opaque; qemuDomainObjPrivatePtr priv =3D vm->privateData; virQEMUDriverPtr driver =3D priv->driver; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virDomainRunningReason reason =3D VIR_DOMAIN_RUNNING_BOOTED; int ret =3D -1, rc; =20 @@ -507,7 +504,6 @@ qemuProcessFakeReboot(void *opaque) if (ret =3D=3D -1) ignore_value(qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_FORCE)); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); } =20 =20 @@ -570,7 +566,7 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon G_GNUC_UNU= SED, virQEMUDriverPtr driver =3D opaque; qemuDomainObjPrivatePtr priv; virObjectEventPtr event =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); int detail =3D 0; =20 VIR_DEBUG("vm=3D%p", vm); @@ -627,7 +623,6 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon G_GNUC_UNU= SED, unlock: virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(cfg); =20 return 0; } @@ -642,7 +637,7 @@ qemuProcessHandleStop(qemuMonitorPtr mon G_GNUC_UNUSED, virObjectEventPtr event =3D NULL; virDomainPausedReason reason; virDomainEventSuspendedDetailType detail; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv =3D vm->privateData; =20 virObjectLock(vm); @@ -688,7 +683,6 @@ qemuProcessHandleStop(qemuMonitorPtr mon G_GNUC_UNUSED, =20 virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(cfg); =20 return 0; } @@ -701,7 +695,7 @@ qemuProcessHandleResume(qemuMonitorPtr mon G_GNUC_UNUSE= D, { virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv; virDomainRunningReason reason =3D VIR_DOMAIN_RUNNING_UNPAUSED; virDomainEventResumedDetailType eventDetail; @@ -734,7 +728,6 @@ qemuProcessHandleResume(qemuMonitorPtr mon G_GNUC_UNUSE= D, =20 virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(cfg); return 0; } =20 @@ -746,7 +739,7 @@ qemuProcessHandleRTCChange(qemuMonitorPtr mon G_GNUC_UN= USED, { virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 virObjectLock(vm); =20 @@ -778,7 +771,6 @@ qemuProcessHandleRTCChange(qemuMonitorPtr mon G_GNUC_UN= USED, virObjectUnlock(vm); =20 virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(cfg); return 0; } =20 @@ -792,7 +784,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); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 virObjectLock(vm); watchdogEvent =3D virDomainEventWatchdogNewFromObj(vm, action); @@ -840,7 +832,6 @@ qemuProcessHandleWatchdog(qemuMonitorPtr mon G_GNUC_UNU= SED, virObjectEventStateQueue(driver->domainEventState, watchdogEvent); virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); =20 - virObjectUnref(cfg); return 0; } =20 @@ -861,7 +852,7 @@ qemuProcessHandleIOError(qemuMonitorPtr mon G_GNUC_UNUS= ED, const char *srcPath; const char *devAlias; virDomainDiskDefPtr disk; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 virObjectLock(vm); =20 @@ -912,7 +903,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 @@ -1136,7 +1126,7 @@ qemuProcessHandleTrayChange(qemuMonitorPtr mon G_GNUC= _UNUSED, virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event =3D NULL; virDomainDiskDefPtr disk; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 virObjectLock(vm); disk =3D qemuProcessFindDomainDiskByAliasOrQOM(vm, devAlias, devid); @@ -1159,7 +1149,6 @@ qemuProcessHandleTrayChange(qemuMonitorPtr mon G_GNUC= _UNUSED, =20 virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(cfg); return 0; } =20 @@ -1171,7 +1160,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); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 virObjectLock(vm); event =3D virDomainEventPMWakeupNewFromObj(vm); @@ -1198,7 +1187,6 @@ qemuProcessHandlePMWakeup(qemuMonitorPtr mon G_GNUC_U= NUSED, virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); - virObjectUnref(cfg); return 0; } =20 @@ -1210,7 +1198,7 @@ qemuProcessHandlePMSuspend(qemuMonitorPtr mon G_GNUC_= UNUSED, virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event =3D NULL; virObjectEventPtr lifecycleEvent =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 virObjectLock(vm); event =3D virDomainEventPMSuspendNewFromObj(vm); @@ -1240,7 +1228,6 @@ qemuProcessHandlePMSuspend(qemuMonitorPtr mon G_GNUC_= UNUSED, =20 virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); - virObjectUnref(cfg); return 0; } =20 @@ -1252,7 +1239,7 @@ qemuProcessHandleBalloonChange(qemuMonitorPtr mon G_G= NUC_UNUSED, { virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 virObjectLock(vm); event =3D virDomainEventBalloonChangeNewFromObj(vm, actual); @@ -1267,7 +1254,6 @@ qemuProcessHandleBalloonChange(qemuMonitorPtr mon G_G= NUC_UNUSED, virObjectUnlock(vm); =20 virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(cfg); return 0; } =20 @@ -1279,7 +1265,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); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 virObjectLock(vm); event =3D virDomainEventPMSuspendDiskNewFromObj(vm); @@ -1309,7 +1295,6 @@ qemuProcessHandlePMSuspendDisk(qemuMonitorPtr mon G_G= NUC_UNUSED, =20 virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); - virObjectUnref(cfg); =20 return 0; } @@ -1637,7 +1622,7 @@ qemuProcessHandleMigrationStatus(qemuMonitorPtr mon G= _GNUC_UNUSED, qemuDomainObjPrivatePtr priv; virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); int reason; =20 virObjectLock(vm); @@ -1676,7 +1661,6 @@ qemuProcessHandleMigrationStatus(qemuMonitorPtr mon G= _GNUC_UNUSED, cleanup: virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(cfg); return 0; } =20 @@ -2721,7 +2705,7 @@ qemuProcessResctrlCreate(virQEMUDriverPtr driver, { int ret =3D -1; size_t i =3D 0; - virCapsPtr caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; =20 if (!vm->def->nresctrls) @@ -2752,7 +2736,6 @@ qemuProcessResctrlCreate(virQEMUDriverPtr driver, =20 ret =3D 0; cleanup: - virObjectUnref(caps); return ret; } =20 @@ -2826,13 +2809,13 @@ qemuProcessStartManagedPRDaemon(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv =3D vm->privateData; virQEMUDriverPtr driver =3D priv->driver; - virQEMUDriverConfigPtr cfg; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; int errfd =3D -1; g_autofree char *pidfile =3D NULL; int pidfd =3D -1; g_autofree char *socketPath =3D NULL; pid_t cpid =3D -1; - virCommandPtr cmd =3D NULL; + g_autoptr(virCommand) cmd =3D NULL; virTimeBackOffVar timebackoff; const unsigned long long timeout =3D 500000; /* ms */ int ret =3D -1; @@ -2935,10 +2918,8 @@ qemuProcessStartManagedPRDaemon(virDomainObjPtr vm) if (pidfile) unlink(pidfile); } - virCommandFree(cmd); VIR_FORCE_CLOSE(pidfd); VIR_FORCE_CLOSE(errfd); - virObjectUnref(cfg); return ret; } =20 @@ -2949,7 +2930,7 @@ qemuProcessInitPasswords(virQEMUDriverPtr driver, int asyncJob) { int ret =3D 0; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); size_t i; =20 for (i =3D 0; i < vm->def->ngraphics; ++i) { @@ -2973,7 +2954,6 @@ qemuProcessInitPasswords(virQEMUDriverPtr driver, } =20 cleanup: - virObjectUnref(cfg); return ret; } =20 @@ -3034,7 +3014,7 @@ qemuProcessUpdateVideoRamSize(virQEMUDriverPtr driver, ssize_t i; qemuDomainObjPrivatePtr priv =3D vm->privateData; virDomainVideoDefPtr video =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) return -1; @@ -3093,7 +3073,6 @@ qemuProcessUpdateVideoRamSize(virQEMUDriverPtr driver, =20 cfg =3D virQEMUDriverGetConfig(driver); ret =3D virDomainObjSave(vm, driver->xmlopt, cfg->stateDir); - virObjectUnref(cfg); =20 return ret; =20 @@ -3198,7 +3177,7 @@ qemuProcessStartCPUs(virQEMUDriverPtr driver, virDoma= inObjPtr vm, { int ret =3D -1; qemuDomainObjPrivatePtr priv =3D vm->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 /* Bring up netdevs before starting CPUs */ if (qemuInterfaceStartDevices(vm->def) < 0) @@ -3233,7 +3212,6 @@ qemuProcessStartCPUs(virQEMUDriverPtr driver, virDoma= inObjPtr vm, */ =20 cleanup: - virObjectUnref(cfg); return ret; =20 release: @@ -3295,7 +3273,7 @@ static void qemuProcessNotifyNets(virDomainDefPtr def) { size_t i; - 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]; @@ -3313,8 +3291,6 @@ qemuProcessNotifyNets(virDomainDefPtr def) virDomainNetNotifyActualDevice(conn, def, net); } } - - virObjectUnref(conn); } =20 /* Attempt to instantiate the filters. Ignore failures because it's @@ -3863,7 +3839,8 @@ qemuProcessBuildDestroyMemoryPaths(virQEMUDriverPtr d= river, virDomainMemoryDefPtr mem, bool build) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); size_t i; bool shouldBuildHP =3D false; bool shouldBuildMB =3D false; @@ -3900,7 +3877,6 @@ qemuProcessBuildDestroyMemoryPaths(virQEMUDriverPtr d= river, =20 ret =3D 0; cleanup: - virObjectUnref(cfg); return ret; } =20 @@ -3910,7 +3886,7 @@ qemuProcessDestroyMemoryBackingPath(virQEMUDriverPtr = driver, virDomainObjPtr vm, virDomainMemoryDefPtr mem) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); g_autofree char *path =3D NULL; int ret =3D -1; =20 @@ -3925,7 +3901,6 @@ qemuProcessDestroyMemoryBackingPath(virQEMUDriverPtr = driver, =20 ret =3D 0; cleanup: - virObjectUnref(cfg); return ret; } =20 @@ -3965,7 +3940,7 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driver, virDomainGraphicsDefPtr graphics, bool allocate) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); unsigned short port =3D 0; unsigned short tlsPort; size_t i; @@ -4050,7 +4025,6 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driver, ret =3D 0; =20 cleanup: - virObjectUnref(cfg); return ret; } =20 @@ -4340,7 +4314,7 @@ qemuProcessFetchCPUDefinitions(virQEMUDriverPtr drive= r, virDomainCapsCPUModelsPtr *cpuModels) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - virDomainCapsCPUModelsPtr models =3D NULL; + g_autoptr(virDomainCapsCPUModels) models =3D NULL; int rc; =20 if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) @@ -4355,7 +4329,6 @@ qemuProcessFetchCPUDefinitions(virQEMUDriverPtr drive= r, return 0; =20 error: - virObjectUnref(models); return -1; } =20 @@ -4367,7 +4340,7 @@ qemuProcessUpdateCPU(virQEMUDriverPtr driver, { virCPUDataPtr cpu =3D NULL; virCPUDataPtr disabled =3D NULL; - virDomainCapsCPUModelsPtr models =3D NULL; + g_autoptr(virDomainCapsCPUModels) models =3D NULL; int ret =3D -1; =20 /* The host CPU model comes from host caps rather than QEMU caps so @@ -4390,7 +4363,6 @@ qemuProcessUpdateCPU(virQEMUDriverPtr driver, cleanup: virCPUDataFree(cpu); virCPUDataFree(disabled); - virObjectUnref(models); return ret; } =20 @@ -4737,9 +4709,9 @@ static int qemuProcessGetNetworkAddress(const char *netname, char **netaddr) { - virConnectPtr conn =3D NULL; + g_autoptr(virConnect) conn =3D NULL; int ret =3D -1; - virNetworkPtr net; + g_autoptr(virNetwork) net =3D NULL; virNetworkDefPtr netdef =3D NULL; virNetworkIPDefPtr ipdef; virSocketAddr addr; @@ -4825,8 +4797,6 @@ qemuProcessGetNetworkAddress(const char *netname, ret =3D 0; cleanup: virNetworkDefFree(netdef); - virObjectUnref(net); - virObjectUnref(conn); return ret; } =20 @@ -4863,7 +4833,7 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr drive= r, virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); const char *type =3D virDomainGraphicsTypeToString(graphics->type); char *listenAddr =3D NULL; bool useSocket =3D false; @@ -4937,7 +4907,6 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr drive= r, ret =3D 0; =20 cleanup: - virObjectUnref(cfg); return ret; } =20 @@ -5656,7 +5625,7 @@ qemuProcessNetworkPrepareDevices(virQEMUDriverPtr dri= ver, qemuDomainObjPrivatePtr priv =3D vm->privateData; int ret =3D -1; size_t i; - 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]; @@ -5709,7 +5678,6 @@ qemuProcessNetworkPrepareDevices(virQEMUDriverPtr dri= ver, } ret =3D 0; cleanup: - virObjectUnref(conn); return ret; } =20 @@ -6249,7 +6217,7 @@ qemuProcessPrepareDomain(virQEMUDriverPtr driver, int ret =3D -1; size_t i; qemuDomainObjPrivatePtr priv =3D vm->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 priv->machineName =3D qemuDomainGetMachineName(vm); if (!priv->machineName) @@ -6353,7 +6321,6 @@ qemuProcessPrepareDomain(virQEMUDriverPtr driver, =20 ret =3D 0; cleanup: - virObjectUnref(cfg); return ret; } =20 @@ -6512,7 +6479,7 @@ qemuProcessPrepareHost(virQEMUDriverPtr driver, int ret =3D -1; unsigned int hostdev_flags =3D 0; qemuDomainObjPrivatePtr priv =3D vm->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 if (qemuPrepareNVRAM(cfg, vm) < 0) goto cleanup; @@ -6601,7 +6568,6 @@ qemuProcessPrepareHost(virQEMUDriverPtr driver, =20 ret =3D 0; cleanup: - virObjectUnref(cfg); return ret; } =20 @@ -6712,11 +6678,11 @@ qemuProcessLaunch(virConnectPtr conn, int ret =3D -1; int rv; int logfile =3D -1; - qemuDomainLogContextPtr logCtxt =3D NULL; + g_autoptr(qemuDomainLogContext) logCtxt =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; - virCommandPtr cmd =3D NULL; + g_autoptr(virCommand) cmd =3D NULL; struct qemuProcessHookData hookData; - virQEMUDriverConfigPtr cfg; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; size_t nnicindexes =3D 0; g_autofree int *nicindexes =3D NULL; size_t i; @@ -7022,9 +6988,6 @@ qemuProcessLaunch(virConnectPtr conn, if (ret < 0) qemuExtDevicesStop(driver, vm); qemuDomainSecretDestroy(vm); - virCommandFree(cmd); - virObjectUnref(logCtxt); - virObjectUnref(cfg); return ret; } =20 @@ -7081,8 +7044,8 @@ qemuProcessFinishStartup(virQEMUDriverPtr driver, bool startCPUs, virDomainPausedReason pausedReason) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); int ret =3D -1; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 if (startCPUs) { VIR_DEBUG("Starting domain CPUs"); @@ -7110,7 +7073,6 @@ qemuProcessFinishStartup(virQEMUDriverPtr driver, ret =3D 0; =20 cleanup: - virObjectUnref(cfg); return ret; } =20 @@ -7346,8 +7308,8 @@ void qemuProcessStop(virQEMUDriverPtr driver, const virNetDevVPortProfile *vport =3D NULL; size_t i; g_autofree char *timestamp =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); - virConnectPtr conn =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", @@ -7662,8 +7624,6 @@ void qemuProcessStop(virQEMUDriverPtr driver, =20 cleanup: virErrorRestore(&orig_err); - virObjectUnref(conn); - virObjectUnref(cfg); } =20 =20 @@ -7977,7 +7937,7 @@ qemuProcessReconnect(void *opaque) qemuDomainJobObj oldjob; int state; int reason; - virQEMUDriverConfigPtr cfg; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; size_t i; unsigned int stopFlags =3D 0; bool jobStarted =3D false; @@ -8225,7 +8185,6 @@ qemuProcessReconnect(void *opaque) qemuDomainRemoveInactiveJob(driver, obj); } virDomainObjEndAPI(&obj); - virObjectUnref(cfg); virNWFilterUnlockFilterUpdates(); virIdentitySetCurrent(NULL); return; --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon Apr 29 05:02:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1576876633; cv=none; d=zohomail.com; s=zohoarc; b=Lwj0NtNv0+605Da/q5Dkp8+mrH+yEfzmRvniUhAsVKa9E9/0UCHnnaVZTWIFUSuJNqvsCKJHuGn7EWwvLynd9e8hrR5y4zjJXluzyfU4X89Krgm8hBZpboayTU3aqcqlayONTE3nLPsmUu5Tw1Piq68PRUqMUAKk4Te/dXFseD0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576876633; 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=lcDg+wCbjfAH4CmWWpr+iRTWklQ5GwuxdVA1AYcyyLE=; b=YZDlUxbbptuvrIgfoZHoR9Gg37tRrA95FV/WJaTVqiAt+ew/V5e2AciB6ye9Cw5EUHiLVo1LKvVhhn3ubB3NVbJizm0in2lvpZJrk5lDucJehH51suy+xjmOgc+Ia9L7kinc9up1htNEU+s6gIgrlUAMECyvputTW4xOKgOFTVI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1576876633537443.93106563231015; Fri, 20 Dec 2019 13:17:13 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-38-ALnZqMrqPxOFOVUOBIwjZQ-1; Fri, 20 Dec 2019 16:17:08 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F1DB48024CC; Fri, 20 Dec 2019 21:17:00 +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 C547D5DA32; Fri, 20 Dec 2019 21:17:00 +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 8585C18089D8; Fri, 20 Dec 2019 21:17:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xBKLGomr013642 for ; Fri, 20 Dec 2019 16:16:50 -0500 Received: by smtp.corp.redhat.com (Postfix) id 690942166B2A; Fri, 20 Dec 2019 21:16:50 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6469E2166B29 for ; Fri, 20 Dec 2019 21:16:50 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 40C4C803B5C for ; Fri, 20 Dec 2019 21:16:50 +0000 (UTC) Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-116-MvS4iXgYMLWI8jPTu9hw9w-1; Fri, 20 Dec 2019 16:16:48 -0500 Received: by mail-qt1-f193.google.com with SMTP id d18so6715863qtj.10; Fri, 20 Dec 2019 13:16:48 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:2968:dc54:84c2:3c64:baf7]) by smtp.gmail.com with ESMTPSA id j15sm3377717qtn.37.2019.12.20.13.16.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Dec 2019 13:16:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576876632; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=lcDg+wCbjfAH4CmWWpr+iRTWklQ5GwuxdVA1AYcyyLE=; b=Mfoh3mT1ZVFZhyyxpJ4gS5hpQolHZJxuhUrzMafOiYmva+cxI7q0ebnInsvMzVfwP56sPd gUCEDhDRNqbgCWWt+jw6+lU3szg1lRUG+jDT3B2KY3HqfCYGP34aOrY0pXKh4DB7UNBB4l zqjcteC4g3k0JbGxTyx0CSli4nnuIHs= 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=J68pZMsDUmIm6BFSe2aDzYMyfVPTYP9MBv8iDdzEXPA=; b=XiHo97Cwt0A7IimcuIpsiRMi9+gjvZ649RLw9WXBOzYtVzqrj8x483IvWN0JlTpWmF 3+4YqwwyTlBQd5IOsPpiqpySNhRavn1FG1bYV8353K24jMfxe4Vl9WJs6V4lkcuFNjjV 84p7H37qdvTyL5fZRQ/E86Fyt6lUplJRM+k19vzUBvsvScnPHfU72d/FIy6EIJ2v7/JJ tEGBmQtmMBjMGk3VwHefWiXhgZfu2Vd5BTrUFOtb5nmbabMfJcHJ0BATciu/KyxBu3xw ZGdVx46vwLGm0KkGTYlvUjlBak4SDqTpmiji+YkwXA6CEP8Fu27KlDyZI8PIf8UsHejw 5tiw== X-Gm-Message-State: APjAAAWJaAgkAxTk9nC6v9ac1YD0PivQabwiGJH18Gu66LHj6+LFUXQU ks1YeWLm+jl8jOVAAZcighvphkVn X-Google-Smtp-Source: APXvYqyKSOD0tKpOG5rScmokKB2YgTkZmMjQrD4JGTKctQsyarwwuBR1Na3vvF5uJ1eHqdQ7nZ7lfw== X-Received: by 2002:ac8:7648:: with SMTP id i8mr13349336qtr.389.1576876607333; Fri, 20 Dec 2019 13:16:47 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Fri, 20 Dec 2019 18:16:31 -0300 Message-Id: <20191220211632.700239-5-danielhb413@gmail.com> In-Reply-To: <20191220211632.700239-1-danielhb413@gmail.com> References: <20191220211632.700239-1-danielhb413@gmail.com> MIME-Version: 1.0 X-MC-Unique: MvS4iXgYMLWI8jPTu9hw9w-1 X-MC-Unique: ALnZqMrqPxOFOVUOBIwjZQ-1 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id xBKLGomr013642 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , crobinso@redhat.com Subject: [libvirt] [PATCH v5 4/5] qemu_process.c: remove cleanup labels after g_auto*() changes X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The g_auto*() changes made by the previous patches made a lot of 'cleanup' labels obsolete. Let's remove them. Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_process.c | 182 ++++++++++++++++------------------------ 1 file changed, 70 insertions(+), 112 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c30084bec3..0243adfb05 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2070,7 +2070,6 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices, virHashTablePtr info) { size_t i; - int ret =3D -1; =20 for (i =3D 0; i < count; i++) { g_autofree char *id =3D NULL; @@ -2088,7 +2087,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 @@ -2102,9 +2101,7 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices, } } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 static int @@ -2703,7 +2700,6 @@ static int qemuProcessResctrlCreate(virQEMUDriverPtr driver, virDomainObjPtr vm) { - int ret =3D -1; size_t i =3D 0; g_autoptr(virCaps) caps =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; @@ -2722,7 +2718,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; @@ -2730,13 +2726,11 @@ qemuProcessResctrlCreate(virQEMUDriverPtr driver, mon =3D vm->def->resctrls[i]->monitors[j]; if (virResctrlMonitorCreate(mon->instance, priv->machineName) < 0) - goto cleanup; + return -1; } } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -2950,10 +2944,9 @@ qemuProcessInitPasswords(virQEMUDriverPtr driver, } =20 if (ret < 0) - goto cleanup; + return ret; } =20 - cleanup: return ret; } =20 @@ -3181,7 +3174,7 @@ qemuProcessStartCPUs(virQEMUDriverPtr driver, virDoma= inObjPtr vm, =20 /* Bring up netdevs before starting CPUs */ if (qemuInterfaceStartDevices(vm->def) < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("Using lock state '%s'", NULLSTR(priv->lockState)); if (virDomainLockProcessResume(driver->lockManager, cfg->uri, @@ -3190,7 +3183,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 @@ -3211,7 +3204,6 @@ qemuProcessStartCPUs(virQEMUDriverPtr driver, virDoma= inObjPtr vm, * lifecycle event. */ =20 - cleanup: return ret; =20 release: @@ -3219,7 +3211,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 @@ -3844,7 +3836,6 @@ qemuProcessBuildDestroyMemoryPaths(virQEMUDriverPtr d= river, size_t i; bool shouldBuildHP =3D false; bool shouldBuildMB =3D false; - int ret =3D -1; =20 if (build) { shouldBuildHP =3D qemuProcessNeedHugepagesPath(vm->def, mem); @@ -3857,27 +3848,25 @@ 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 if (!build || shouldBuildMB) { g_autofree char *path =3D NULL; if (qemuGetMemoryBackingDomainPath(vm->def, cfg, &path) < 0) - goto cleanup; + return -1; =20 if (qemuProcessBuildDestroyMemoryPathsImpl(driver, vm, path, build) < 0) - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -3888,20 +3877,17 @@ qemuProcessDestroyMemoryBackingPath(virQEMUDriverPt= r driver, { g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); g_autofree char *path =3D NULL; - int ret =3D -1; =20 if (qemuGetMemoryBackingPath(vm->def, cfg, mem->info.alias, &path) < 0) - goto cleanup; + return -1; =20 if (unlink(path) < 0 && errno !=3D ENOENT) { virReportSystemError(errno, _("Unable to remove %s"), path); - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -3945,7 +3931,6 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driver, unsigned short tlsPort; size_t i; int defaultMode =3D graphics->data.spice.defaultMode; - int ret =3D -1; =20 bool needTLSPort =3D false; bool needPort =3D false; @@ -3991,13 +3976,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 @@ -4010,11 +3994,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 @@ -4022,10 +4006,7 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr drive= r, graphics->data.spice.tlsPortReserved =3D true; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -4318,18 +4299,15 @@ qemuProcessFetchCPUDefinitions(virQEMUDriverPtr dri= ver, int rc; =20 if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) - goto error; + return -1; =20 rc =3D virQEMUCapsFetchCPUModels(priv->mon, vm->def->os.arch, &models); =20 if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) - goto error; + return -1; =20 *cpuModels =3D models; return 0; - - error: - return -1; } =20 =20 @@ -4838,7 +4816,6 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr drive= r, char *listenAddr =3D NULL; bool useSocket =3D false; size_t i; - int ret =3D -1; =20 switch (graphics->type) { case VIR_DOMAIN_GRAPHICS_TYPE_VNC: @@ -4887,7 +4864,7 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr drive= r, =20 if (qemuProcessGraphicsSetupNetworkAddress(glisten, listenAddr) < 0) - goto cleanup; + return -1; break; =20 case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: @@ -4904,10 +4881,7 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr driv= er, } } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -5623,7 +5597,6 @@ qemuProcessNetworkPrepareDevices(virQEMUDriverPtr dri= ver, { virDomainDefPtr def =3D vm->def; qemuDomainObjPrivatePtr priv =3D vm->privateData; - int ret =3D -1; size_t i; g_autoptr(virConnect) conn =3D NULL; =20 @@ -5637,9 +5610,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); @@ -5663,10 +5636,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))= { @@ -5676,9 +5649,7 @@ qemuProcessNetworkPrepareDevices(virQEMUDriverPtr dri= ver, } =20 } - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -6214,14 +6185,13 @@ qemuProcessPrepareDomain(virQEMUDriverPtr driver, virDomainObjPtr vm, unsigned int flags) { - int ret =3D -1; size_t i; qemuDomainObjPrivatePtr priv =3D vm->privateData; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =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, @@ -6229,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(driver, vm) < 0) - goto cleanup; + return -1; } =20 /* Whether we should use virtlogd as stdio handler for character @@ -6259,53 +6229,53 @@ 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; if (qemuDomainInitializePflashStorageSource(vm) < 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; @@ -6314,14 +6284,12 @@ qemuProcessPrepareDomain(virQEMUDriverPtr driver, =20 VIR_DEBUG("Updating guest CPU definition"); if (qemuProcessUpdateGuestCPU(vm->def, priv->qemuCaps, driver->hostarc= h, flags) < 0) - goto cleanup; + return -1; =20 for (i =3D 0; i < vm->def->nshmems; i++) qemuDomainPrepareShmemChardev(vm->def->shmems[i]); =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -6333,7 +6301,6 @@ qemuProcessSEVCreateFile(virDomainObjPtr vm, qemuDomainObjPrivatePtr priv =3D vm->privateData; virQEMUDriverPtr driver =3D priv->driver; g_autofree char *configFile =3D NULL; - int ret =3D -1; =20 if (!(configFile =3D virFileBuildPath(priv->libDir, name, ".base64"))) return -1; @@ -6341,15 +6308,13 @@ qemuProcessSEVCreateFile(virDomainObjPtr vm, if (virFileRewriteStr(configFile, S_IRUSR | S_IWUSR, data) < 0) { virReportSystemError(errno, _("failed to write data to config '%s'= "), configFile); - goto cleanup; + return -1; } =20 if (qemuSecurityDomainSetPathLabel(driver, vm, configFile, true) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -6476,17 +6441,16 @@ qemuProcessPrepareHost(virQEMUDriverPtr driver, virDomainObjPtr vm, unsigned int flags) { - int ret =3D -1; unsigned int hostdev_flags =3D 0; qemuDomainObjPrivatePtr priv =3D vm->privateData; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 if (qemuPrepareNVRAM(cfg, vm) < 0) - goto cleanup; + return -1; =20 if (vm->def->vsock) { if (qemuProcessOpenVhostVsock(vm->def->vsock) < 0) - goto cleanup; + return -1; } /* network devices must be "prepared" before hostdevs, because * setting up a network device might create a new hostdev that @@ -6494,7 +6458,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"); @@ -6504,17 +6468,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 */ @@ -6525,14 +6489,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 && @@ -6540,7 +6504,7 @@ qemuProcessPrepareHost(virQEMUDriverPtr driver, virReportSystemError(errno, _("Cannot remove stale PID file %s"), priv->pidfile); - goto cleanup; + return -1; } =20 /* @@ -6549,26 +6513,24 @@ qemuProcessPrepareHost(virQEMUDriverPtr driver, */ if (qemuProcessMakeDir(driver, vm, priv->libDir) < 0 || qemuProcessMakeDir(driver, vm, priv->channelTargetDir) < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("Write domain masterKey"); if (qemuDomainWriteMasterKeyFile(driver, vm) < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("Preparing disks (host)"); if (qemuProcessPrepareHostStorage(driver, vm, flags) < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("Preparing external devices"); if (qemuExtDevicesPrepareHost(driver, vm) < 0) - goto cleanup; + return -1; =20 if (qemuProcessPrepareSEVGuestInput(vm) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -7044,7 +7006,6 @@ qemuProcessFinishStartup(virQEMUDriverPtr driver, bool startCPUs, virDomainPausedReason pausedReason) { - int ret =3D -1; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 if (startCPUs) { @@ -7055,7 +7016,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); @@ -7063,17 +7024,14 @@ qemuProcessFinishStartup(virQEMUDriverPtr driver, =20 VIR_DEBUG("Writing domain status to disk"); if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) - goto cleanup; + return -1; =20 if (qemuProcessStartHook(driver, vm, VIR_HOOK_QEMU_OP_STARTED, VIR_HOOK_SUBOP_BEGIN) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon Apr 29 05:02:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1576876703; cv=none; d=zohomail.com; s=zohoarc; b=G8sj96jwkZXfzLRqWND84KW+rieR8LU2+yDI+5oxpDCS+oMyzoxrXklxePJSlhnHNvrPQmx3iGP4Efsxv2nAzhBE/xCL52Rrpy1TvfecMgRzTCmxfh4eGhvvdDJVJqAcBAaEnuAxECKNzSMaiMZpf7Zqq8A3CaoYjdYS86m5ENo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576876703; 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=eJQxrJXs9Dwi6pDGoTDVDUJfUSDszI910Lst3zkuzaw=; b=ByHEskvogLUdsYCRFjhQrgsi3guK15/XYIBGDtAxoqv21J6b7G1X1XOr4v2efu0su/kNxMP3DpNLE4gIsUaqh8S25IOeFcKLGFLpGcYDknk9k64Novlu2a54I4qFEAMV37WIFtAu82hPXyjagjSI7ySzvYGNg3V3fKUg8OM8u94= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 157687670342814.440877827424174; Fri, 20 Dec 2019 13:18:23 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-370-qqPrAhREOuKZ6K0M0Q3CmQ-1; Fri, 20 Dec 2019 16:18:20 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 82B8891221; Fri, 20 Dec 2019 21:18:15 +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 5497360576; Fri, 20 Dec 2019 21:18:15 +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 0CFCC180CB3B; Fri, 20 Dec 2019 21:18:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xBKLGps0013649 for ; Fri, 20 Dec 2019 16:16:51 -0500 Received: by smtp.corp.redhat.com (Postfix) id A7FEE17043C; Fri, 20 Dec 2019 21:16:51 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A341B170425 for ; Fri, 20 Dec 2019 21:16:51 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 83A21803864 for ; Fri, 20 Dec 2019 21:16:51 +0000 (UTC) Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-319-m_uHwbaEM9e26P1LigInKA-1; Fri, 20 Dec 2019 16:16:49 -0500 Received: by mail-qt1-f193.google.com with SMTP id k40so9391622qtk.8; Fri, 20 Dec 2019 13:16:49 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:2968:dc54:84c2:3c64:baf7]) by smtp.gmail.com with ESMTPSA id j15sm3377717qtn.37.2019.12.20.13.16.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Dec 2019 13:16:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576876702; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=eJQxrJXs9Dwi6pDGoTDVDUJfUSDszI910Lst3zkuzaw=; b=K3FrY46+Q7On+WBCsKkyYqJLFUzgeDrGVtzy2RTP8VKs+Cg3V8OrLfvu8ah3MGzYABiuLX bT9+GbKM+ypc88vzLGH9/Bg9EFo0OytKMj9SjYZ5GqMCS+QCjqHi27ZhSZBidpiJRGIEgn iFgBBuYTfbTRSQG16437eGKzaWdT2Lk= 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=QFneJmiZTI7ywk1j0/7FHNJnVSDPGe3w6BtCE7G622s=; b=UQo+rZ1FaIXwsV8TRhKM2WS0WB00BJRCnHs/a3IJsKeN7UeHAIns0DLYWZ94p/ffrF 0tus0zp0vtC+2qpxSezTp3TWFyhyusGzBYi2ZR0QPojDqaWHcPAMJtCdhA5p7lvtC6Kf TjMqK0XpHzS/mcc8rUe7X/t2OC9gfqzMgl+ZKdQfkC0T/DIIhBGC9P1vdVL4ZCI6qZKS qnI0RM2fvKHG80sxDuB6jA2KxQnjbhcfH1O+kvye1NEtjr6LIuacu4rXAfNe5kRkCU2A YkZh68DXgR2ckxU1MzfnZUkAy2HadQQCbDkbmC9HVh6gxmKgcKh1dhkwNybQLa05Y0mD jP0Q== X-Gm-Message-State: APjAAAU+63N1a6SVlWc0xinnmKsQu963JGQXfw/Ku4wUYV4qt6y2/FLX IOZvrleSuBlMgnqQ9gPs3+Ep3uVq X-Google-Smtp-Source: APXvYqxbr+8XBbit5e6+btz5ii4Qt3rq8V9vZOzE8x61MhZoNjyP6rNUskYjHIY8Vh69FZ2L3nHljw== X-Received: by 2002:ac8:3364:: with SMTP id u33mr13630380qta.267.1576876609044; Fri, 20 Dec 2019 13:16:49 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Fri, 20 Dec 2019 18:16:32 -0300 Message-Id: <20191220211632.700239-6-danielhb413@gmail.com> In-Reply-To: <20191220211632.700239-1-danielhb413@gmail.com> References: <20191220211632.700239-1-danielhb413@gmail.com> MIME-Version: 1.0 X-MC-Unique: m_uHwbaEM9e26P1LigInKA-1 X-MC-Unique: qqPrAhREOuKZ6K0M0Q3CmQ-1 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id xBKLGps0013649 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , crobinso@redhat.com Subject: [libvirt] [PATCH v5 5/5] qemu_process.c: remove 'cleanup' label from qemuProcessCreatePretendCmd() 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: , 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-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The 'cleanup' flag is doing no cleaup in this function. We can remove it and return NULL on error or qemuBuildCommandLine(). Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_process.c | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 0243adfb05..54e13723c1 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7148,11 +7148,9 @@ qemuProcessCreatePretendCmd(virQEMUDriverPtr driver, bool standalone, unsigned int flags) { - virCommandPtr cmd =3D NULL; - - virCheckFlagsGoto(VIR_QEMU_PROCESS_START_COLD | - VIR_QEMU_PROCESS_START_PAUSED | - VIR_QEMU_PROCESS_START_AUTODESTROY, cleanup); + virCheckFlags(VIR_QEMU_PROCESS_START_COLD | + VIR_QEMU_PROCESS_START_PAUSED | + VIR_QEMU_PROCESS_START_AUTODESTROY, NULL); =20 flags |=3D VIR_QEMU_PROCESS_START_PRETEND; flags |=3D VIR_QEMU_PROCESS_START_NEW; @@ -7161,26 +7159,23 @@ qemuProcessCreatePretendCmd(virQEMUDriverPtr driver, =20 if (qemuProcessInit(driver, vm, NULL, QEMU_ASYNC_JOB_NONE, !!migrateURI, flags) < 0) - goto cleanup; + return NULL; =20 if (qemuProcessPrepareDomain(driver, vm, flags) < 0) - goto cleanup; + return NULL; =20 VIR_DEBUG("Building emulator command line"); - cmd =3D qemuBuildCommandLine(driver, - NULL, - driver->securityManager, - vm, - migrateURI, - NULL, - VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, - standalone, - enableFips, - NULL, - NULL); - - cleanup: - return cmd; + return qemuBuildCommandLine(driver, + NULL, + driver->securityManager, + vm, + migrateURI, + NULL, + VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, + standalone, + enableFips, + NULL, + NULL); } =20 =20 --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list