From nobody Thu May 9 02:14:23 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=1571170732; cv=none; d=zoho.com; s=zohoarc; b=huWgxJYlaB56je/Iho8m/UgSTqp7EQ3P79MhTZyNKo2ANujzYevoh5jM4EeH7DXN1/uqJLYfSsK9js+umpjtIZBsXeirtdvR+/vdRHYP8DGPEp1ktunWzunPtFj0zlQ+IAmrNTsRDcvo9EoxnboY2I/AGXKnlIEVc7cH6go1mFE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571170732; 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=rLGfaImCVspA/Vr7N2gmRVnihoRETtKtHHSYgf8Hybo=; b=R32B1eh8HhB7y8uOj7LQIBPiaTq6RrYeefXMZEomG2cvw28oQL5mJrUP5aljq3E6owndDFvQf4dQslVWi2pfv1t8fj/ZF5Ohc93ID5mtmLuIgeV00pncAZVPYZaN2B6drLES4F13b0IgjO+uXaD12qK1KrZCtr7QKH9YrRF49YQ= 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 1571170732621446.57290662402147; Tue, 15 Oct 2019 13:18:52 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0354410C093C; Tue, 15 Oct 2019 20:18:49 +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 700CD60C5D; Tue, 15 Oct 2019 20:18:49 +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 740E018005A0; Tue, 15 Oct 2019 20:18:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9FK98eo010223 for ; Tue, 15 Oct 2019 16:09:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id A929460468; Tue, 15 Oct 2019 20:09:08 +0000 (UTC) Received: from mx1.redhat.com (ext-mx13.extmail.prod.ext.phx2.redhat.com [10.5.110.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3812060166; Tue, 15 Oct 2019 20:09:06 +0000 (UTC) Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EEA9D3082135; Tue, 15 Oct 2019 20:09:03 +0000 (UTC) Received: by mail-qk1-f194.google.com with SMTP id q203so20456350qke.1; Tue, 15 Oct 2019 13:09:03 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c7:d25e:a983:2b3:2523:a41]) by smtp.gmail.com with ESMTPSA id t199sm10089455qke.36.2019.10.15.13.09.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2019 13:09:02 -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=TCLvkFF7iEtOh8Pj4x+/1V8tYwN23LWbHKNweTKHxhw=; b=YB7l3+k0BI31TkOoKmJ02Jqu9sxCddQRAax6OUFqDEi0FypCGUe6dRsgYxwX89qrqY 2eIjUMaLSs4nmWZ3xA6Ix4OD1kL9mHYBEoy0uBgD3tt0f+B3ETeyUyuWK8h3e5G4pca4 fNSrUdDp8e69JhJ2L8PK0Q3VOBzd5xZDGoJ13GVjCkKNzUP10YodNORNLiOO9tQpceGn FlmsbR97Ub8Nt1xfo7EYR1MSncHMUa3xt0cCYwqPTfw02LZf7QsspxUN3PQEU71XD2oA Oft1OJEjUy71q4rgLSpOqhTE5Dul2kAj4fUhI8CfDJpzMGKDIqLZ94aBSCAlxWS53dcp FeSA== 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=TCLvkFF7iEtOh8Pj4x+/1V8tYwN23LWbHKNweTKHxhw=; b=MSQoxfuwEwAvig+bn6zy7Nhdq+Qz+K0jL/DFY7SOsEOW+T6WUXWzOO9AFyu6E9KRBm SxFole2spUD9upVzdZJQHbGAu7eg87rKUlFmN5ziHJbKBRl0pvK/Kn7neNseRQxmB7VU 8NjAcSkFbzS6jX03wMD9FuUEA08TRljKnLrrzjWc5SFyFdVsYy6Yr0TN8Lyt3qAx6Wve NqpPzmgmm8NX6kH+IaMK/G7GHVlOA+eRBjjppQXO6Nn7LVbt9rzxAFe2EujWwUlt9BQ+ pxhmlIMZ21+UfJ6JLgW0TSe3JCJHjf8Wl9xEfCtZ6jkJXbTjvW2xTZGC/t49tBPirBaa gy1Q== X-Gm-Message-State: APjAAAU2lSe7076PEh/e5e2mVwX0jD4psOdQWRSG8lQpnUXvVqwygvfg BsI8sXjK1l/cldWqbAZb9DsqfXyZ X-Google-Smtp-Source: APXvYqxWo0l88xbzzBornY8WJZkFDz4FjkJzf039yhXquFBPMunrSqFcUmMo6MjkpPLwcGVn+b8qQw== X-Received: by 2002:a05:620a:6cb:: with SMTP id 11mr36537058qky.123.1571170142822; Tue, 15 Oct 2019 13:09:02 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Tue, 15 Oct 2019 17:08:43 -0300 Message-Id: <20191015200852.15778-2-danielhb413@gmail.com> In-Reply-To: <20191015200852.15778-1-danielhb413@gmail.com> References: <20191015200852.15778-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.42]); Tue, 15 Oct 2019 20:09:04 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Tue, 15 Oct 2019 20:09:04 +0000 (UTC) for IP:'209.85.222.194' DOMAIN:'mail-qk1-f194.google.com' HELO:'mail-qk1-f194.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.194 mail-qk1-f194.google.com 209.85.222.194 mail-qk1-f194.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.42 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , eskultet@redhat.com Subject: [libvirt] [PATCH v3 01/10] qemu_driver: use VIR_AUTOUNREF() with virQEMUDriverConfigPtr 1/3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.66]); Tue, 15 Oct 2019 20:18:50 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" virQEMUDriverConfigPtr can be auto-unref for the great majority of the uses made in qemu_driver, sparing us a virObjectUnref() call and sometimes a whole 'cleanup' label. This patch changes virQEMUDriverConfigPtr declarations to use VIR_AUTOUNREF(). 'cleanup' labels were deleted when applicable. Since there are a lot of references to change, let's do it in 3 steps. Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_driver.c | 94 +++++++++++++----------------------------- 1 file changed, 29 insertions(+), 65 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6ce6348593..1bd9609761 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -202,7 +202,7 @@ qemuAutostartDomain(virDomainObjPtr vm, { virQEMUDriverPtr driver =3D opaque; int flags =3D 0; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); int ret =3D -1; =20 if (cfg->autoStartBypassCache) @@ -234,7 +234,6 @@ qemuAutostartDomain(virDomainObjPtr vm, ret =3D 0; cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -308,7 +307,7 @@ qemuSecurityInit(virQEMUDriverPtr driver) char **names; virSecurityManagerPtr mgr =3D NULL; virSecurityManagerPtr stack =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); unsigned int flags =3D 0; =20 if (cfg->securityDefaultConfined) @@ -368,7 +367,6 @@ qemuSecurityInit(virQEMUDriverPtr driver) } =20 driver->securityManager =3D stack; - virObjectUnref(cfg); return 0; =20 error: @@ -376,7 +374,6 @@ qemuSecurityInit(virQEMUDriverPtr driver) _("Failed to initialize security drivers")); virObjectUnref(stack); virObjectUnref(mgr); - virObjectUnref(cfg); return -1; } =20 @@ -1074,7 +1071,7 @@ static void qemuNotifyLoadDomain(virDomainObjPtr vm, = int newVM, void *opaque) static int qemuStateReload(void) { - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; virCapsPtr caps =3D NULL; =20 if (!qemu_driver) @@ -1090,7 +1087,6 @@ qemuStateReload(void) caps, qemu_driver->xmlopt, qemuNotifyLoadDomain, qemu_driver); cleanup: - virObjectUnref(cfg); virObjectUnref(caps); return 0; } @@ -1112,7 +1108,7 @@ qemuStateStop(void) int state; virDomainPtr *domains =3D NULL; unsigned int *flags =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(qemu_driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(q= emu_driver); =20 if (!(conn =3D virConnectOpen(cfg->uri))) goto cleanup; @@ -1151,7 +1147,6 @@ qemuStateStop(void) } VIR_FREE(flags); virObjectUnref(conn); - virObjectUnref(cfg); =20 return ret; } @@ -1209,20 +1204,16 @@ qemuStateCleanup(void) static int qemuConnectURIProbe(char **uri) { - virQEMUDriverConfigPtr cfg =3D NULL; - int ret =3D -1; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; =20 if (qemu_driver =3D=3D NULL) return 0; =20 cfg =3D virQEMUDriverGetConfig(qemu_driver); if (VIR_STRDUP(*uri, cfg->uri) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - virObjectUnref(cfg); - return ret; + return 0; } =20 static virDrvOpenStatus qemuConnectOpen(virConnectPtr conn, @@ -1887,7 +1878,7 @@ static int qemuDomainSuspend(virDomainPtr dom) qemuDomainObjPrivatePtr priv; virDomainPausedReason reason; int state; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; =20 if (!(vm =3D qemuDomainObjFromDomain(dom))) return -1; @@ -1930,7 +1921,6 @@ static int qemuDomainSuspend(virDomainPtr dom) cleanup: virDomainObjEndAPI(&vm); =20 - virObjectUnref(cfg); return ret; } =20 @@ -1942,7 +1932,7 @@ static int qemuDomainResume(virDomainPtr dom) int ret =3D -1; int state; int reason; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; =20 if (!(vm =3D qemuDomainObjFromDomain(dom))) return -1; @@ -1988,7 +1978,6 @@ static int qemuDomainResume(virDomainPtr dom) =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -2369,7 +2358,7 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom,= unsigned long newmem, virDomainDefPtr def; virDomainDefPtr persistentDef; int ret =3D -1, r; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG | @@ -2474,7 +2463,6 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom,= unsigned long newmem, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -2497,7 +2485,7 @@ static int qemuDomainSetMemoryStatsPeriod(virDomainPt= r dom, int period, virDomainDefPtr def; virDomainDefPtr persistentDef; int ret =3D -1, r; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); @@ -2560,7 +2548,6 @@ static int qemuDomainSetMemoryStatsPeriod(virDomainPt= r dom, int period, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -3072,27 +3059,21 @@ qemuOpenFile(virQEMUDriverPtr driver, int oflags, bool *needUnlink) { - int ret =3D -1; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); uid_t user =3D cfg->user; gid_t group =3D cfg->group; bool dynamicOwnership =3D cfg->dynamicOwnership; virSecurityLabelDefPtr seclabel; =20 - virObjectUnref(cfg); - /* TODO: Take imagelabel into account? */ if (vm && (seclabel =3D virDomainDefGetSecurityLabelDef(vm->def, "dac")) != =3D NULL && seclabel->label !=3D NULL && (virParseOwnershipIds(seclabel->label, &user, &group) < 0)) - goto cleanup; - - ret =3D qemuOpenFileAs(user, group, dynamicOwnership, - path, oflags, needUnlink); + return -1; =20 - cleanup: - return ret; + return qemuOpenFileAs(user, group, dynamicOwnership, + path, oflags, needUnlink); } =20 static int @@ -3257,7 +3238,7 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, unsigned int flags, qemuDomainAsyncJob asyncJob) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); bool needUnlink =3D false; int ret =3D -1; int fd =3D -1; @@ -3320,7 +3301,6 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, if (qemuFileWrapperFDClose(vm, wrapperFd) < 0) ret =3D -1; virFileWrapperFdFree(wrapperFd); - virObjectUnref(cfg); =20 if (ret < 0 && needUnlink) unlink(path); @@ -3548,7 +3528,7 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *pat= h, const char *dxml, char *compressedpath =3D NULL; int ret =3D -1; virDomainObjPtr vm =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; =20 virCheckFlags(VIR_DOMAIN_SAVE_BYPASS_CACHE | VIR_DOMAIN_SAVE_RUNNING | @@ -3575,7 +3555,6 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *pat= h, const char *dxml, cleanup: virDomainObjEndAPI(&vm); VIR_FREE(compressedpath); - virObjectUnref(cfg); return ret; } =20 @@ -3589,14 +3568,11 @@ static char * qemuDomainManagedSavePath(virQEMUDriverPtr driver, virDomainObjPtr vm) { char *ret; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); =20 - if (virAsprintf(&ret, "%s/%s.save", cfg->saveDir, vm->def->name) < 0) { - virObjectUnref(cfg); + if (virAsprintf(&ret, "%s/%s.save", cfg->saveDir, vm->def->name) < 0) return NULL; - } =20 - virObjectUnref(cfg); return ret; } =20 @@ -3604,7 +3580,7 @@ static int qemuDomainManagedSave(virDomainPtr dom, unsigned int flags) { virQEMUDriverPtr driver =3D dom->conn->privateData; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; int compressed; char *compressedpath =3D NULL; virDomainObjPtr vm; @@ -3650,7 +3626,6 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int = flags) virDomainObjEndAPI(&vm); VIR_FREE(name); VIR_FREE(compressedpath); - virObjectUnref(cfg); =20 return ret; } @@ -3848,7 +3823,7 @@ doCoreDump(virQEMUDriverPtr driver, int directFlag =3D 0; unsigned int flags =3D VIR_FILE_WRAPPER_NON_BLOCKING; const char *memory_dump_format =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); char *compressedpath =3D NULL; =20 /* We reuse "save" flag for "dump" here. Then, we can support the same @@ -3930,7 +3905,6 @@ doCoreDump(virQEMUDriverPtr driver, if (ret !=3D 0) unlink(path); VIR_FREE(compressedpath); - virObjectUnref(cfg); return ret; } =20 @@ -4062,7 +4036,7 @@ qemuDomainScreenshot(virDomainPtr dom, const char *videoAlias =3D NULL; char *ret =3D NULL; bool unlink_tmp =3D false; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; =20 virCheckFlags(0, NULL); =20 @@ -4154,7 +4128,6 @@ qemuDomainScreenshot(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -4167,7 +4140,7 @@ getAutoDumpPath(virQEMUDriverPtr driver, char timestr[100]; struct tm time_info; time_t curtime =3D time(NULL); - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; =20 if (!domname) return NULL; @@ -4182,7 +4155,6 @@ getAutoDumpPath(virQEMUDriverPtr driver, domname, timestr)); =20 - virObjectUnref(cfg); VIR_FREE(domname); return dumpfile; } @@ -4193,7 +4165,7 @@ processWatchdogEvent(virQEMUDriverPtr driver, int action) { int ret; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); char *dumpfile =3D getAutoDumpPath(driver, vm); unsigned int flags =3D VIR_DUMP_MEMORY_ONLY; =20 @@ -4234,7 +4206,6 @@ processWatchdogEvent(virQEMUDriverPtr driver, qemuDomainObjEndAsyncJob(driver, vm); =20 cleanup: - virObjectUnref(cfg); VIR_FREE(dumpfile); } =20 @@ -4244,7 +4215,7 @@ doCoreDumpToAutoDumpPath(virQEMUDriverPtr driver, unsigned int flags) { int ret =3D -1; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); char *dumpfile =3D getAutoDumpPath(driver, vm); =20 if (!dumpfile) @@ -4257,7 +4228,6 @@ doCoreDumpToAutoDumpPath(virQEMUDriverPtr driver, "%s", _("Dump failed")); cleanup: VIR_FREE(dumpfile); - virObjectUnref(cfg); return ret; } =20 @@ -4286,13 +4256,13 @@ processGuestPanicEvent(virQEMUDriverPtr driver, { qemuDomainObjPrivatePtr priv =3D vm->privateData; virObjectEventPtr event =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); bool removeInactive =3D false; unsigned long flags =3D VIR_DUMP_MEMORY_ONLY; =20 if (qemuDomainObjBeginAsyncJob(driver, vm, QEMU_ASYNC_JOB_DUMP, VIR_DOMAIN_JOB_OPERATION_DUMP, flags) <= 0) - goto cleanup; + return; =20 if (!virDomainObjIsActive(vm)) { VIR_DEBUG("Ignoring GUEST_PANICKED event from inactive domain %s", @@ -4359,9 +4329,6 @@ processGuestPanicEvent(virQEMUDriverPtr driver, qemuDomainObjEndAsyncJob(driver, vm); if (removeInactive) qemuDomainRemoveInactiveJob(driver, vm); - - cleanup: - virObjectUnref(cfg); } =20 =20 @@ -4370,14 +4337,14 @@ processDeviceDeletedEvent(virQEMUDriverPtr driver, virDomainObjPtr vm, const char *devAlias) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); virDomainDeviceDef dev; =20 VIR_DEBUG("Removing device %s from domain %p %s", devAlias, vm, vm->def->name); =20 if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; + return; =20 if (!virDomainObjIsActive(vm)) { VIR_DEBUG("Domain is not running"); @@ -4400,9 +4367,6 @@ processDeviceDeletedEvent(virQEMUDriverPtr driver, =20 endjob: qemuDomainObjEndJob(driver, vm); - - cleanup: - virObjectUnref(cfg); } =20 =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 9 02:14:23 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=1571170739; cv=none; d=zoho.com; s=zohoarc; b=O/0XRC90AFxa2uDGRnpwv3frFoeWshqu77e2dCoLGY5JQWm8XDBv/UKjRW0aFjTGK2Ttma0VVY/EHvCI7ZP7IAel7Ncm+b0i/85WZyzwzEJ+XCdyiRywzrnkCobmJBjUy05KaJ9GrMPve3TnmNYX9pQJzg4XtYC5lzR2vOugcbY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571170739; 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=YPMOj7RaHXXEQcVxU9t8XY4J1q8g8zb5wzREPaAAbzM=; b=m/AOUr8dRuwX8g+sj+ubv5YHOQpahj/It+zFBlNRigjrpEoYtyF3EqrKGFjaE+2uUJFVrCvFBtikDrjmX/HmbjT0mEmVCMdWv4kWKY9Ltz5aTYIIjl/2A0QUAnEtISWwoA9zI+1KCSYraMLdFATW11j2Ks9w9ARHG3dasmZnodQ= 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 15711707393757.162263432613031; Tue, 15 Oct 2019 13:18:59 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4FFD018CB915; Tue, 15 Oct 2019 20:18:57 +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 1CA005C290; Tue, 15 Oct 2019 20:18:57 +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 CD1C683542; Tue, 15 Oct 2019 20:18:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9FK9Eaj010265 for ; Tue, 15 Oct 2019 16:09:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id E04F2100EBD6; Tue, 15 Oct 2019 20:09:14 +0000 (UTC) Received: from mx1.redhat.com (ext-mx29.extmail.prod.ext.phx2.redhat.com [10.5.110.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2787F1001925; Tue, 15 Oct 2019 20:09:07 +0000 (UTC) Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) (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 4D2551801EFD; Tue, 15 Oct 2019 20:09:06 +0000 (UTC) Received: by mail-qk1-f176.google.com with SMTP id z67so20421983qkb.12; Tue, 15 Oct 2019 13:09:06 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c7:d25e:a983:2b3:2523:a41]) by smtp.gmail.com with ESMTPSA id t199sm10089455qke.36.2019.10.15.13.09.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2019 13:09:04 -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=AfWtVRnJ3c085cU1aiIxpG3FrPkZEzEYYBiB11x4Z9U=; b=JNCNaTgSwMyfBiWz5Jz3+UusLWntx93S8jXnRyvuFeUupEuluJtTpwir26K78H21i/ PSIcTZQyM8PYzpDgRtdb5YER6lRbyqiKW4o45YJ3epgSyY1XAF65vpAk5o6ZP5XzJf9Q EoxSiJN+b2M/kMFkNe+KGmbU3mosYp3XKQ/fbUfRHg5HDg9jjkE+0CVpUwl8s03JRVNc yx0jS1HTORE9kA5Gex2708YyqlllRytTmCBvb2b1MRdYiuIQVO6EhZaAmr6TCZMnfH3c RlZej3gzwCT7zVqTw6usE3uCZyfCBPSid04vvROZHv6zlYGf46BUrQpzG8lhXIFBU6ER wX8Q== 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=AfWtVRnJ3c085cU1aiIxpG3FrPkZEzEYYBiB11x4Z9U=; b=dEnsFTOrWQ4LcqRkOpgEa/lvVSaMb7Cn05hqrpblSwe/nX7aEfrE1A4fTGhBpcEOI1 TLu6AzPPyiiDUmvDSwDKlFdsRRbxQqkitBeTelXzjq5c37Fi2fK1hXSJhinG+2rM0MgK CKXk9oQiVh5H/XPb+QZPO48OWGGTkf8M32Z9tndFrYRU0XlAeNN1rOxk1Ccg4fKW8skP Rebsd3gEuRGu8+hrq1DDSwxK6+cqkWYh312eS0c6EAbAvKuJyKlEi73/5jjyZYUxsu9H bYHdv+pLjmDLunRvXgHxVRTki/WHtfBqUbUosQLvr/kCCtWwjiPlwPETkP1lR4SShefg UwEw== X-Gm-Message-State: APjAAAW117BT/DJVKnPqBVaLGerYuOfQyG6u061YjBzgv5silxH7hNfu gZj/LTTt/OZ728d7p9rSQLqECLnb X-Google-Smtp-Source: APXvYqzprQg18X1tjbXY5CRhRCKLLcqO0DJLrUu7Mn5XTUotKbrHAZLFkhftSP7nq8whguz9TBsMEw== X-Received: by 2002:a37:7dc7:: with SMTP id y190mr37780127qkc.244.1571170144941; Tue, 15 Oct 2019 13:09:04 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Tue, 15 Oct 2019 17:08:44 -0300 Message-Id: <20191015200852.15778-3-danielhb413@gmail.com> In-Reply-To: <20191015200852.15778-1-danielhb413@gmail.com> References: <20191015200852.15778-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.70]); Tue, 15 Oct 2019 20:09:06 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]); Tue, 15 Oct 2019 20:09:06 +0000 (UTC) for IP:'209.85.222.176' DOMAIN:'mail-qk1-f176.google.com' HELO:'mail-qk1-f176.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.176 mail-qk1-f176.google.com 209.85.222.176 mail-qk1-f176.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.70 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , eskultet@redhat.com Subject: [libvirt] [PATCH v3 02/10] qemu_driver: use VIR_AUTOUNREF() with virQEMUDriverConfigPtr 2/3 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.63]); Tue, 15 Oct 2019 20:18:57 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" virQEMUDriverConfigPtr can be auto-unref for the great majority of the uses made in qemu_driver, sparing us a virObjectUnref() call and sometimes a whole 'cleanup' label. This patch changes virQEMUDriverConfigPtr declarations to use VIR_AUTOUNREF(). 'cleanup' labels were deleted when applicable. Since there are a lot of references to change, let's do it in 3 steps. This is step 2. Note: there is a g_autofree GLib macro being used in qemuDomainUndefineFlags. In this particular instance we're using g_autoptr() instead of VIR_AUTOUNREF() to not mix-up VIR_* and GLib macros in that method. Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_driver.c | 81 ++++++++++++++---------------------------- 1 file changed, 26 insertions(+), 55 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1bd9609761..9f9443f493 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4571,7 +4571,7 @@ processNicRxFilterChangedEvent(virQEMUDriverPtr drive= r, virDomainObjPtr vm, const char *devAlias) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); qemuDomainObjPrivatePtr priv =3D vm->privateData; virDomainDeviceDef dev; virDomainNetDefPtr def; @@ -4670,7 +4670,6 @@ processNicRxFilterChangedEvent(virQEMUDriverPtr drive= r, cleanup: virNetDevRxFilterFree(hostFilter); virNetDevRxFilterFree(guestFilter); - virObjectUnref(cfg); } =20 =20 @@ -4680,7 +4679,7 @@ processSerialChangedEvent(virQEMUDriverPtr driver, const char *devAlias, bool connected) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); virDomainChrDeviceState newstate; virObjectEventPtr event =3D NULL; virDomainDeviceDef dev; @@ -4713,7 +4712,7 @@ processSerialChangedEvent(virQEMUDriverPtr driver, } =20 if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; + return; =20 if (!virDomainObjIsActive(vm)) { VIR_DEBUG("Domain is not running"); @@ -4754,9 +4753,6 @@ processSerialChangedEvent(virQEMUDriverPtr driver, =20 endjob: qemuDomainObjEndJob(driver, vm); - - cleanup: - virObjectUnref(cfg); } =20 =20 @@ -5029,21 +5025,20 @@ qemuDomainSetVcpusMax(virQEMUDriverPtr driver, virDomainDefPtr persistentDef, unsigned int nvcpus) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); unsigned int topologycpus; - int ret =3D -1; =20 if (def) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("maximum vcpu count of a live domain can't be mod= ified")); - goto cleanup; + return -1; } =20 if (virDomainNumaGetCPUCountTotal(persistentDef->numa) > nvcpus) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("Number of CPUs in exceeds the desired " "maximum vcpu count")); - goto cleanup; + return -1; } =20 if (virDomainDefGetVcpusTopology(persistentDef, &topologycpus) =3D=3D = 0 && @@ -5052,23 +5047,19 @@ qemuDomainSetVcpusMax(virQEMUDriverPtr driver, * setting may be corrected via this API */ virReportError(VIR_ERR_INVALID_ARG, "%s", _("CPU topology doesn't match the desired vcpu coun= t")); - goto cleanup; + return -1; } =20 /* ordering information may become invalid, thus clear it */ virDomainDefVcpuOrderClear(persistentDef); =20 if (virDomainDefSetVcpusMax(persistentDef, nvcpus, driver->xmlopt) < 0) - goto cleanup; + return -1; =20 if (virDomainSaveConfig(cfg->configDir, driver->caps, persistentDef) <= 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - virObjectUnref(cfg); - return ret; + return 0; } =20 =20 @@ -5233,7 +5224,7 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, int ret =3D -1; virBitmapPtr pcpumap =3D NULL; virDomainVcpuDefPtr vcpuinfo =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); @@ -5290,7 +5281,6 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, cleanup: virDomainObjEndAPI(&vm); virBitmapFree(pcpumap); - virObjectUnref(cfg); return ret; } =20 @@ -5353,7 +5343,7 @@ qemuDomainPinEmulator(virDomainPtr dom, int ret =3D -1; qemuDomainObjPrivatePtr priv; virBitmapPtr pcpumap =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; virObjectEventPtr event =3D NULL; char *str =3D NULL; virTypedParameterPtr eventParams =3D NULL; @@ -5447,7 +5437,6 @@ qemuDomainPinEmulator(virDomainPtr dom, VIR_FREE(str); virBitmapFree(pcpumap); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -5818,7 +5807,7 @@ qemuDomainPinIOThread(virDomainPtr dom, { int ret =3D -1; virQEMUDriverPtr driver =3D dom->conn->privateData; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; virDomainObjPtr vm; virDomainDefPtr def; virDomainDefPtr persistentDef; @@ -5942,7 +5931,6 @@ qemuDomainPinIOThread(virDomainPtr dom, VIR_FREE(str); virBitmapFree(pcpumap); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -6291,7 +6279,7 @@ qemuDomainChgIOThread(virQEMUDriverPtr driver, virDomainIOThreadAction action, unsigned int flags) { - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; qemuDomainObjPrivatePtr priv; virDomainDefPtr def; virDomainDefPtr persistentDef; @@ -6302,7 +6290,7 @@ qemuDomainChgIOThread(virQEMUDriverPtr driver, priv =3D vm->privateData; =20 if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; + return -1; =20 if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0) goto endjob; @@ -6390,8 +6378,6 @@ qemuDomainChgIOThread(virQEMUDriverPtr driver, endjob: qemuDomainObjEndJob(driver, vm); =20 - cleanup: - virObjectUnref(cfg); return ret; } =20 @@ -6902,7 +6888,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, int intermediatefd =3D -1; virCommandPtr cmd =3D NULL; char *errbuf =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); virQEMUSaveHeaderPtr header =3D &data->header; qemuDomainSaveCookiePtr cookie =3D NULL; =20 @@ -7024,7 +7010,6 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, VIR_FREE(errbuf); if (qemuSecurityRestoreSavedStateLabel(driver, vm, path) < 0) VIR_WARN("failed to restore save state label on %s", path); - virObjectUnref(cfg); return ret; } =20 @@ -7449,13 +7434,11 @@ static char *qemuConnectDomainXMLToNative(virConnec= tPtr conn, virCommandPtr cmd =3D NULL; char *ret =3D NULL; size_t i; - virQEMUDriverConfigPtr cfg; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); virCapsPtr caps =3D NULL; =20 virCheckFlags(0, NULL); =20 - cfg =3D virQEMUDriverGetConfig(driver); - if (virConnectDomainXMLToNativeEnsureACL(conn) < 0) goto cleanup; =20 @@ -7515,7 +7498,6 @@ static char *qemuConnectDomainXMLToNative(virConnectP= tr conn, virCommandFree(cmd); virObjectUnref(vm); virObjectUnref(caps); - virObjectUnref(cfg); return ret; } =20 @@ -7702,7 +7684,7 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, virDomainObjPtr vm =3D NULL; virDomainPtr dom =3D NULL; virObjectEventPtr event =3D NULL; - virQEMUDriverConfigPtr cfg; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); virCapsPtr caps =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_ABI_UPDATE; @@ -7712,8 +7694,6 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, if (flags & VIR_DOMAIN_DEFINE_VALIDATE) parse_flags |=3D VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; =20 - cfg =3D virQEMUDriverGetConfig(driver); - if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) goto cleanup; =20 @@ -7770,7 +7750,6 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(caps); - virObjectUnref(cfg); return dom; } =20 @@ -7791,7 +7770,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, int ret =3D -1; int nsnapshots; int ncheckpoints; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; g_autofree char *nvram_path =3D NULL; =20 virCheckFlags(VIR_DOMAIN_UNDEFINE_MANAGED_SAVE | @@ -7919,7 +7898,6 @@ qemuDomainUndefineFlags(virDomainPtr dom, VIR_FREE(name); virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(cfg); return ret; } =20 @@ -8739,7 +8717,7 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr v= m, { qemuDomainObjPrivatePtr priv =3D vm->privateData; virDomainDefPtr vmdef =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; virDomainDeviceDefPtr devConf =3D NULL; virDomainDeviceDefPtr devLive =3D NULL; int ret =3D -1; @@ -8824,7 +8802,6 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr v= m, virDomainDefFree(vmdef); virDomainDeviceDefFree(devConf); virDomainDeviceDefFree(devLive); - virObjectUnref(cfg); virObjectUnref(caps); =20 return ret; @@ -8885,7 +8862,7 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr d= om, virDomainDeviceDefPtr dev =3D NULL, dev_copy =3D NULL; bool force =3D (flags & VIR_DOMAIN_DEVICE_MODIFY_FORCE) !=3D 0; int ret =3D -1; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; virCapsPtr caps =3D NULL; unsigned int parse_flags =3D 0; =20 @@ -8986,7 +8963,6 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr d= om, virDomainDeviceDefFree(dev); virDomainObjEndAPI(&vm); virObjectUnref(caps); - virObjectUnref(cfg); virNWFilterUnlockFilterUpdates(); return ret; } @@ -8999,7 +8975,7 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriverPtr = driver, { qemuDomainObjPrivatePtr priv =3D vm->privateData; virCapsPtr caps =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; virDomainDeviceDefPtr dev =3D NULL, dev_copy =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE; virDomainDefPtr vmdef =3D NULL; @@ -9078,7 +9054,6 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriverPtr = driver, =20 cleanup: virObjectUnref(caps); - virObjectUnref(cfg); if (dev !=3D dev_copy) virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); @@ -9095,7 +9070,7 @@ qemuDomainDetachDeviceAliasLiveAndConfig(virQEMUDrive= rPtr driver, { qemuDomainObjPrivatePtr priv =3D vm->privateData; virCapsPtr caps =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; virDomainDefPtr def =3D NULL; virDomainDefPtr persistentDef =3D NULL; virDomainDefPtr vmdef =3D NULL; @@ -9156,7 +9131,6 @@ qemuDomainDetachDeviceAliasLiveAndConfig(virQEMUDrive= rPtr driver, ret =3D 0; cleanup: virDomainDefFree(vmdef); - virObjectUnref(cfg); virObjectUnref(caps); return ret; } @@ -9265,7 +9239,7 @@ static int qemuDomainSetAutostart(virDomainPtr dom, virDomainObjPtr vm; char *configFile =3D NULL, *autostartLink =3D NULL; int ret =3D -1; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; =20 if (!(vm =3D qemuDomainObjFromDomain(dom))) return -1; @@ -9330,7 +9304,6 @@ static int qemuDomainSetAutostart(virDomainPtr dom, VIR_FREE(configFile); VIR_FREE(autostartLink); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -9577,7 +9550,7 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, virDomainDefPtr def; virDomainDefPtr persistentDef; int ret =3D -1; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; qemuDomainObjPrivatePtr priv; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | @@ -9777,7 +9750,6 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -9889,7 +9861,7 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, bool set_swap_hard_limit =3D false; bool set_hard_limit =3D false; bool set_soft_limit =3D false; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; int rc; int ret =3D -1; qemuDomainObjPrivatePtr priv; @@ -10014,7 +9986,6 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 9 02:14:23 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=1571170858; cv=none; d=zoho.com; s=zohoarc; b=D3O+PfqF7C6dZbBZnAY+2WRln3PQcbhfjYkwozWWCz8EBg66mzNfcpHy71cTRdlmjeim6Tc6v6Y3EfGPuuh+dxBi1+YDcHm3UUeW0SclbzKbdT/WLZN7M0fQyIRuGN7gNuvTd9Nnnf8mXBXffhPdwMacEO5MMizg9MQmsLmA8lg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571170858; 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=furhcw60VhjaAAsp5rJ1V4tTZyIHPFiN/m+nI1NGJbI=; b=WqmaS0bHuO06SiC/T4jNs4u7cQcn8BG9ewMh0ogCTKcGasL9WZoEUMNE/SyCI7JQOHI3gof8k09i1algmjliMHJZ/gd98EhLnVqj4VZLgRNqWIihytaXD1ocVdx0hPaAIHNS/tflRvmVk+p3MZR7674Lrdhzp58TIBG5/GKAB14= 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 1571170858657646.1449637777112; Tue, 15 Oct 2019 13:20:58 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 293B9308A98C; Tue, 15 Oct 2019 20:20:57 +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 0132860A97; Tue, 15 Oct 2019 20:20:57 +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 B81A583541; Tue, 15 Oct 2019 20:20:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9FK987E010222 for ; Tue, 15 Oct 2019 16:09:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id A71035D6B7; Tue, 15 Oct 2019 20:09:08 +0000 (UTC) Received: from mx1.redhat.com (ext-mx14.extmail.prod.ext.phx2.redhat.com [10.5.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9BD3F5D6A9; Tue, 15 Oct 2019 20:09:08 +0000 (UTC) Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) (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 89ACF308FBB4; Tue, 15 Oct 2019 20:09:07 +0000 (UTC) Received: by mail-qt1-f193.google.com with SMTP id u40so32450796qth.11; Tue, 15 Oct 2019 13:09:07 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c7:d25e:a983:2b3:2523:a41]) by smtp.gmail.com with ESMTPSA id t199sm10089455qke.36.2019.10.15.13.09.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2019 13:09:06 -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=ki0MybjQikDviiQxrH3GmLjv/GGDII0q8stII1Xzydg=; b=UVsFVT2QxcX1A5PsoDiHaG56UtE93Cu0bMHFnfUrRqXYZwLeYEXwPO0iRTetUsVOeW 3pTdBZ/1uHXAI+2INQolL8Svp4hlW6ohWK+SH0zQxTqroBjFc8oj3Qo9417RhfrYSrrN L8U5Yiq4MeRQypyrwgHM9eMXmIKEXV8EBcXHmz6NRjmVwno0jL+n7NtYcd6UsfSTErE+ 3EH9XVdbQhI7e0DkAisVTQfeQSiQw2w2YN+oABu+UdJSwT8jvN/IUzKZ/Ftdn2lre9AS ijeYrdrNw6Pa4eJkygqnphS6FLHfMF7juLkD7l+fZJ0OE/4L21yG6gboCeRq4DuXzZij R/2g== 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=ki0MybjQikDviiQxrH3GmLjv/GGDII0q8stII1Xzydg=; b=idJXg/xd3B5PDjqQ8wO7KTeif4Rv9hh8wf6ZkUrpmVanliI65HOdVaHPZ+FKRkigp1 luhLapNqq1eqQd04jL0s3bYylDV/FtyFEAPm8zOhV0SSzTx4xSQ4JKb4vvwTFrPepHed zkslDoTYb+Gq+tZK+jx9mRv2+3CY0uP4nYK+NSgBo/iKK1b4maRCjsLHaywbLJrnNxbV bFbJ8ahDwdBQ9VDd5s+Ynk0G6c5nANbRC0TEgo1mBRgqJnFowv0biYVh32by8Z8hT5kZ Wz0TgibmjQ2/ovOKMhD8LJ4fiOrZZOYKzZ0TXD/Q6XINI9CqZSkQH8+YQMDv5Ipbkio5 CYrg== X-Gm-Message-State: APjAAAVo2yxojw0aPrWMJD4g0gCZGvC5C/ZunXHabIcKHgs3dZNAev1p 2mhvdPAP/miPRZrpq+d37LZEimcn X-Google-Smtp-Source: APXvYqzVNge0AVmAribkTTXXlgrGQfNf8TFM0oqEr9vuqQLWuYiIFY+/cj8MZAFt/NlUp9yGRw1ezQ== X-Received: by 2002:ac8:7099:: with SMTP id y25mr18438184qto.369.1571170146478; Tue, 15 Oct 2019 13:09:06 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Tue, 15 Oct 2019 17:08:45 -0300 Message-Id: <20191015200852.15778-4-danielhb413@gmail.com> In-Reply-To: <20191015200852.15778-1-danielhb413@gmail.com> References: <20191015200852.15778-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.43]); Tue, 15 Oct 2019 20:09:07 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 15 Oct 2019 20:09:07 +0000 (UTC) for IP:'209.85.160.193' DOMAIN:'mail-qt1-f193.google.com' HELO:'mail-qt1-f193.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.193 mail-qt1-f193.google.com 209.85.160.193 mail-qt1-f193.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.43 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , eskultet@redhat.com Subject: [libvirt] [PATCH v3 03/10] qemu_driver: use VIR_AUTOUNREF() with virQEMUDriverConfigPtr 3/3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Tue, 15 Oct 2019 20:20:57 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" virQEMUDriverConfigPtr can be auto-unref for the great majority of the uses made in qemu_driver, sparing us a virObjectUnref() call and sometimes a whole 'cleanup' label. This patch changes virQEMUDriverConfigPtr declarations to use VIR_AUTOUNREF(). 'cleanup' labels were deleted when applicable. This is the last part of this change. All but one* instance of virQEMUDriverConfigPtr were changed to use VIR_AUTOUNREF(). 'cleanup' labels were deleted when applicable. * qemuStateInitialize: we can't auto-unref the pointer since we're initializing the qemu_driver object with it. Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_driver.c | 51 ++++++++++++++---------------------------- 1 file changed, 17 insertions(+), 34 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9f9443f493..d9effd7f34 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10150,7 +10150,7 @@ qemuDomainSetNumaParameters(virDomainPtr dom, virDomainDefPtr persistentDef; virDomainObjPtr vm =3D NULL; int ret =3D -1; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; qemuDomainObjPrivatePtr priv; virBitmapPtr nodeset =3D NULL; virDomainNumatuneMemMode config_mode; @@ -10262,7 +10262,6 @@ qemuDomainSetNumaParameters(virDomainPtr dom, cleanup: virBitmapFree(nodeset); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -10367,7 +10366,7 @@ qemuDomainSetPerfEvents(virDomainPtr dom, virQEMUDriverPtr driver =3D dom->conn->privateData; size_t i; virDomainObjPtr vm =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; qemuDomainObjPrivatePtr priv; virDomainDefPtr def; virDomainDefPtr persistentDef; @@ -10459,7 +10458,6 @@ qemuDomainSetPerfEvents(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -10646,7 +10644,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr = dom, long long value_l; int ret =3D -1; int rc; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; virCapsPtr caps =3D NULL; qemuDomainObjPrivatePtr priv; virObjectEventPtr event =3D NULL; @@ -10940,7 +10938,6 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr = dom, if (eventNparams) virTypedParamsFree(eventParams, eventNparams); virObjectUnref(caps); - virObjectUnref(cfg); return ret; } #undef SCHED_RANGE_CHECK @@ -11605,7 +11602,7 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, int ret =3D -1; virDomainNetDefPtr net =3D NULL, persistentNet =3D NULL; virNetDevBandwidthPtr bandwidth =3D NULL, newBandwidth =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; bool inboundSpecified =3D false, outboundSpecified =3D false; int actualType; bool qosSupported =3D true; @@ -11800,7 +11797,6 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, virNetDevBandwidthFree(bandwidth); virNetDevBandwidthFree(newBandwidth); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -12062,7 +12058,7 @@ qemuDomainMemoryPeek(virDomainPtr dom, char *tmp =3D NULL; int fd =3D -1, ret =3D -1; qemuDomainObjPrivatePtr priv; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; =20 virCheckFlags(VIR_MEMORY_VIRTUAL | VIR_MEMORY_PHYSICAL, -1); =20 @@ -12133,7 +12129,6 @@ qemuDomainMemoryPeek(virDomainPtr dom, unlink(tmp); VIR_FREE(tmp); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -12350,7 +12345,7 @@ qemuDomainGetBlockInfo(virDomainPtr dom, virDomainObjPtr vm; int ret =3D -1; virDomainDiskDefPtr disk; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; qemuBlockStatsPtr entry =3D NULL; =20 virCheckFlags(0, -1); @@ -12439,7 +12434,6 @@ qemuDomainGetBlockInfo(virDomainPtr dom, cleanup: VIR_FREE(entry); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -12911,7 +12905,7 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, unsigned int flags) { virQEMUDriverPtr driver =3D dconn->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); virDomainDefPtr def =3D NULL; const char *dom_xml =3D NULL; const char *dname =3D NULL; @@ -12985,7 +12979,6 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, VIR_FREE(migrate_disks); VIR_FREE(origname); virDomainDefFree(def); - virObjectUnref(cfg); return ret; } =20 @@ -14709,7 +14702,7 @@ qemuDomainSnapshotCreateInactiveExternal(virQEMUDri= verPtr driver, virCommandPtr cmd =3D NULL; const char *qemuImgPath; virBitmapPtr created =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); int ret =3D -1; virBuffer buf =3D VIR_BUFFER_INITIALIZER; virDomainSnapshotDefPtr snapdef =3D virDomainSnapshotObjGetDef(snap); @@ -14797,7 +14790,6 @@ qemuDomainSnapshotCreateInactiveExternal(virQEMUDri= verPtr driver, } } virBitmapFree(created); - virObjectUnref(cfg); =20 return ret; } @@ -15899,7 +15891,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, unsigned int parse_flags =3D VIR_DOMAIN_SNAPSHOT_PARSE_DISKS; int align_location =3D VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL; bool align_match =3D true; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; virCapsPtr caps =3D NULL; qemuDomainObjPrivatePtr priv; virDomainSnapshotState state; @@ -16173,7 +16165,6 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, virDomainObjEndAPI(&vm); VIR_FREE(xml); virObjectUnref(caps); - virObjectUnref(cfg); return snapshot; } =20 @@ -16583,7 +16574,7 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr sna= pshot, int rc; virDomainDefPtr config =3D NULL; virDomainDefPtr inactiveConfig =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; virCapsPtr caps =3D NULL; bool was_stopped =3D false; qemuDomainSaveCookiePtr cookie; @@ -17002,7 +16993,6 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr sna= pshot, virObjectEventStateQueue(driver->domainEventState, event2); virDomainObjEndAPI(&vm); virObjectUnref(caps); - virObjectUnref(cfg); virNWFilterUnlockFilterUpdates(); virCPUDefFree(origCPU); virDomainDefFree(config); @@ -17063,7 +17053,7 @@ qemuDomainSnapshotDelete(virDomainSnapshotPtr snaps= hot, virQEMUMomentReparent rep; bool metadata_only =3D !!(flags & VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_= ONLY); int external =3D 0; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; =20 virCheckFlags(VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN | VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY | @@ -17155,7 +17145,6 @@ qemuDomainSnapshotDelete(virDomainSnapshotPtr snaps= hot, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -17735,7 +17724,7 @@ qemuDomainBlockJobAbort(virDomainPtr dom, { virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainDiskDefPtr disk =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); bool pivot =3D !!(flags & VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT); bool async =3D !!(flags & VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC); qemuBlockJobDataPtr job =3D NULL; @@ -17840,7 +17829,6 @@ qemuDomainBlockJobAbort(virDomainPtr dom, =20 cleanup: virObjectUnref(job); - virObjectUnref(cfg); virDomainObjEndAPI(&vm); return ret; } @@ -19100,7 +19088,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, bool supportMaxOptions =3D true; bool supportGroupNameOption =3D true; bool supportMaxLengthOptions =3D true; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; virObjectEventPtr event =3D NULL; virTypedParameterPtr eventParams =3D NULL; int eventNparams =3D 0; @@ -19421,7 +19409,6 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, virDomainObjEndAPI(&vm); if (eventNparams) virTypedParamsFree(eventParams, eventNparams); - virObjectUnref(cfg); return ret; } =20 @@ -19671,7 +19658,7 @@ qemuDomainSetMetadata(virDomainPtr dom, { virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainObjPtr vm; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; virCapsPtr caps =3D NULL; int ret =3D -1; =20 @@ -19707,7 +19694,6 @@ qemuDomainSetMetadata(virDomainPtr dom, cleanup: virDomainObjEndAPI(&vm); virObjectUnref(caps); - virObjectUnref(cfg); return ret; } =20 @@ -21294,7 +21280,7 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr driver, virHashTablePtr nodestats =3D NULL; virJSONValuePtr nodedata =3D NULL; qemuDomainObjPrivatePtr priv =3D dom->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); bool blockdev =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); bool fetchnodedata =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_QUERY_NAMED_BLOCK_NODES)= && !blockdev; @@ -21352,7 +21338,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr driver, virHashFree(stats); virHashFree(nodestats); virJSONValueFree(nodedata); - virObjectUnref(cfg); return ret; } =20 @@ -21991,7 +21976,7 @@ qemuDomainRenameCallback(virDomainObjPtr vm, void *opaque) { virQEMUDriverPtr driver =3D opaque; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; virObjectEventPtr event_new =3D NULL; virObjectEventPtr event_old =3D NULL; int ret =3D -1; @@ -22080,7 +22065,6 @@ qemuDomainRenameCallback(virDomainObjPtr vm, VIR_FREE(new_dom_name); virObjectEventStateQueue(driver->domainEventState, event_old); virObjectEventStateQueue(driver->domainEventState, event_new); - virObjectUnref(cfg); return ret; =20 rollback: @@ -22543,7 +22527,7 @@ qemuDomainSetLifecycleAction(virDomainPtr dom, unsigned int flags) { virQEMUDriverPtr driver =3D dom->conn->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); qemuDomainObjPrivatePtr priv; virDomainObjPtr vm =3D NULL; virDomainDefPtr def =3D NULL; @@ -22600,7 +22584,6 @@ qemuDomainSetLifecycleAction(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 9 02:14:23 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=1571170862; cv=none; d=zoho.com; s=zohoarc; b=a+9cdusykUUXG+xrGqkw4BT+Sx2r50NoEJ0xb/6L0j+9Y31xrvomJGb936ut65OaGQrflRmrcwY7CB+np38zIRe8GrwDEpU5bPg4KBGFAelXZSBwkUUdlbB+ZcfBm4TpxlJM2oYMf8Aew5AC/af0KUOU1FD5ZpfcTUALuUf2TPA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571170862; 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=3Thz73WfVUGvQtayVbqZhZIVAEUKA4zSJWdAzLAU9DM=; b=apFd1yWt8gdrtQid2Gn7Qpp3favEx9dJiejcb2+uC/v3CjrnskQMIn5a2TzKejsG6V91TUTcAPvwI1Eyjofj2TQCiUeslPkIdVINNJ9hVn4STpAKlzJl5/NThxDCE9BkuluCutKV2C7rr3TAyja8mkax83NAXpGR3aHiG4SKoIk= 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 1571170862560506.23072519734615; Tue, 15 Oct 2019 13:21:02 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B2CBE3082B41; Tue, 15 Oct 2019 20:21: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 846CE19C5B; Tue, 15 Oct 2019 20:21: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 3BA601803B49; Tue, 15 Oct 2019 20:21:00 +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 x9FK9D4W010246 for ; Tue, 15 Oct 2019 16:09:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 836595DC1E; Tue, 15 Oct 2019 20:09:13 +0000 (UTC) Received: from mx1.redhat.com (ext-mx19.extmail.prod.ext.phx2.redhat.com [10.5.110.48]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 92AE65D9CD; Tue, 15 Oct 2019 20:09:10 +0000 (UTC) Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) (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 50FAB307D978; Tue, 15 Oct 2019 20:09:09 +0000 (UTC) Received: by mail-qt1-f193.google.com with SMTP id n17so13129147qtr.4; Tue, 15 Oct 2019 13:09:09 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c7:d25e:a983:2b3:2523:a41]) by smtp.gmail.com with ESMTPSA id t199sm10089455qke.36.2019.10.15.13.09.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2019 13:09:07 -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=P8yfIT3ynfgUaQpi7h24eLU2ew+hDPgHJGD69io8jL0=; b=itN0sdQ2HFeUIRtnyfHPjKpHvw2E+Y6ilL1YePpiErXkTcscM822kAfknut96ZsJuJ PVxG9ZyMn0rGctpQjQ8GmTRxIZiOiiAsQo48qOuehG7nfVYQQzSaqaiPIX7B65yRfqgd Nrruz0ITn2COlRDNpr1LQ9hVw0YeVDjqhKBtOCECI4klYMiqXgOSqY1IlLrB9IHRFGrd 4J87HvNQc0+ROxtUiVpPSActyD8SoOnvxik1g7IUayYfpqEds1BOkAghSxZS0xtNJeCb tFXpMjYEWaxp5Yt0pFBfxTwuCMhfkKgp2GmQ33kUFtEURw4i/eg8UcD1RTEqd3G9yXzL tSHA== 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=P8yfIT3ynfgUaQpi7h24eLU2ew+hDPgHJGD69io8jL0=; b=E5dyqpGclYczdve/ZjpTqKFqjGkw8dXgE2ISasyEOdRpmKtrf08BQm8qmT0JaCTX82 GFFIrbtepXuEfPPrl8oFGfCp35HjF6+lW61oeaN9LEo91mSqsOoMSexi3q+WKqJACMV8 o2TffY17hbW0zAhXTyuw1hCHbRpmuPsbPO9nTgzpQDty/movmeJXa/aYsmWQFwsPOGcs lgSp5qxNuSOu1ZrZAfYV/gtRtNci5AyXKZ+uT69AT0bc+s5h9o6gUA6yS7m/huwqf9/l lPkvz+NIrFHuZgmAcUVR5szJ6UW6lJvCeAtZNZtoQE5lmdSoDuTFY7Kk4KpKL3AVLqIa t45w== X-Gm-Message-State: APjAAAXfXDXUWGK/ICMhyzr3RST/sAN68t1k+JfIUrQj8n+a9gIoCPaB mz8iYHuKZMm3IswBcIxNlEtsHeEd X-Google-Smtp-Source: APXvYqxt0Lh0Eh3mjkrQeAR7uFAgpAwStwNIbTP83dVWHdAH0e6CZ6SZAsecMoeCYZPKkhQrzz8KJw== X-Received: by 2002:ac8:714e:: with SMTP id h14mr7326701qtp.147.1571170148176; Tue, 15 Oct 2019 13:09:08 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Tue, 15 Oct 2019 17:08:46 -0300 Message-Id: <20191015200852.15778-5-danielhb413@gmail.com> In-Reply-To: <20191015200852.15778-1-danielhb413@gmail.com> References: <20191015200852.15778-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.48]); Tue, 15 Oct 2019 20:09:09 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Tue, 15 Oct 2019 20:09:09 +0000 (UTC) for IP:'209.85.160.193' DOMAIN:'mail-qt1-f193.google.com' HELO:'mail-qt1-f193.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.193 mail-qt1-f193.google.com 209.85.160.193 mail-qt1-f193.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.48 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , eskultet@redhat.com Subject: [libvirt] [PATCH v3 04/10] qemu_driver: use VIR_AUTOUNREF() with virCapsPtr 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.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Tue, 15 Oct 2019 20:21:01 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" virCapsPtr can be auto-unref for the great majority of the uses made in qemu_driver, sparing us a virObjectUnref() call and sometimes a whole 'cleanup' label. This patch changes virCapsPtr declarations to use VIR_AUTOUNREF(). 'cleanup' labels were deleted when possible. Suggested-by: Erik Skultety Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_driver.c | 113 ++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 76 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d9effd7f34..99923b0ab6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -396,7 +396,7 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, VIR_DOMAIN_SNAPSHOT_PARSE_DISKS | VIR_DOMAIN_SNAPSHOT_PARSE_INTERNAL); int ret =3D -1; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; int direrr; qemuDomainObjPrivatePtr priv; =20 @@ -495,7 +495,6 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, cleanup: VIR_DIR_CLOSE(dir); VIR_FREE(snapDir); - virObjectUnref(caps); virObjectUnlock(vm); return ret; } @@ -516,7 +515,7 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm, virDomainMomentObjPtr current =3D NULL; unsigned int flags =3D VIR_DOMAIN_CHECKPOINT_PARSE_REDEFINE; int ret =3D -1; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; int direrr; qemuDomainObjPrivatePtr priv; =20 @@ -606,7 +605,6 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm, cleanup: VIR_DIR_CLOSE(dir); VIR_FREE(chkDir); - virObjectUnref(caps); virObjectUnlock(vm); return ret; } @@ -1072,13 +1070,13 @@ static int qemuStateReload(void) { VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; =20 if (!qemu_driver) return 0; =20 if (!(caps =3D virQEMUDriverGetCapabilities(qemu_driver, false))) - goto cleanup; + return 0; =20 cfg =3D virQEMUDriverGetConfig(qemu_driver); virDomainObjListLoadAllConfigs(qemu_driver->domains, @@ -1086,8 +1084,6 @@ qemuStateReload(void) cfg->autostartDir, false, caps, qemu_driver->xmlopt, qemuNotifyLoadDomain, qemu_driver); - cleanup: - virObjectUnref(caps); return 0; } =20 @@ -1356,21 +1352,15 @@ qemuConnectGetMaxVcpus(virConnectPtr conn G_GNUC_UN= USED, const char *type) =20 static char *qemuConnectGetCapabilities(virConnectPtr conn) { virQEMUDriverPtr driver =3D conn->privateData; - virCapsPtr caps =3D NULL; - char *xml =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; =20 if (virConnectGetCapabilitiesEnsureACL(conn) < 0) return NULL; =20 if (!(caps =3D virQEMUDriverGetCapabilities(driver, true))) - goto cleanup; - - xml =3D virCapabilitiesFormatXML(caps); - virObjectUnref(caps); - - cleanup: + return NULL; =20 - return xml; + return virCapabilitiesFormatXML(caps); } =20 =20 @@ -1716,27 +1706,22 @@ static int qemuDomainIsUpdated(virDomainPtr dom) static int qemuConnectGetVersion(virConnectPtr conn, unsigned long *versio= n) { virQEMUDriverPtr driver =3D conn->privateData; - int ret =3D -1; unsigned int qemuVersion =3D 0; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; =20 if (virConnectGetVersionEnsureACL(conn) < 0) return -1; =20 if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) - goto cleanup; + return -1; =20 if (virQEMUCapsGetDefaultVersion(caps, driver->qemuCapsCache, &qemuVersion) < 0) - goto cleanup; + return -1; =20 *version =3D qemuVersion; - ret =3D 0; - - cleanup: - virObjectUnref(caps); - return ret; + return 0; } =20 =20 @@ -1789,7 +1774,7 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr= conn, virObjectEventPtr event =3D NULL; virObjectEventPtr event2 =3D NULL; unsigned int start_flags =3D VIR_QEMU_PROCESS_START_COLD; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_ABI_UPDATE; =20 @@ -1864,7 +1849,6 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr= conn, virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event2); - virObjectUnref(caps); virNWFilterUnlockFilterUpdates(); return dom; } @@ -3324,7 +3308,7 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, int ret =3D -1; virObjectEventPtr event =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; - virCapsPtr caps; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; virQEMUSaveDataPtr data =3D NULL; qemuDomainSaveCookiePtr cookie =3D NULL; =20 @@ -3439,7 +3423,6 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, VIR_FREE(xml); virQEMUSaveDataFree(data); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(caps); return ret; } =20 @@ -6604,29 +6587,27 @@ static int qemuNodeGetSecurityModel(virConnectPtr c= onn, { virQEMUDriverPtr driver =3D conn->privateData; char *p; - int ret =3D 0; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; =20 memset(secmodel, 0, sizeof(*secmodel)); =20 if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) - goto cleanup; + return 0; =20 if (virNodeGetSecurityModelEnsureACL(conn) < 0) - goto cleanup; + return 0; =20 /* We treat no driver as success, but simply return no data in *secmod= el */ if (caps->host.nsecModels =3D=3D 0 || caps->host.secModels[0].model =3D=3D NULL) - goto cleanup; + return 0; =20 p =3D caps->host.secModels[0].model; if (strlen(p) >=3D VIR_SECURITY_MODEL_BUFLEN-1) { virReportError(VIR_ERR_INTERNAL_ERROR, _("security model string exceeds max %d bytes"), VIR_SECURITY_MODEL_BUFLEN-1); - ret =3D -1; - goto cleanup; + return -1; } strcpy(secmodel->model, p); =20 @@ -6635,14 +6616,11 @@ static int qemuNodeGetSecurityModel(virConnectPtr c= onn, virReportError(VIR_ERR_INTERNAL_ERROR, _("security DOI string exceeds max %d bytes"), VIR_SECURITY_DOI_BUFLEN-1); - ret =3D -1; - goto cleanup; + return -1; } strcpy(secmodel->doi, p); =20 - cleanup: - virObjectUnref(caps); - return ret; + return 0; } =20 =20 @@ -6663,7 +6641,7 @@ qemuDomainSaveImageUpdateDef(virQEMUDriverPtr driver, virDomainDefPtr ret =3D NULL; virDomainDefPtr newdef_migr =3D NULL; virDomainDefPtr newdef =3D NULL; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; =20 if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) goto cleanup; @@ -6701,7 +6679,6 @@ qemuDomainSaveImageUpdateDef(virQEMUDriverPtr driver, } =20 cleanup: - virObjectUnref(caps); virDomainDefFree(newdef); virDomainDefFree(newdef_migr); =20 @@ -6741,7 +6718,7 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, virQEMUSaveHeaderPtr header; virDomainDefPtr def =3D NULL; int oflags =3D open_write ? O_RDWR : O_RDONLY; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; size_t xml_len; size_t cookie_len; =20 @@ -6861,7 +6838,6 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, *ret_data =3D data; =20 cleanup: - virObjectUnref(caps); return fd; =20 error: @@ -7435,7 +7411,7 @@ static char *qemuConnectDomainXMLToNative(virConnectP= tr conn, char *ret =3D NULL; size_t i; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; =20 virCheckFlags(0, NULL); =20 @@ -7497,7 +7473,6 @@ static char *qemuConnectDomainXMLToNative(virConnectP= tr conn, cleanup: virCommandFree(cmd); virObjectUnref(vm); - virObjectUnref(caps); return ret; } =20 @@ -7685,7 +7660,7 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, virDomainPtr dom =3D NULL; virObjectEventPtr event =3D NULL; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_ABI_UPDATE; =20 @@ -7749,7 +7724,6 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, virDomainDefFree(def); virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(caps); return dom; } =20 @@ -8721,7 +8695,7 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr v= m, virDomainDeviceDefPtr devConf =3D NULL; virDomainDeviceDefPtr devLive =3D NULL; int ret =3D -1; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_ABI_UPDATE; =20 @@ -8802,7 +8776,6 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr v= m, virDomainDefFree(vmdef); virDomainDeviceDefFree(devConf); virDomainDeviceDefFree(devLive); - virObjectUnref(caps); =20 return ret; } @@ -8863,7 +8836,7 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr d= om, bool force =3D (flags & VIR_DOMAIN_DEVICE_MODIFY_FORCE) !=3D 0; int ret =3D -1; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; unsigned int parse_flags =3D 0; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | @@ -8962,7 +8935,6 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr d= om, virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); virDomainObjEndAPI(&vm); - virObjectUnref(caps); virNWFilterUnlockFilterUpdates(); return ret; } @@ -8974,7 +8946,7 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriverPtr = driver, unsigned int flags) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; virDomainDeviceDefPtr dev =3D NULL, dev_copy =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE; @@ -9053,7 +9025,6 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriverPtr = driver, ret =3D 0; =20 cleanup: - virObjectUnref(caps); if (dev !=3D dev_copy) virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); @@ -9069,7 +9040,7 @@ qemuDomainDetachDeviceAliasLiveAndConfig(virQEMUDrive= rPtr driver, unsigned int flags) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; virDomainDefPtr def =3D NULL; virDomainDefPtr persistentDef =3D NULL; @@ -9131,7 +9102,6 @@ qemuDomainDetachDeviceAliasLiveAndConfig(virQEMUDrive= rPtr driver, ret =3D 0; cleanup: virDomainDefFree(vmdef); - virObjectUnref(caps); return ret; } =20 @@ -10645,7 +10615,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr = dom, int ret =3D -1; int rc; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; qemuDomainObjPrivatePtr priv; virObjectEventPtr event =3D NULL; virTypedParameterPtr eventParams =3D NULL; @@ -10937,7 +10907,6 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr = dom, virDomainObjEndAPI(&vm); if (eventNparams) virTypedParamsFree(eventParams, eventNparams); - virObjectUnref(caps); return ret; } #undef SCHED_RANGE_CHECK @@ -13549,27 +13518,22 @@ qemuConnectCompareCPU(virConnectPtr conn, unsigned int flags) { virQEMUDriverPtr driver =3D conn->privateData; - int ret =3D VIR_CPU_COMPARE_ERROR; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; bool failIncompatible; =20 virCheckFlags(VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE, VIR_CPU_COMPARE_ERROR); =20 if (virConnectCompareCPUEnsureACL(conn) < 0) - goto cleanup; + return VIR_CPU_COMPARE_ERROR; =20 failIncompatible =3D !!(flags & VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATI= BLE); =20 if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) - goto cleanup; - - ret =3D virCPUCompareXML(caps->host.arch, caps->host.cpu, - xmlDesc, failIncompatible); + return VIR_CPU_COMPARE_ERROR; =20 - cleanup: - virObjectUnref(caps); - return ret; + return virCPUCompareXML(caps->host.arch, caps->host.cpu, + xmlDesc, failIncompatible); } =20 =20 @@ -15892,7 +15856,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, int align_location =3D VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL; bool align_match =3D true; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; qemuDomainObjPrivatePtr priv; virDomainSnapshotState state; VIR_AUTOUNREF(virDomainSnapshotDefPtr) def =3D NULL; @@ -16164,7 +16128,6 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, cleanup: virDomainObjEndAPI(&vm); VIR_FREE(xml); - virObjectUnref(caps); return snapshot; } =20 @@ -16575,7 +16538,7 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr sna= pshot, virDomainDefPtr config =3D NULL; virDomainDefPtr inactiveConfig =3D NULL; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; bool was_stopped =3D false; qemuDomainSaveCookiePtr cookie; virCPUDefPtr origCPU =3D NULL; @@ -16992,7 +16955,6 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr sna= pshot, virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event2); virDomainObjEndAPI(&vm); - virObjectUnref(caps); virNWFilterUnlockFilterUpdates(); virCPUDefFree(origCPU); virDomainDefFree(config); @@ -19659,7 +19621,7 @@ qemuDomainSetMetadata(virDomainPtr dom, virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainObjPtr vm; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; int ret =3D -1; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | @@ -19693,7 +19655,6 @@ qemuDomainSetMetadata(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(caps); return ret; } =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 9 02:14:23 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=1571170866; cv=none; d=zoho.com; s=zohoarc; b=N5+193IafegsatlIZ32vzcF/ipO98GSZEUx9t9FFM76w5lEkxfx6+iIK6TEE4WqPJr5dp0YcFkeoMqSUmDh2Hi3WtiF8j9cGjIqPLaevmFzkuorUkexZsSJGoWeaGkhbSv/fwOu9NZoHXOzrRLACwgeqcPa8SDgZtFsWAybnquw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571170866; 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=/hRUacgz0hfx1neTHcdSi80DP5dIBGWuwtj1I6V+Lqo=; b=T3anbG+UfYk4Trss2/9XW3l5mDf+EUVZsBr8D/iXMuPA26exgk74F1hkdr2vdAfgW/9VGCvJkgxGIgj+/GIlMmCSe04EEG++s26DA41JAJcuAJ+zojwalL7OJzQ05i3u0jcbr/Qzb4MgvCuUZRe1soUDF7MUj2xdUtdhnI62pzQ= 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 1571170865996616.2897893979479; Tue, 15 Oct 2019 13:21:05 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 71C2C10C093C; Tue, 15 Oct 2019 20:21:04 +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 495E1608C2; Tue, 15 Oct 2019 20:21:04 +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 0A4E583549; Tue, 15 Oct 2019 20:21:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9FK9ERJ010252 for ; Tue, 15 Oct 2019 16:09:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 25E325C541; Tue, 15 Oct 2019 20:09:14 +0000 (UTC) Received: from mx1.redhat.com (ext-mx14.extmail.prod.ext.phx2.redhat.com [10.5.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8EB775C231; Tue, 15 Oct 2019 20:09:11 +0000 (UTC) Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8E46F3090FCD; Tue, 15 Oct 2019 20:09:10 +0000 (UTC) Received: by mail-qt1-f194.google.com with SMTP id t20so27152984qtr.10; Tue, 15 Oct 2019 13:09:10 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c7:d25e:a983:2b3:2523:a41]) by smtp.gmail.com with ESMTPSA id t199sm10089455qke.36.2019.10.15.13.09.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2019 13:09:09 -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=7oMwDB+XxyxzrakwrIkrol12h2qzghbLrjK0InZ1rzU=; b=b+EusPPXu27iR/lKHmMaJjvum5/pCJv9n/ubAzhriyVmJIAKzJa6URC1dMA3gInDlN Gsdck5Wg1epgBNdS9Xi8+lIBbCQvqotUZdJXI8NabDh719yTCJVNsAN8Cli6q6KMtmJ2 /fJE9A3c7+8WbDIwzseD6nZ182eWuUg0CFgM74XywqfA60SsGSJeMCPqmuXRIWhE7Thw dQQgCGhm9qbV/CNs8Olq/sUjuWgHpooeZzHZvq2aoTCGA4PokjMbFFfosLF3cfs8OZPp xaYYUDGy9WtgDaMMV15v/Vhi2xtXc5uWWinp1PGpKQDgJ0nPdeO/NKvG29DOPHyPlEYQ fJVg== 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=7oMwDB+XxyxzrakwrIkrol12h2qzghbLrjK0InZ1rzU=; b=W8CIYsDqGWSYDi4AVlr0Egn/wGLAzAqD4bSEG5NeE770Wo4Y8mxdd9afsuskky2s/V fng5NGbzoXw2MrPHNDfGwsQQKmj3gus/4db2kiot6/kn2S7q1WN/xEnlkpImXOZSf1PS WIys+/IFCR7v7tJWfYlJBE93YbI9Y9s9RU2O65rizZcgBTQC7o6tA3KUOPyxj11CucY+ lHbkcLBDyD6Wb4/cCIT88RytPo0EXZgau1VJoWKmYiL7J4tuMp1knHmm2Jb8pAqAuA5+ LqcWPLwoeJwrgGWNZQ8aE4gu2qFRn7n+nJkySxxQ3DnXhvQNww+hDmJ+AzlKH//odvF8 w9Jw== X-Gm-Message-State: APjAAAV8R+nl1bYwuZkL5pPpAIf/4VI9Z75I3NTH0tV5f8v5pR9/sgEl FHfB6za38Zg4PcauCqcEQd182RZs X-Google-Smtp-Source: APXvYqwTPcLu9uSmYSRAJOrcyMYLrcjZHx5wyDQD9lfr0FLwbWYfNGx8o249C2e0Gw1Ymun+4UT9YQ== X-Received: by 2002:aed:3ec8:: with SMTP id o8mr41177587qtf.386.1571170149615; Tue, 15 Oct 2019 13:09:09 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Tue, 15 Oct 2019 17:08:47 -0300 Message-Id: <20191015200852.15778-6-danielhb413@gmail.com> In-Reply-To: <20191015200852.15778-1-danielhb413@gmail.com> References: <20191015200852.15778-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.43]); Tue, 15 Oct 2019 20:09:10 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 15 Oct 2019 20:09:10 +0000 (UTC) for IP:'209.85.160.194' DOMAIN:'mail-qt1-f194.google.com' HELO:'mail-qt1-f194.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.153 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS) 209.85.160.194 mail-qt1-f194.google.com 209.85.160.194 mail-qt1-f194.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.43 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , eskultet@redhat.com Subject: [libvirt] [PATCH v3 05/10] qemu_driver: use VIR_AUTOUNREF() with more pointer types X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.66]); Tue, 15 Oct 2019 20:21:04 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This patch uses VIR_AUTOUNREF() with the following pointer types: - virQEMUCapsPtr - virConnect - qemuDomainSaveCookiePtr - virDomainCapsPtr - qemuBlockJobDataPtr* - virNetworkPtr - virSecurityManagerPtr 'cleanup' labels were deleted when possible. * instances being cleaned up with qemuBlockJobStartupFinalize() weren't changed, since qemuBlockJobStartupFinalize() will unref the object after qemuBlockJobUnregister(). Suggested-by: Erik Skultety Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_driver.c | 64 +++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 42 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 99923b0ab6..d95c5c5b81 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -305,8 +305,8 @@ static int qemuSecurityInit(virQEMUDriverPtr driver) { char **names; - virSecurityManagerPtr mgr =3D NULL; - virSecurityManagerPtr stack =3D NULL; + VIR_AUTOUNREF(virSecurityManagerPtr) mgr =3D NULL; + VIR_AUTOUNREF(virSecurityManagerPtr) stack =3D NULL; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); unsigned int flags =3D 0; =20 @@ -372,8 +372,6 @@ qemuSecurityInit(virQEMUDriverPtr driver) error: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to initialize security drivers")); - virObjectUnref(stack); - virObjectUnref(mgr); return -1; } =20 @@ -1098,7 +1096,7 @@ static int qemuStateStop(void) { int ret =3D -1; - virConnectPtr conn; + VIR_AUTOUNREF(virConnectPtr) conn =3D NULL; int numDomains =3D 0; size_t i; int state; @@ -1142,7 +1140,6 @@ qemuStateStop(void) VIR_FREE(domains); } VIR_FREE(flags); - virObjectUnref(conn); =20 return ret; } @@ -3310,7 +3307,7 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv =3D vm->privateData; VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; virQEMUSaveDataPtr data =3D NULL; - qemuDomainSaveCookiePtr cookie =3D NULL; + VIR_AUTOUNREF(qemuDomainSaveCookiePtr) cookie =3D NULL; =20 if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) goto cleanup; @@ -3419,7 +3416,6 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, qemuDomainRemoveInactiveJob(driver, vm); =20 cleanup: - virObjectUnref(cookie); VIR_FREE(xml); virQEMUSaveDataFree(data); virObjectEventStateQueue(driver->domainEventState, event); @@ -6866,7 +6862,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, char *errbuf =3D NULL; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); virQEMUSaveHeaderPtr header =3D &data->header; - qemuDomainSaveCookiePtr cookie =3D NULL; + VIR_AUTOUNREF(qemuDomainSaveCookiePtr) cookie =3D NULL; =20 if (virSaveCookieParseString(data->cookie, (virObjectPtr *)&cookie, virDomainXMLOptionGetSaveCookie(driver->x= mlopt)) < 0) @@ -6981,7 +6977,6 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, ret =3D 0; =20 cleanup: - virObjectUnref(cookie); virCommandFree(cmd); VIR_FREE(errbuf); if (qemuSecurityRestoreSavedStateLabel(driver, vm, path) < 0) @@ -13588,7 +13583,7 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn, int ret =3D VIR_CPU_COMPARE_ERROR; virQEMUDriverPtr driver =3D conn->privateData; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); - virQEMUCapsPtr qemuCaps =3D NULL; + VIR_AUTOUNREF(virQEMUCapsPtr) qemuCaps =3D NULL; bool failIncompatible; virCPUDefPtr hvCPU; virCPUDefPtr cpu =3D NULL; @@ -13642,7 +13637,6 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn, =20 cleanup: virCPUDefFree(cpu); - virObjectUnref(qemuCaps); return ret; } =20 @@ -13802,7 +13796,7 @@ qemuConnectBaselineHypervisorCPU(virConnectPtr conn, virQEMUDriverPtr driver =3D conn->privateData; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); virCPUDefPtr *cpus =3D NULL; - virQEMUCapsPtr qemuCaps =3D NULL; + VIR_AUTOUNREF(virQEMUCapsPtr) qemuCaps =3D NULL; virArch arch; virDomainVirtType virttype; virDomainCapsCPUModelsPtr cpuModels; @@ -13881,7 +13875,6 @@ qemuConnectBaselineHypervisorCPU(virConnectPtr conn, cleanup: virCPUDefListFree(cpus); virCPUDefFree(cpu); - virObjectUnref(qemuCaps); virStringListFree(features); =20 return cpustr; @@ -17689,7 +17682,7 @@ qemuDomainBlockJobAbort(virDomainPtr dom, VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); bool pivot =3D !!(flags & VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT); bool async =3D !!(flags & VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC); - qemuBlockJobDataPtr job =3D NULL; + VIR_AUTOUNREF(qemuBlockJobDataPtr) job =3D NULL; virDomainObjPtr vm; qemuDomainObjPrivatePtr priv =3D NULL; bool blockdev =3D false; @@ -17790,7 +17783,6 @@ qemuDomainBlockJobAbort(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); =20 cleanup: - virObjectUnref(job); virDomainObjEndAPI(&vm); return ret; } @@ -20460,17 +20452,16 @@ qemuConnectGetDomainCapabilities(virConnectPtr co= nn, const char *virttype_str, unsigned int flags) { - char *ret =3D NULL; virQEMUDriverPtr driver =3D conn->privateData; - virQEMUCapsPtr qemuCaps =3D NULL; + VIR_AUTOUNREF(virQEMUCapsPtr) qemuCaps =3D NULL; virArch arch; virDomainVirtType virttype; - virDomainCapsPtr domCaps =3D NULL; + VIR_AUTOUNREF(virDomainCapsPtr) domCaps =3D NULL; =20 - virCheckFlags(0, ret); + virCheckFlags(0, NULL); =20 if (virConnectGetDomainCapabilitiesEnsureACL(conn) < 0) - return ret; + return NULL; =20 qemuCaps =3D virQEMUCapsCacheLookupDefault(driver->qemuCapsCache, emulatorbin, @@ -20479,18 +20470,14 @@ qemuConnectGetDomainCapabilities(virConnectPtr co= nn, machine, &arch, &virttype, &machine); if (!qemuCaps) - goto cleanup; + return NULL; =20 if (!(domCaps =3D virQEMUDriverGetDomainCapabilities(driver, qemuCaps, machine, arch, virttype))) - goto cleanup; + return NULL; =20 - ret =3D virDomainCapsFormat(domCaps); - cleanup: - virObjectUnref(domCaps); - virObjectUnref(qemuCaps); - return ret; + return virDomainCapsFormat(domCaps); } =20 =20 @@ -21733,7 +21720,7 @@ qemuGetDHCPInterfaces(virDomainPtr dom, int n_leases =3D 0; size_t i, j; size_t ifaces_count =3D 0; - virNetworkPtr network =3D NULL; + VIR_AUTOUNREF(virNetworkPtr) network =3D NULL; char macaddr[VIR_MAC_STRING_BUFLEN]; virDomainInterfacePtr iface =3D NULL; virNetworkDHCPLeasePtr *leases =3D NULL; @@ -21801,7 +21788,6 @@ qemuGetDHCPInterfaces(virDomainPtr dom, rv =3D ifaces_count; =20 cleanup: - virObjectUnref(network); if (leases) { for (i =3D 0; i < n_leases; i++) virNetworkDHCPLeaseFree(leases[i]); @@ -22596,32 +22582,26 @@ qemuNodeGetSEVInfo(virConnectPtr conn, unsigned int flags) { virQEMUDriverPtr driver =3D conn->privateData; - virQEMUCapsPtr qemucaps =3D NULL; - int ret =3D -1; + VIR_AUTOUNREF(virQEMUCapsPtr) qemucaps =3D NULL; =20 if (virNodeGetSevInfoEnsureACL(conn) < 0) - return ret; + return -1; =20 qemucaps =3D virQEMUCapsCacheLookupByArch(driver->qemuCapsCache, virArchFromHost()); if (!qemucaps) - goto cleanup; + return -1; =20 if (!virQEMUCapsGet(qemucaps, QEMU_CAPS_SEV_GUEST)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("QEMU does not support SEV guest")); - goto cleanup; + return -1; } =20 if (qemuGetSEVInfoToParams(qemucaps, params, nparams, flags) < 0) - goto cleanup; - - ret =3D 0; - - cleanup: - virObjectUnref(qemucaps); + return -1; =20 - 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 Thu May 9 02:14:23 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=1571170814; cv=none; d=zoho.com; s=zohoarc; b=QB/rFk9tRq0JoqfNDhyHxSMYUYcxrOjkd/f40OrntOXTrWAQjyNSFPuhGBuQeY2o0ChzbwtaP/03j3RUJH18SFF9DmEFX7gxDdO1w2zRdQ7MNFhk8bf+6frE00D3kSGs8Pz8QiRShrv3fKowAoGw3J4yMshINUxAwtO1gbI45Es= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571170814; 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=aenU1jGkiEq3uHnpdDnd19NHACLOjoOlvmbRd99V41A=; b=f3S7RICoz2PCsbTls++877Ijzh03MKOn8jnzy4bEXJs0kniEOnA2prPf1QN3R/H+sbLhMOBWHu0a9gV4I9sf9tFTDalNu6M7zmwTDwBiWyyjN77TBkb82MZRSocgZ76vJQtMs5Xjs0EXuY9Hl9xVKb4T7wXFxyA7+GMlLcXyD7U= 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 1571170814417632.2029313600901; Tue, 15 Oct 2019 13:20:14 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 676789D1D1; Tue, 15 Oct 2019 20:20:12 +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 38F7460605; Tue, 15 Oct 2019 20:20:12 +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 CDBD283544; Tue, 15 Oct 2019 20:20:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9FK9EIh010253 for ; Tue, 15 Oct 2019 16:09:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 263FE5C553; Tue, 15 Oct 2019 20:09:14 +0000 (UTC) Received: from mx1.redhat.com (ext-mx07.extmail.prod.ext.phx2.redhat.com [10.5.110.31]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1DE095C1D6; Tue, 15 Oct 2019 20:09:13 +0000 (UTC) Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) (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 74581C04B940; Tue, 15 Oct 2019 20:09:12 +0000 (UTC) Received: by mail-qt1-f195.google.com with SMTP id n7so32478848qtb.6; Tue, 15 Oct 2019 13:09:12 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c7:d25e:a983:2b3:2523:a41]) by smtp.gmail.com with ESMTPSA id t199sm10089455qke.36.2019.10.15.13.09.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2019 13:09:10 -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=kxsTMvrJkcI6ZNtcrtQd4LO3NuIX+6X7y6CyV2aK9h0=; b=oXUXCiSiD4ejS5230JipAs1D7fJGBuzwk/TMUslzLJ9ufFEhrjdOyszusFthjrzTvx MnZw286ic2VfozfrWM1R10laOpluVzLkmcsGH+da9cPRRE1DdMwrG2y3c00tzgJUDokp NSZ8+JDRSKlbuWqPOyUF4Mqjv8fEyKsSU+qMDrrgSVuhAEgrnBhjJGNbECdAgFZ4GhtZ 6EGM+UtJdehvGPG3IRikvDGmvPe9cOWqJGAnozPRFCt4NMDqgirPEVvUSul92tH/o6ws NdWGPQos1uPGSias1DnNNikV+DkPcgyLj0MiGINyGPY8Rx+iPMhxQXdgxshx/Fhak5c3 j9SQ== 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=kxsTMvrJkcI6ZNtcrtQd4LO3NuIX+6X7y6CyV2aK9h0=; b=KAfqBzR+YqyjCZ/Pe2M5hxmpdGjOdg8hvtq9XsItz1Je9VTQe6PQPIaII6WDyPauBX JWadYgBjvrY8J6vTHQq8y8zWLP70mjVTvuqbZnQB/Sjs6Pi/qBDxaEoCVL2VsMcS7JP1 aEUuhVUwBiOjfyazB7pa1yyefKPH4p8RwJ2Na091y1GtOsuUZFDLjrXs/MItKz/g/A0z Uzqhm64x5hgcLDEYte91V7FpX1bW3kF3jCFBFg2OS5Q6ma1klPRP1EoxnpsPhws8VPfr EPEBQHQef5bcb/d+1diXzjJclPn3Q7t5DcFV0+1/wDnivABmXW7j7+EGlFV6GDgtv3on BepQ== X-Gm-Message-State: APjAAAXCi7/MJm4ZPBraH3b0b/gylEFVoQIIySmvaGhZlwj7IoQUhhxi k0epUWF3kFoJvHHSSGqRNlo2xpaR X-Google-Smtp-Source: APXvYqzFgK5JAxxB92v20OBhEgwppDYxtiPl3d22oSrKQCavF9LBVVauSKPC67MSVvLUxVpZhYJOIg== X-Received: by 2002:a0c:c792:: with SMTP id k18mr37251794qvj.154.1571170151276; Tue, 15 Oct 2019 13:09:11 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Tue, 15 Oct 2019 17:08:48 -0300 Message-Id: <20191015200852.15778-7-danielhb413@gmail.com> In-Reply-To: <20191015200852.15778-1-danielhb413@gmail.com> References: <20191015200852.15778-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.31]); Tue, 15 Oct 2019 20:09:12 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 15 Oct 2019 20:09:12 +0000 (UTC) for IP:'209.85.160.195' DOMAIN:'mail-qt1-f195.google.com' HELO:'mail-qt1-f195.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.195 mail-qt1-f195.google.com 209.85.160.195 mail-qt1-f195.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.31 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , eskultet@redhat.com Subject: [libvirt] [PATCH v3 06/10] qemu_driver: use VIR_AUTOFREE() with strings 1/3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 15 Oct 2019 20:20:13 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Using VIR_AUTOFREE() in all strings of qemu_driver.c make the code a bit tidier and smaller, sparing VIR_FREE() calls and sometimes a whole 'cleanup' label. This is a huge change due to the amount of char * declared in this file, thus let's split it in 3. This is the first part. Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_driver.c | 103 +++++++++++++---------------------------- 1 file changed, 33 insertions(+), 70 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d95c5c5b81..f887a79ecd 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -381,11 +381,9 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, void *data) { char *baseDir =3D (char *)data; - char *snapDir =3D NULL; + VIR_AUTOFREE(char *) snapDir =3D NULL; DIR *dir =3D NULL; struct dirent *entry; - char *xmlStr; - char *fullpath; virDomainSnapshotDefPtr def =3D NULL; virDomainMomentObjPtr snap =3D NULL; virDomainMomentObjPtr current =3D NULL; @@ -420,6 +418,9 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, goto cleanup; =20 while ((direrr =3D virDirRead(dir, &entry, NULL)) > 0) { + VIR_AUTOFREE(char *) xmlStr =3D NULL; + VIR_AUTOFREE(char *) fullpath =3D NULL; + /* NB: ignoring errors, so one malformed config doesn't kill the whole process */ VIR_INFO("Loading snapshot file '%s'", entry->d_name); @@ -435,7 +436,6 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, virReportSystemError(errno, _("Failed to read snapshot file %s"), fullpath); - VIR_FREE(fullpath); continue; } =20 @@ -448,8 +448,6 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to parse snapshot XML from file '%s'"= ), fullpath); - VIR_FREE(fullpath); - VIR_FREE(xmlStr); continue; } =20 @@ -463,9 +461,6 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, vm->def->name); current =3D snap; } - - VIR_FREE(fullpath); - VIR_FREE(xmlStr); } if (direrr < 0) virReportError(VIR_ERR_INTERNAL_ERROR, @@ -492,7 +487,6 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, ret =3D 0; cleanup: VIR_DIR_CLOSE(dir); - VIR_FREE(snapDir); virObjectUnlock(vm); return ret; } @@ -503,11 +497,9 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm, void *data) { char *baseDir =3D (char *)data; - char *chkDir =3D NULL; + VIR_AUTOFREE(char *) chkDir =3D NULL; DIR *dir =3D NULL; struct dirent *entry; - char *xmlStr; - char *fullpath; virDomainCheckpointDefPtr def =3D NULL; virDomainMomentObjPtr chk =3D NULL; virDomainMomentObjPtr current =3D NULL; @@ -538,6 +530,9 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm, goto cleanup; =20 while ((direrr =3D virDirRead(dir, &entry, NULL)) > 0) { + VIR_AUTOFREE(char *) xmlStr =3D NULL; + VIR_AUTOFREE(char *) fullpath =3D NULL; + /* NB: ignoring errors, so one malformed config doesn't kill the whole process */ VIR_INFO("Loading checkpoint file '%s'", entry->d_name); @@ -553,7 +548,6 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm, virReportSystemError(errno, _("Failed to read checkpoint file %s"), fullpath); - VIR_FREE(fullpath); continue; } =20 @@ -566,8 +560,6 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm, virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to parse checkpoint XML from file '%s= '"), fullpath); - VIR_FREE(fullpath); - VIR_FREE(xmlStr); virObjectUnref(def); continue; } @@ -575,9 +567,6 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm, chk =3D virDomainCheckpointAssignDef(vm->checkpoints, def); if (chk =3D=3D NULL) virObjectUnref(def); - - VIR_FREE(fullpath); - VIR_FREE(xmlStr); } if (direrr < 0) virReportError(VIR_ERR_INTERNAL_ERROR, @@ -602,7 +591,6 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm, ret =3D 0; cleanup: VIR_DIR_CLOSE(dir); - VIR_FREE(chkDir); virObjectUnlock(vm); return ret; } @@ -660,12 +648,11 @@ qemuStateInitialize(bool privileged, virStateInhibitCallback callback, void *opaque) { - char *driverConf =3D NULL; + VIR_AUTOFREE(char *) driverConf =3D NULL; virQEMUDriverConfigPtr cfg; uid_t run_uid =3D -1; gid_t run_gid =3D -1; - char *hugepagePath =3D NULL; - char *memoryBackingPath =3D NULL; + VIR_AUTOFREE(char *) memoryBackingPath =3D NULL; bool autostart =3D true; size_t i; =20 @@ -706,7 +693,6 @@ qemuStateInitialize(bool privileged, =20 if (virQEMUDriverConfigLoadFile(cfg, driverConf, privileged) < 0) goto error; - VIR_FREE(driverConf); =20 if (virQEMUDriverConfigValidate(cfg) < 0) goto error; @@ -830,7 +816,7 @@ qemuStateInitialize(bool privileged, goto error; =20 if (privileged) { - char *channeldir; + VIR_AUTOFREE(char *) channeldir =3D NULL; =20 if (chown(cfg->libDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, @@ -883,10 +869,8 @@ qemuStateInitialize(bool privileged, _("unable to set ownership of '%s' to %d:= %d"), channeldir, (int)cfg->user, (int)cfg->group); - VIR_FREE(channeldir); goto error; } - VIR_FREE(channeldir); if (chown(cfg->channelTargetDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership of '%s' to %d:= %d"), @@ -937,6 +921,8 @@ qemuStateInitialize(bool privileged, * it, since we can't assume the root mount point has permissions that * will let our spawned QEMU instances use it. */ for (i =3D 0; i < cfg->nhugetlbfs; i++) { + VIR_AUTOFREE(char *) hugepagePath =3D NULL; + hugepagePath =3D qemuGetBaseHugepagePath(&cfg->hugetlbfs[i]); =20 if (!hugepagePath) @@ -952,7 +938,6 @@ qemuStateInitialize(bool privileged, virFileUpdatePerm(cfg->hugetlbfs[i].mnt_dir, 0, S_IXGRP | S_IXOTH) < 0) goto error; - VIR_FREE(hugepagePath); } =20 if (qemuGetMemoryBackingBasePath(cfg, &memoryBackingPath) < 0) @@ -969,7 +954,6 @@ qemuStateInitialize(bool privileged, virFileUpdatePerm(memoryBackingPath, 0, S_IXGRP | S_IXOTH) < 0) goto error; - VIR_FREE(memoryBackingPath); =20 if (!(qemu_driver->closeCallbacks =3D virCloseCallbacksNew())) goto error; @@ -1038,9 +1022,6 @@ qemuStateInitialize(bool privileged, return VIR_DRV_STATE_INIT_COMPLETE; =20 error: - VIR_FREE(driverConf); - VIR_FREE(hugepagePath); - VIR_FREE(memoryBackingPath); qemuStateCleanup(); return VIR_DRV_STATE_INIT_ERROR; } @@ -1365,8 +1346,8 @@ static int qemuGetSchedInfo(unsigned long long *cpuWait, pid_t pid, pid_t tid) { - char *proc =3D NULL; - char *data =3D NULL; + VIR_AUTOFREE(char *) proc =3D NULL; + VIR_AUTOFREE(char *) data =3D NULL; char **lines =3D NULL; size_t i; int ret =3D -1; @@ -1430,8 +1411,6 @@ qemuGetSchedInfo(unsigned long long *cpuWait, ret =3D 0; =20 cleanup: - VIR_FREE(data); - VIR_FREE(proc); virStringListFree(lines); return ret; } @@ -1441,7 +1420,7 @@ static int qemuGetProcessInfo(unsigned long long *cpuTime, int *lastCpu, long *vm_rss, pid_t pid, int tid) { - char *proc; + VIR_AUTOFREE(char *) proc =3D NULL; FILE *pidinfo; unsigned long long usertime =3D 0, systime =3D 0; long rss =3D 0; @@ -1458,7 +1437,6 @@ qemuGetProcessInfo(unsigned long long *cpuTime, int *= lastCpu, long *vm_rss, return -1; =20 pidinfo =3D fopen(proc, "r"); - VIR_FREE(proc); =20 /* See 'man proc' for information about what all these fields are. We'= re * only interested in a very few of them */ @@ -2910,9 +2888,8 @@ virQEMUSaveDataWrite(virQEMUSaveDataPtr data, size_t len; size_t xml_len; size_t cookie_len =3D 0; - int ret =3D -1; size_t zerosLen =3D 0; - char *zeros =3D NULL; + VIR_AUTOFREE(char *) zeros =3D NULL; =20 xml_len =3D strlen(data->xml) + 1; if (data->cookie) @@ -2924,12 +2901,12 @@ virQEMUSaveDataWrite(virQEMUSaveDataPtr data, if (len > header->data_len) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("new xml too large to fit in file")); - goto cleanup; + return -1; } =20 zerosLen =3D header->data_len - len; if (VIR_ALLOC_N(zeros, zerosLen) < 0) - goto cleanup; + return -1; } else { header->data_len =3D len; } @@ -2941,14 +2918,14 @@ virQEMUSaveDataWrite(virQEMUSaveDataPtr data, virReportSystemError(errno, _("failed to write header to domain save file= '%s'"), path); - goto cleanup; + return -1; } =20 if (safewrite(fd, data->xml, xml_len) !=3D xml_len) { virReportSystemError(errno, _("failed to write domain xml to '%s'"), path); - goto cleanup; + return -1; } =20 if (data->cookie && @@ -2956,21 +2933,17 @@ virQEMUSaveDataWrite(virQEMUSaveDataPtr data, virReportSystemError(errno, _("failed to write cookie to '%s'"), path); - goto cleanup; + return -1; } =20 if (safewrite(fd, zeros, zerosLen) !=3D zerosLen) { virReportSystemError(errno, _("failed to write padding to '%s'"), path); - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - VIR_FREE(zeros); - return ret; + return 0; } =20 =20 @@ -3300,7 +3273,7 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, int compressed, const char *compressedpath, const char *xmlin, unsigned int flags) { - char *xml =3D NULL; + VIR_AUTOFREE(char *) xml =3D NULL; bool was_running =3D false; int ret =3D -1; virObjectEventPtr event =3D NULL; @@ -3381,7 +3354,6 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, if (!(data =3D virQEMUSaveDataNew(xml, cookie, was_running, compressed, driver->xmlopt))) goto endjob; - xml =3D NULL; =20 ret =3D qemuDomainSaveMemory(driver, vm, path, data, compressedpath, flags, QEMU_ASYNC_JOB_SAVE); @@ -3416,7 +3388,6 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, qemuDomainRemoveInactiveJob(driver, vm); =20 cleanup: - VIR_FREE(xml); virQEMUSaveDataFree(data); virObjectEventStateQueue(driver->domainEventState, event); return ret; @@ -3504,7 +3475,7 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *pat= h, const char *dxml, { virQEMUDriverPtr driver =3D dom->conn->privateData; int compressed; - char *compressedpath =3D NULL; + VIR_AUTOFREE(char *) compressedpath =3D NULL; int ret =3D -1; virDomainObjPtr vm =3D NULL; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; @@ -3533,7 +3504,6 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *pat= h, const char *dxml, =20 cleanup: virDomainObjEndAPI(&vm); - VIR_FREE(compressedpath); return ret; } =20 @@ -3561,9 +3531,9 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int = flags) virQEMUDriverPtr driver =3D dom->conn->privateData; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; int compressed; - char *compressedpath =3D NULL; + VIR_AUTOFREE(char *) compressedpath =3D NULL; virDomainObjPtr vm; - char *name =3D NULL; + VIR_AUTOFREE(char *) name =3D NULL; int ret =3D -1; =20 virCheckFlags(VIR_DOMAIN_SAVE_BYPASS_CACHE | @@ -3603,8 +3573,6 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int = flags) =20 cleanup: virDomainObjEndAPI(&vm); - VIR_FREE(name); - VIR_FREE(compressedpath); =20 return ret; } @@ -3614,7 +3582,7 @@ qemuDomainManagedSaveLoad(virDomainObjPtr vm, void *opaque) { virQEMUDriverPtr driver =3D opaque; - char *name; + VIR_AUTOFREE(char *) name =3D NULL; int ret =3D -1; =20 virObjectLock(vm); @@ -3627,7 +3595,6 @@ qemuDomainManagedSaveLoad(virDomainObjPtr vm, ret =3D 0; cleanup: virObjectUnlock(vm); - VIR_FREE(name); return ret; } =20 @@ -3659,7 +3626,7 @@ qemuDomainManagedSaveRemove(virDomainPtr dom, unsigne= d int flags) virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainObjPtr vm; int ret =3D -1; - char *name =3D NULL; + VIR_AUTOFREE(char *) name =3D NULL; =20 virCheckFlags(0, -1); =20 @@ -3683,7 +3650,6 @@ qemuDomainManagedSaveRemove(virDomainPtr dom, unsigne= d int flags) ret =3D 0; =20 cleanup: - VIR_FREE(name); virDomainObjEndAPI(&vm); return ret; } @@ -3803,7 +3769,7 @@ doCoreDump(virQEMUDriverPtr driver, unsigned int flags =3D VIR_FILE_WRAPPER_NON_BLOCKING; const char *memory_dump_format =3D NULL; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); - char *compressedpath =3D NULL; + VIR_AUTOFREE(char *) compressedpath =3D NULL; =20 /* We reuse "save" flag for "dump" here. Then, we can support the same * format in "save" and "dump". This path doesn't need the compression @@ -3883,7 +3849,6 @@ doCoreDump(virQEMUDriverPtr driver, virFileWrapperFdFree(wrapperFd); if (ret !=3D 0) unlink(path); - VIR_FREE(compressedpath); return ret; } =20 @@ -4009,7 +3974,7 @@ qemuDomainScreenshot(virDomainPtr dom, virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainObjPtr vm; qemuDomainObjPrivatePtr priv; - char *tmp =3D NULL; + VIR_AUTOFREE(char *) tmp =3D NULL; int tmp_fd =3D -1; size_t i; const char *videoAlias =3D NULL; @@ -4101,7 +4066,6 @@ qemuDomainScreenshot(virDomainPtr dom, VIR_FORCE_CLOSE(tmp_fd); if (unlink_tmp) unlink(tmp); - VIR_FREE(tmp); =20 qemuDomainObjEndJob(driver, vm); =20 @@ -4115,7 +4079,7 @@ getAutoDumpPath(virQEMUDriverPtr driver, virDomainObjPtr vm) { char *dumpfile =3D NULL; - char *domname =3D virDomainDefGetShortName(vm->def); + VIR_AUTOFREE(char *domname) =3D virDomainDefGetShortName(vm->def); char timestr[100]; struct tm time_info; time_t curtime =3D time(NULL); @@ -4134,7 +4098,6 @@ getAutoDumpPath(virQEMUDriverPtr driver, domname, timestr)); =20 - VIR_FREE(domname); return dumpfile; } =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 9 02:14:23 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=1571170821; cv=none; d=zoho.com; s=zohoarc; b=LtoP463a/liaOrWoPRX3FNX+WmMnMnNvYwf7dVAdCCApwEkw4L64q6Gu5BiLf5RRNEYbkFaspmD86goIeR+nayyQPGCQ4okHi4/qWW0slrrhz3RNRo01wY5R8fcs4WcF0N92EXkw/6DEcE/Gv8cud0T63B2wEFmtDFnwgFtzbyo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571170821; 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=pUvZq9iI7uLYj9lO42YTav1ISub+mPY4CqIG+wYB+K0=; b=YLMOvPm5Pz2vUrL5BHg2FJuUxCFGvNieheSH4UBEkXmT9RosXN3I7cvv94eW8zy5UWBD3FvwlVGphJza0Q7j8M34nEvHWyTITeNQtoVSx3F+Rbje7ygoxgLKe94QW53gZaLn91l1V6wSjm/I8CP1XzSxcUbxw0x3fnHBMF4irLQ= 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 1571170821417693.5958712177035; Tue, 15 Oct 2019 13:20:21 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 57B48316E50A; Tue, 15 Oct 2019 20:20:19 +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 C1F7D5D712; Tue, 15 Oct 2019 20:20:18 +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 8289B83546; Tue, 15 Oct 2019 20:20:18 +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 x9FK9JmN010294 for ; Tue, 15 Oct 2019 16:09:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id F2AC760C83; Tue, 15 Oct 2019 20:09:18 +0000 (UTC) Received: from mx1.redhat.com (ext-mx15.extmail.prod.ext.phx2.redhat.com [10.5.110.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4E77760C5D; Tue, 15 Oct 2019 20:09:16 +0000 (UTC) Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0493930860D7; Tue, 15 Oct 2019 20:09:15 +0000 (UTC) Received: by mail-qt1-f194.google.com with SMTP id t20so27153389qtr.10; Tue, 15 Oct 2019 13:09:14 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c7:d25e:a983:2b3:2523:a41]) by smtp.gmail.com with ESMTPSA id t199sm10089455qke.36.2019.10.15.13.09.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2019 13:09: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=ogmbG1BGd/xYSU+N+5d0sZL/03ccT47lx8JrYiDH6wY=; b=B9cQ16YMhy6oscV6pNoZ9OAVpLDYq81v4ehd427G4BlHk0dqksgpgfALX6U4rl1E+p l3ys8m+bx9UEu3sdkIhuCgw9agkv+RwSWckXb3zghdXQqMXxgnBTGH2dP0oDefpG8m99 hnXSVmiN6NS4kbxk9LC+hc+MWbu3Z+HDzCYpxUv4LEhEiW8vQhDzm2I8yrkkBjc7zQrs OW6EUj0QMZrRSsrzWVwKPJWDtXRZOxnhLe4FhH8Z1VBfKnEQG0pPqsI+MSFxucHWBEnU K6EIKscc9+ljNOIzpKkZU4+zqQ8n5gBWB/1gMcOEl2rxQf3RPKPlBcGEJPYg4wSxIT+C c+dw== 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=ogmbG1BGd/xYSU+N+5d0sZL/03ccT47lx8JrYiDH6wY=; b=WyngxnI5WgsZ9A2rBYD3oaPllZ/dTtPMSMmxb7+JbuqQrP7UkwKtr4QlmtHPxrApUA Ssn3jBDV7DhCML7pnlEeRE8fgI/djHnGtZXt2DPtfDy6Ck4FMAFrURpi/6j9O9hdkIJV sQXG7NhwFKiwbohj6fjYieeIj7SRQqmBf+5blwExxFDr1ujOlCOAPJVnwZgqt3FbvRyB FDRXFZdVMuO5j1bcrPY84RmCuOSbRU1CvZE24/JD6a6rqwKXDi+HBMsbLSRZpnmn9wBO EphoMrO5yUi5nF9M/p03uXWr3kxr/2Vkuwrrt830IlhogDJ91ovpaE9Ak3apI/nQvn1q sceA== X-Gm-Message-State: APjAAAUCB4J6P4oOE5L+ajGoSssi5wa5vOTbpHSsLl/SQHmlCrgNX+SK hksp82edIEzOich8Fg6oxvxV1pdk X-Google-Smtp-Source: APXvYqySk8ALUGNVfKF37EaDq6A/hXkGTje14QCM7xiLMKafifQqXTyqFSuCNj51zI/VMm1zpmwF/g== X-Received: by 2002:ac8:550d:: with SMTP id j13mr40335840qtq.37.1571170153173; Tue, 15 Oct 2019 13:09:13 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Tue, 15 Oct 2019 17:08:49 -0300 Message-Id: <20191015200852.15778-8-danielhb413@gmail.com> In-Reply-To: <20191015200852.15778-1-danielhb413@gmail.com> References: <20191015200852.15778-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 15 Oct 2019 20:09:15 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 15 Oct 2019 20:09:15 +0000 (UTC) for IP:'209.85.160.194' DOMAIN:'mail-qt1-f194.google.com' HELO:'mail-qt1-f194.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.153 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS) 209.85.160.194 mail-qt1-f194.google.com 209.85.160.194 mail-qt1-f194.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.44 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , eskultet@redhat.com Subject: [libvirt] [PATCH v3 07/10] qemu_driver: use VIR_AUTOFREE() with strings 2/3 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Tue, 15 Oct 2019 20:20:19 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Using VIR_AUTOFREE() in all strings of qemu_driver.c make the code a bit tidier and smaller, sparing VIR_FREE() calls and sometimes a whole 'cleanup' label. This is a huge change due to the amount of char * declared in this file, thus let's split it in 3. This is the second part. Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_driver.c | 86 +++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 56 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f887a79ecd..f3fccc0843 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4108,11 +4108,11 @@ processWatchdogEvent(virQEMUDriverPtr driver, { int ret; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); - char *dumpfile =3D getAutoDumpPath(driver, vm); + VIR_AUTOFREE(char *) dumpfile =3D getAutoDumpPath(driver, vm); unsigned int flags =3D VIR_DUMP_MEMORY_ONLY; =20 if (!dumpfile) - goto cleanup; + return; =20 switch (action) { case VIR_DOMAIN_WATCHDOG_ACTION_DUMP: @@ -4120,7 +4120,7 @@ processWatchdogEvent(virQEMUDriverPtr driver, QEMU_ASYNC_JOB_DUMP, VIR_DOMAIN_JOB_OPERATION_DUMP, flags) < 0) { - goto cleanup; + return; } =20 if (virDomainObjCheckActive(vm) < 0) @@ -4141,14 +4141,11 @@ processWatchdogEvent(virQEMUDriverPtr driver, "%s", _("Resuming after dump failed")); break; default: - goto cleanup; + return; } =20 endjob: qemuDomainObjEndAsyncJob(driver, vm); - - cleanup: - VIR_FREE(dumpfile); } =20 static int @@ -4158,18 +4155,16 @@ doCoreDumpToAutoDumpPath(virQEMUDriverPtr driver, { int ret =3D -1; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); - char *dumpfile =3D getAutoDumpPath(driver, vm); + VIR_AUTOFREE(char *) dumpfile =3D getAutoDumpPath(driver, vm); =20 if (!dumpfile) - goto cleanup; + return -1; =20 flags |=3D cfg->autoDumpBypassCache ? VIR_DUMP_BYPASS_CACHE: 0; if ((ret =3D doCoreDump(driver, vm, dumpfile, flags, VIR_DOMAIN_CORE_DUMP_FORMAT_RAW)) < 0) virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Dump failed")); - cleanup: - VIR_FREE(dumpfile); return ret; } =20 @@ -4179,14 +4174,11 @@ qemuProcessGuestPanicEventInfo(virQEMUDriverPtr dri= ver, virDomainObjPtr vm, qemuMonitorEventPanicInfoPtr info) { - char *msg =3D qemuMonitorGuestPanicEventInfoFormatMsg(info); - char *timestamp =3D virTimeStringNow(); + VIR_AUTOFREE(char *) msg =3D qemuMonitorGuestPanicEventInfoFormatMsg(i= nfo); + VIR_AUTOFREE(char *) timestamp =3D virTimeStringNow(); =20 if (msg && timestamp) qemuDomainLogAppendMessage(driver, vm, "%s: panic %s\n", timestamp= , msg); - - VIR_FREE(timestamp); - VIR_FREE(msg); } =20 =20 @@ -5082,7 +5074,7 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm, virDomainVcpuDefPtr vcpuinfo; qemuDomainObjPrivatePtr priv =3D vm->privateData; virCgroupPtr cgroup_vcpu =3D NULL; - char *str =3D NULL; + VIR_AUTOFREE(char *) str =3D NULL; virObjectEventPtr event =3D NULL; char paramField[VIR_TYPED_PARAM_FIELD_LENGTH] =3D ""; virTypedParameterPtr eventParams =3D NULL; @@ -5146,7 +5138,6 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm, cleanup: virBitmapFree(tmpmap); virCgroupFree(&cgroup_vcpu); - VIR_FREE(str); virObjectEventStateQueue(driver->domainEventState, event); return ret; } @@ -5287,7 +5278,7 @@ qemuDomainPinEmulator(virDomainPtr dom, virBitmapPtr pcpumap =3D NULL; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; virObjectEventPtr event =3D NULL; - char *str =3D NULL; + VIR_AUTOFREE(char *) str =3D NULL; virTypedParameterPtr eventParams =3D NULL; int eventNparams =3D 0; int eventMaxparams =3D 0; @@ -5376,7 +5367,6 @@ qemuDomainPinEmulator(virDomainPtr dom, if (cgroup_emulator) virCgroupFree(&cgroup_emulator); virObjectEventStateQueue(driver->domainEventState, event); - VIR_FREE(str); virBitmapFree(pcpumap); virDomainObjEndAPI(&vm); return ret; @@ -5758,7 +5748,7 @@ qemuDomainPinIOThread(virDomainPtr dom, virCgroupPtr cgroup_iothread =3D NULL; virObjectEventPtr event =3D NULL; char paramField[VIR_TYPED_PARAM_FIELD_LENGTH] =3D ""; - char *str =3D NULL; + VIR_AUTOFREE(char *) str =3D NULL; virTypedParameterPtr eventParams =3D NULL; int eventNparams =3D 0; int eventMaxparams =3D 0; @@ -5870,7 +5860,6 @@ qemuDomainPinIOThread(virDomainPtr dom, if (cgroup_iothread) virCgroupFree(&cgroup_iothread); virObjectEventStateQueue(driver->domainEventState, event); - VIR_FREE(str); virBitmapFree(pcpumap); virDomainObjEndAPI(&vm); return ret; @@ -5882,7 +5871,7 @@ qemuDomainHotplugAddIOThread(virQEMUDriverPtr driver, unsigned int iothread_id) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - char *alias =3D NULL; + VIR_AUTOFREE(char *) alias =3D NULL; size_t idx; int ret =3D -1; unsigned int orig_niothreads =3D vm->def->niothreadids; @@ -5958,7 +5947,6 @@ qemuDomainHotplugAddIOThread(virQEMUDriverPtr driver, } virDomainAuditIOThread(vm, orig_niothreads, new_niothreads, "update", ret =3D=3D 0); - VIR_FREE(alias); virJSONValueFree(props); return ret; =20 @@ -6003,7 +5991,7 @@ qemuDomainHotplugDelIOThread(virQEMUDriverPtr driver, { qemuDomainObjPrivatePtr priv =3D vm->privateData; size_t idx; - char *alias =3D NULL; + VIR_AUTOFREE(char *) alias =3D NULL; int rc =3D -1; int ret =3D -1; unsigned int orig_niothreads =3D vm->def->niothreadids; @@ -6052,7 +6040,6 @@ qemuDomainHotplugDelIOThread(virQEMUDriverPtr driver, } virDomainAuditIOThread(vm, orig_niothreads, new_niothreads, "update", rc =3D=3D 0); - VIR_FREE(alias); return ret; =20 exit_monitor: @@ -6822,7 +6809,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, virObjectEventPtr event; int intermediatefd =3D -1; virCommandPtr cmd =3D NULL; - char *errbuf =3D NULL; + VIR_AUTOFREE(char *) errbuf =3D NULL; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); virQEMUSaveHeaderPtr header =3D &data->header; VIR_AUTOUNREF(qemuDomainSaveCookiePtr) cookie =3D NULL; @@ -6941,7 +6928,6 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, =20 cleanup: virCommandFree(cmd); - VIR_FREE(errbuf); if (qemuSecurityRestoreSavedStateLabel(driver, vm, path) < 0) VIR_WARN("failed to restore save state label on %s", path); return ret; @@ -6957,7 +6943,7 @@ qemuDomainRestoreFlags(virConnectPtr conn, qemuDomainObjPrivatePtr priv =3D NULL; virDomainDefPtr def =3D NULL; virDomainObjPtr vm =3D NULL; - char *xmlout =3D NULL; + VIR_AUTOFREE(char *) xmlout =3D NULL; const char *newxml =3D dxml; int fd =3D -1; int ret =3D -1; @@ -7042,7 +7028,6 @@ qemuDomainRestoreFlags(virConnectPtr conn, ret =3D -1; virFileWrapperFdFree(wrapperFd); virQEMUSaveDataFree(data); - VIR_FREE(xmlout); if (vm && ret < 0) qemuDomainRemoveInactiveJob(driver, vm); virDomainObjEndAPI(&vm); @@ -7165,7 +7150,7 @@ qemuDomainManagedSaveGetXMLDesc(virDomainPtr dom, uns= igned int flags) { virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainObjPtr vm; - char *path =3D NULL; + VIR_AUTOFREE(char *) path =3D NULL; char *ret =3D NULL; virDomainDefPtr def =3D NULL; int fd =3D -1; @@ -7202,7 +7187,6 @@ qemuDomainManagedSaveGetXMLDesc(virDomainPtr dom, uns= igned int flags) virDomainDefFree(def); VIR_FORCE_CLOSE(fd); virDomainObjEndAPI(&vm); - VIR_FREE(path); return ret; } =20 @@ -7213,7 +7197,7 @@ qemuDomainManagedSaveDefineXML(virDomainPtr dom, cons= t char *dxml, virQEMUDriverPtr driver =3D dom->conn->privateData; virConnectPtr conn =3D dom->conn; virDomainObjPtr vm; - char *path =3D NULL; + VIR_AUTOFREE(char *) path =3D NULL; int ret =3D -1; =20 if (!(vm =3D qemuDomainObjFromDomain(dom))) @@ -7235,7 +7219,6 @@ qemuDomainManagedSaveDefineXML(virDomainPtr dom, cons= t char *dxml, =20 cleanup: virDomainObjEndAPI(&vm); - VIR_FREE(path); return ret; } =20 @@ -7254,7 +7237,7 @@ qemuDomainObjRestore(virConnectPtr conn, qemuDomainObjPrivatePtr priv =3D vm->privateData; int fd =3D -1; int ret =3D -1; - char *xmlout =3D NULL; + VIR_AUTOFREE(char *) xmlout =3D NULL; virQEMUSaveDataPtr data =3D NULL; virFileWrapperFdPtr wrapperFd =3D NULL; =20 @@ -7311,7 +7294,6 @@ qemuDomainObjRestore(virConnectPtr conn, =20 cleanup: virQEMUSaveDataFree(data); - VIR_FREE(xmlout); virDomainDefFree(def); VIR_FORCE_CLOSE(fd); if (virFileWrapperFdClose(wrapperFd) < 0) @@ -7476,7 +7458,7 @@ qemuDomainObjStart(virConnectPtr conn, qemuDomainAsyncJob asyncJob) { int ret =3D -1; - char *managed_save; + VIR_AUTOFREE(char *) managed_save =3D NULL; bool start_paused =3D (flags & VIR_DOMAIN_START_PAUSED) !=3D 0; bool autodestroy =3D (flags & VIR_DOMAIN_START_AUTODESTROY) !=3D 0; bool bypass_cache =3D (flags & VIR_DOMAIN_START_BYPASS_CACHE) !=3D 0; @@ -7494,7 +7476,7 @@ qemuDomainObjStart(virConnectPtr conn, managed_save =3D qemuDomainManagedSavePath(driver, vm); =20 if (!managed_save) - goto cleanup; + return ret; =20 if (virFileExists(managed_save)) { if (force_boot) { @@ -7502,7 +7484,7 @@ qemuDomainObjStart(virConnectPtr conn, virReportSystemError(errno, _("cannot remove managed save file %s= "), managed_save); - goto cleanup; + return ret; } vm->hasManagedSave =3D false; } else { @@ -7518,11 +7500,11 @@ qemuDomainObjStart(virConnectPtr conn, else vm->hasManagedSave =3D false; =20 - goto cleanup; + return ret; } else if (ret < 0) { VIR_WARN("Unable to restore from managed state %s. " "Maybe the file is corrupted?", managed_save); - goto cleanup; + return ret; } else { VIR_WARN("Ignoring incomplete managed state %s", managed_s= ave); priv->job.current->operation =3D op; @@ -7549,8 +7531,6 @@ qemuDomainObjStart(virConnectPtr conn, } } =20 - cleanup: - VIR_FREE(managed_save); return ret; } =20 @@ -7698,7 +7678,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainObjPtr vm; virObjectEventPtr event =3D NULL; - char *name =3D NULL; + VIR_AUTOFREE(char *) name =3D NULL; int ret =3D -1; int nsnapshots; int ncheckpoints; @@ -7827,7 +7807,6 @@ qemuDomainUndefineFlags(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); =20 cleanup: - VIR_FREE(name); virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); return ret; @@ -9165,7 +9144,8 @@ static int qemuDomainSetAutostart(virDomainPtr dom, { virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainObjPtr vm; - char *configFile =3D NULL, *autostartLink =3D NULL; + VIR_AUTOFREE(char *) configFile =3D NULL; + VIR_AUTOFREE(char *) autostartLink =3D NULL; int ret =3D -1; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; =20 @@ -9229,8 +9209,6 @@ static int qemuDomainSetAutostart(virDomainPtr dom, ret =3D 0; =20 cleanup: - VIR_FREE(configFile); - VIR_FREE(autostartLink); virDomainObjEndAPI(&vm); return ret; } @@ -10010,7 +9988,7 @@ qemuDomainSetNumaParamsLive(virDomainObjPtr vm, { virCgroupPtr cgroup_temp =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; - char *nodeset_str =3D NULL; + VIR_AUTOFREE(char *) nodeset_str =3D NULL; virDomainNumatuneMemMode mode; size_t i =3D 0; int ret =3D -1; @@ -10060,7 +10038,6 @@ qemuDomainSetNumaParamsLive(virDomainObjPtr vm, =20 ret =3D 0; cleanup: - VIR_FREE(nodeset_str); virCgroupFree(&cgroup_temp); =20 return ret; @@ -10203,7 +10180,7 @@ qemuDomainGetNumaParameters(virDomainPtr dom, virDomainObjPtr vm =3D NULL; virDomainNumatuneMemMode tmpmode =3D VIR_DOMAIN_NUMATUNE_MEM_STRICT; qemuDomainObjPrivatePtr priv; - char *nodeset =3D NULL; + VIR_AUTOFREE(char *) nodeset =3D NULL; int ret =3D -1; virDomainDefPtr def =3D NULL; bool live =3D false; @@ -10267,7 +10244,6 @@ qemuDomainGetNumaParameters(virDomainPtr dom, ret =3D 0; =20 cleanup: - VIR_FREE(nodeset); virDomainObjEndAPI(&vm); return ret; } @@ -11134,7 +11110,7 @@ qemuDomainBlockResize(virDomainPtr dom, virDomainObjPtr vm; qemuDomainObjPrivatePtr priv; int ret =3D -1; - char *device =3D NULL; + VIR_AUTOFREE(char *) device =3D NULL; const char *nodename =3D NULL; virDomainDiskDefPtr disk =3D NULL; =20 @@ -11206,7 +11182,6 @@ qemuDomainBlockResize(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); =20 cleanup: - VIR_FREE(device); virDomainObjEndAPI(&vm); return ret; } @@ -11915,7 +11890,7 @@ qemuDomainBlockPeek(virDomainPtr dom, virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainDiskDefPtr disk =3D NULL; virDomainObjPtr vm; - char *tmpbuf =3D NULL; + VIR_AUTOFREE(char *) tmpbuf =3D NULL; ssize_t nread; int ret =3D -1; =20 @@ -11970,7 +11945,6 @@ qemuDomainBlockPeek(virDomainPtr dom, if (disk) virStorageFileDeinit(disk->src); virDomainObjEndAPI(&vm); - VIR_FREE(tmpbuf); return ret; } =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 9 02:14:23 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=1571170824; cv=none; d=zoho.com; s=zohoarc; b=gz7yE2lIW6/2BvzjLVHHaxbIw2L7MCEIn5lEYKpmaty3j4A/430F8HRBPioM1AE4A1cHpo2w25EGYKsUz51y8QYPnGqJv+YsucUYcBsuJoauoy8dLRzzwO3FNl+CES0EmqKC6niaEHlyLR7f4D/9jX4ILvLtECCprbyhHcYRfo0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571170824; 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=X4HAsc1ooOqmsRzeyiQz7wQ+NKOWpFnG/H6ULkO623I=; b=hnKzl99EJJyqCZt5L5Q0+9gCj5GRUSn1kQryBvvB85lzAjVWOOWXVKYenIf9cGxl7wA7NXK27b90d2HN0S4xltzBeP+SSx9wEW+PcO6WpF9B8iCMpBu3FrYX+UwVd5RAwXHv7F0wYSlpel+FouMt1rxL2eLBiy47elhEdH7diwQ= 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 1571170824865777.0754793710294; Tue, 15 Oct 2019 13:20:24 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5111718C427F; Tue, 15 Oct 2019 20:20:23 +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 28780100EBD4; Tue, 15 Oct 2019 20:20:23 +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 C534883546; Tue, 15 Oct 2019 20:20:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9FK9J8Z010299 for ; Tue, 15 Oct 2019 16:09:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id EE7566060D; Tue, 15 Oct 2019 20:09:19 +0000 (UTC) Received: from mx1.redhat.com (ext-mx29.extmail.prod.ext.phx2.redhat.com [10.5.110.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7F50460A97; Tue, 15 Oct 2019 20:09:17 +0000 (UTC) Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) (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 2707218C8938; Tue, 15 Oct 2019 20:09:16 +0000 (UTC) Received: by mail-qt1-f195.google.com with SMTP id u22so32480499qtq.13; Tue, 15 Oct 2019 13:09:16 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c7:d25e:a983:2b3:2523:a41]) by smtp.gmail.com with ESMTPSA id t199sm10089455qke.36.2019.10.15.13.09.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2019 13:09: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=yq14/bhJHBraks4A5SVvWjFfpDfsrlhaFHHPleBVZ60=; b=pn/zMbuZDqH7q4tR/7vvttKuzR2yiYUc+bt68C3A5i58w6LTsUhjNigLIuNDjihTkL /cdnXSAjO3bIY18sH8MXcIsYR7n8zjzteIQX53kXCDzy8/vQMzAwCUljf7UZX1/Zy1Mj xvsarRGEyKU9pDc+jcNdO8l8pG4hw96cS8cRvZvFLCW42KBaLlWxV/PM7pFkdpB3OcPt YKuhfr9syw/paRvET+N8MEhPhIhPdEHckMkme6cHoO2yLOfk4rja51OyOfojdkqGIv7M 5/YEe8NDSES1LAKYFPi0C7OfqOeha4fqib0jQmjPhuT7uj0PGrcOwFrC5KzO6fOnNvw6 gUvA== 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=yq14/bhJHBraks4A5SVvWjFfpDfsrlhaFHHPleBVZ60=; b=YMQ4JcxnAC/2mbwq2FMFfY18aiW9OggkZaWGgyAvkbudAHe6GPrJZqpzE1bONvbUR6 nDpnzphk/z9evvlI6W2JwuApCFkZttYhDfHB2sihgRr0OlUnDLc9VaW9bb4Zz16vD35h zUMuxxJP5ipHilqZffCgtnPbg96ZTVPCO3x6ikleMKvKSBVOP+7//ftQl8HwNNe5o5/z Qt2FWLkkwGXolvFb7Xh/pyWtd7kuRw7zyyXqVyjhyCWk6DJuM7CXqMXJDwMQykxlZi4l 3Wf8SwgO1+9ST9A1Hnk/GgQSBI7Ii79/L/rNoxiFBqq//y8TA0FkFbOnhkiMMVnBBcBk 3XYA== X-Gm-Message-State: APjAAAXPz8QK5UJ5VmHTNYAJK6p+/qXu59gDCa+d0oRxGGHDMrtdktjM 9ec3VZnXxP5ResB32m9IJYeZ+gLQ X-Google-Smtp-Source: APXvYqzchsxBS3NfGR7sEe171YGSwN7aOcTUueM9fbzaJYWDmAsVxyv4k9Rg6S0zwm86TVZrszra8w== X-Received: by 2002:ad4:42a2:: with SMTP id e2mr37435994qvr.189.1571170155001; Tue, 15 Oct 2019 13:09:15 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Tue, 15 Oct 2019 17:08:50 -0300 Message-Id: <20191015200852.15778-9-danielhb413@gmail.com> In-Reply-To: <20191015200852.15778-1-danielhb413@gmail.com> References: <20191015200852.15778-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.70]); Tue, 15 Oct 2019 20:09:16 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]); Tue, 15 Oct 2019 20:09:16 +0000 (UTC) for IP:'209.85.160.195' DOMAIN:'mail-qt1-f195.google.com' HELO:'mail-qt1-f195.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.195 mail-qt1-f195.google.com 209.85.160.195 mail-qt1-f195.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.70 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , eskultet@redhat.com Subject: [libvirt] [PATCH v3 08/10] qemu_driver: use VIR_AUTOFREE() with strings 3/3 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.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.62]); Tue, 15 Oct 2019 20:20:23 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Using VIR_AUTOFREE() in all strings of qemu_driver.c make the code a bit tidier and smaller, sparing VIR_FREE() calls and sometimes a whole 'cleanup' label. This is the last part of this change. Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_driver.c | 99 +++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 65 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f3fccc0843..fd7c8bb1be 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11956,7 +11956,7 @@ qemuDomainMemoryPeek(virDomainPtr dom, { virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainObjPtr vm; - char *tmp =3D NULL; + VIR_AUTOFREE(char *) tmp =3D NULL; int fd =3D -1, ret =3D -1; qemuDomainObjPrivatePtr priv; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; @@ -12028,7 +12028,6 @@ qemuDomainMemoryPeek(virDomainPtr dom, VIR_FORCE_CLOSE(fd); if (tmp) unlink(tmp); - VIR_FREE(tmp); virDomainObjEndAPI(&vm); return ret; } @@ -12194,7 +12193,7 @@ qemuStorageLimitsRefresh(virQEMUDriverPtr driver, int ret =3D -1; int fd =3D -1; struct stat sb; - char *buf =3D NULL; + VIR_AUTOFREE(char *) buf =3D NULL; ssize_t len; =20 if ((rc =3D qemuDomainStorageOpenStat(driver, cfg, vm, src, &fd, &sb, @@ -12230,7 +12229,6 @@ qemuStorageLimitsRefresh(virQEMUDriverPtr driver, ret =3D 1; =20 cleanup: - VIR_FREE(buf); qemuDomainStorageCloseStat(src, &fd); return ret; } @@ -12451,7 +12449,7 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, { virQEMUDriverPtr driver =3D dconn->privateData; virDomainDefPtr def =3D NULL; - char *origname =3D NULL; + VIR_AUTOFREE(char *) origname =3D NULL; qemuMigrationParamsPtr migParams =3D NULL; int ret =3D -1; =20 @@ -12486,7 +12484,6 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, =20 cleanup: qemuMigrationParamsFree(migParams); - VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -12508,7 +12505,7 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, { virQEMUDriverPtr driver =3D dconn->privateData; virDomainDefPtr def =3D NULL; - char *origname =3D NULL; + VIR_AUTOFREE(char *) origname =3D NULL; qemuMigrationParamsPtr migParams =3D NULL; int ret =3D -1; =20 @@ -12553,7 +12550,6 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, =20 cleanup: qemuMigrationParamsFree(migParams); - VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -12754,7 +12750,7 @@ qemuDomainMigratePrepare3(virConnectPtr dconn, { virQEMUDriverPtr driver =3D dconn->privateData; virDomainDefPtr def =3D NULL; - char *origname =3D NULL; + VIR_AUTOFREE(char *) origname =3D NULL; qemuMigrationParamsPtr migParams =3D NULL; int ret =3D -1; =20 @@ -12789,7 +12785,6 @@ qemuDomainMigratePrepare3(virConnectPtr dconn, =20 cleanup: qemuMigrationParamsFree(migParams); - VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -12815,7 +12810,7 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, int nbdPort =3D 0; int nmigrate_disks; const char **migrate_disks =3D NULL; - char *origname =3D NULL; + VIR_AUTOFREE(char *) origname =3D NULL; qemuMigrationParamsPtr migParams =3D NULL; int ret =3D -1; =20 @@ -12878,7 +12873,6 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, cleanup: qemuMigrationParamsFree(migParams); VIR_FREE(migrate_disks); - VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -12898,7 +12892,7 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, { virQEMUDriverPtr driver =3D dconn->privateData; virDomainDefPtr def =3D NULL; - char *origname =3D NULL; + VIR_AUTOFREE(char *) origname =3D NULL; qemuMigrationParamsPtr migParams =3D NULL; int ret =3D -1; =20 @@ -12927,7 +12921,6 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, =20 cleanup: qemuMigrationParamsFree(migParams); - VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -12947,7 +12940,7 @@ qemuDomainMigratePrepareTunnel3Params(virConnectPtr= dconn, virDomainDefPtr def =3D NULL; const char *dom_xml =3D NULL; const char *dname =3D NULL; - char *origname =3D NULL; + VIR_AUTOFREE(char *) origname =3D NULL; qemuMigrationParamsPtr migParams =3D NULL; int ret =3D -1; =20 @@ -12986,7 +12979,6 @@ qemuDomainMigratePrepareTunnel3Params(virConnectPtr= dconn, =20 cleanup: qemuMigrationParamsFree(migParams); - VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -13308,7 +13300,7 @@ qemuNodeDeviceDetachFlags(virNodeDevicePtr dev, unsigned domain =3D 0, bus =3D 0, slot =3D 0, function =3D 0; int ret =3D -1; virNodeDeviceDefPtr def =3D NULL; - char *xml =3D NULL; + VIR_AUTOFREE(char *) xml =3D NULL; bool vfio =3D qemuHostdevHostSupportsPassthroughVFIO(); virHostdevManagerPtr hostdev_mgr =3D driver->hostdevMgr; =20 @@ -13358,7 +13350,6 @@ qemuNodeDeviceDetachFlags(virNodeDevicePtr dev, cleanup: virPCIDeviceFree(pci); virNodeDeviceDefFree(def); - VIR_FREE(xml); return ret; } =20 @@ -13376,7 +13367,7 @@ qemuNodeDeviceReAttach(virNodeDevicePtr dev) unsigned domain =3D 0, bus =3D 0, slot =3D 0, function =3D 0; int ret =3D -1; virNodeDeviceDefPtr def =3D NULL; - char *xml =3D NULL; + VIR_AUTOFREE(char *) xml =3D NULL; virHostdevManagerPtr hostdev_mgr =3D driver->hostdevMgr; =20 xml =3D virNodeDeviceGetXMLDesc(dev, 0); @@ -13402,7 +13393,6 @@ qemuNodeDeviceReAttach(virNodeDevicePtr dev) virPCIDeviceFree(pci); cleanup: virNodeDeviceDefFree(def); - VIR_FREE(xml); return ret; } =20 @@ -13414,7 +13404,7 @@ qemuNodeDeviceReset(virNodeDevicePtr dev) unsigned domain =3D 0, bus =3D 0, slot =3D 0, function =3D 0; int ret =3D -1; virNodeDeviceDefPtr def =3D NULL; - char *xml =3D NULL; + VIR_AUTOFREE(char *) xml =3D NULL; virHostdevManagerPtr hostdev_mgr =3D driver->hostdevMgr; =20 xml =3D virNodeDeviceGetXMLDesc(dev, 0); @@ -13440,7 +13430,6 @@ qemuNodeDeviceReset(virNodeDevicePtr dev) virPCIDeviceFree(pci); cleanup: virNodeDeviceDefFree(def); - VIR_FREE(xml); return ret; } =20 @@ -15277,7 +15266,6 @@ qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr d= river, qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - char *backingStoreStr; virDomainDiskDefPtr persistdisk; VIR_AUTOUNREF(virStorageSourcePtr) terminator =3D NULL; bool supportsCreate; @@ -15323,13 +15311,13 @@ qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr= driver, * block commit still works */ if (reuse) { if (supportsBacking) { + VIR_AUTOFREE(char *) backingStoreStr =3D NULL; + if (virStorageFileGetBackingStoreStr(dd->src, &backingStor= eStr) < 0) return -1; if (backingStoreStr !=3D NULL) { if (virStorageIsRelative(backingStoreStr)) VIR_STEAL_PTR(dd->relPath, backingStoreStr); - else - VIR_FREE(backingStoreStr); } } } else { @@ -15776,7 +15764,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, { virQEMUDriverPtr driver =3D domain->conn->privateData; virDomainObjPtr vm =3D NULL; - char *xml =3D NULL; + VIR_AUTOFREE(char *) xml =3D NULL; virDomainMomentObjPtr snap =3D NULL; virDomainSnapshotPtr snapshot =3D NULL; virDomainMomentObjPtr current =3D NULL; @@ -16057,7 +16045,6 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, =20 cleanup: virDomainObjEndAPI(&vm); - VIR_FREE(xml); return snapshot; } =20 @@ -17844,7 +17831,7 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom, virDomainDiskDefPtr disk; int ret =3D -1; virDomainObjPtr vm; - char *device =3D NULL; + VIR_AUTOFREE(char *) device =3D NULL; unsigned long long speed =3D bandwidth; =20 virCheckFlags(VIR_DOMAIN_BLOCK_JOB_SPEED_BANDWIDTH_BYTES, -1); @@ -17889,7 +17876,6 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); =20 cleanup: - VIR_FREE(device); virDomainObjEndAPI(&vm); =20 return ret; @@ -18969,7 +18955,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, virDomainDefPtr def =3D NULL; virDomainDefPtr persistentDef =3D NULL; virDomainBlockIoTuneInfo info; - char *drivealias =3D NULL; + VIR_AUTOFREE(char *) drivealias =3D NULL; const char *qdevid =3D NULL; int ret =3D -1; size_t i; @@ -19296,7 +19282,6 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, =20 cleanup: VIR_FREE(info.group_name); - VIR_FREE(drivealias); virDomainObjEndAPI(&vm); if (eventNparams) virTypedParamsFree(eventParams, eventNparams); @@ -19317,7 +19302,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, virDomainDefPtr def =3D NULL; virDomainDefPtr persistentDef =3D NULL; virDomainBlockIoTuneInfo reply =3D {0}; - char *drivealias =3D NULL; + VIR_AUTOFREE(char *) drivealias =3D NULL; const char *qdevid =3D NULL; int ret =3D -1; int maxparams; @@ -19454,7 +19439,6 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, =20 cleanup: VIR_FREE(reply.group_name); - VIR_FREE(drivealias); virDomainObjEndAPI(&vm); return ret; } @@ -21078,12 +21062,10 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDe= fPtr disk, bool blockdev) =20 { - char *alias =3D NULL; virStorageSourcePtr n; const char *frontendalias; const char *backendalias; const char *backendstoragealias; - int ret =3D -1; =20 /* * This helps to keep logs clean from error messages on getting stats @@ -21100,6 +21082,8 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDefP= tr disk, } =20 for (n =3D disk->src; virStorageSourceIsBacking(n); n =3D n->backingSt= ore) { + VIR_AUTOFREE(char *) alias =3D NULL; + if (blockdev) { frontendalias =3D QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName; backendalias =3D n->nodeformat; @@ -21108,7 +21092,7 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDefP= tr disk, /* alias may be NULL if the VM is not running */ if (disk->info.alias && !(alias =3D qemuDomainStorageAlias(disk->info.alias, n->id= ))) - goto cleanup; + return -1; =20 qemuDomainGetStatsOneBlockRefreshNamed(n, alias, stats, nodest= ats); =20 @@ -21118,37 +21102,32 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDe= fPtr disk, } =20 if (qemuDomainGetStatsBlockExportHeader(disk, n, *recordnr, params= ) < 0) - goto cleanup; + return -1; =20 /* The following stats make sense only for the frontend device */ if (n =3D=3D disk->src) { if (qemuDomainGetStatsBlockExportFrontend(frontendalias, stats= , *recordnr, params) < 0) - goto cleanup; + return -1; } =20 if (qemuDomainGetStatsOneBlock(driver, cfg, dom, params, backendalias, n, *recordnr, stats) < 0) - goto cleanup; + return -1; =20 if (qemuDomainGetStatsBlockExportBackendStorage(backendstoragealia= s, stats, *recordnr, params) < 0) - goto cleanup; + return -1; =20 - VIR_FREE(alias); (*recordnr)++; =20 if (!visitBacking) break; } =20 - ret =3D 0; - - cleanup: - VIR_FREE(alias); - return ret; + return 0; } =20 =20 @@ -21864,12 +21843,12 @@ qemuDomainRenameCallback(virDomainObjPtr vm, virObjectEventPtr event_new =3D NULL; virObjectEventPtr event_old =3D NULL; int ret =3D -1; - char *new_dom_name =3D NULL; - char *old_dom_name =3D NULL; - char *new_dom_cfg_file =3D NULL; - char *old_dom_cfg_file =3D NULL; - char *new_dom_autostart_link =3D NULL; - char *old_dom_autostart_link =3D NULL; + VIR_AUTOFREE(char *) new_dom_name =3D NULL; + VIR_AUTOFREE(char *) old_dom_name =3D NULL; + VIR_AUTOFREE(char *) new_dom_cfg_file =3D NULL; + VIR_AUTOFREE(char *) old_dom_cfg_file =3D NULL; + VIR_AUTOFREE(char *) new_dom_autostart_link =3D NULL; + VIR_AUTOFREE(char *) old_dom_autostart_link =3D NULL; =20 virCheckFlags(0, ret); =20 @@ -21941,12 +21920,6 @@ qemuDomainRenameCallback(virDomainObjPtr vm, ret =3D 0; =20 cleanup: - VIR_FREE(old_dom_autostart_link); - VIR_FREE(new_dom_autostart_link); - VIR_FREE(old_dom_cfg_file); - VIR_FREE(new_dom_cfg_file); - VIR_FREE(old_dom_name); - VIR_FREE(new_dom_name); virObjectEventStateQueue(driver->domainEventState, event_old); virObjectEventStateQueue(driver->domainEventState, event_new); return ret; @@ -22051,7 +22024,7 @@ qemuDomainGetGuestVcpusParams(virTypedParameterPtr = *params, virBitmapPtr vcpus =3D NULL; virBitmapPtr online =3D NULL; virBitmapPtr offlinable =3D NULL; - char *tmp =3D NULL; + VIR_AUTOFREE(char *) tmp =3D NULL; size_t i; int ret =3D -1; =20 @@ -22080,7 +22053,6 @@ qemuDomainGetGuestVcpusParams(virTypedParameterPtr = *params, goto cleanup; \ if (virTypedParamsAddString(&par, &npar, &maxpar, #name, tmp) < 0) \ goto cleanup; \ - VIR_FREE(tmp) =20 ADD_BITMAP(vcpus); ADD_BITMAP(online); @@ -22094,7 +22066,6 @@ qemuDomainGetGuestVcpusParams(virTypedParameterPtr = *params, ret =3D 0; =20 cleanup: - VIR_FREE(tmp); virBitmapFree(vcpus); virBitmapFree(online); virBitmapFree(offlinable); @@ -22322,7 +22293,7 @@ qemuDomainSetBlockThreshold(virDomainPtr dom, qemuDomainObjPrivatePtr priv; virDomainObjPtr vm =3D NULL; virStorageSourcePtr src; - char *nodename =3D NULL; + VIR_AUTOFREE(char *) nodename =3D NULL; int rc; int ret =3D -1; =20 @@ -22376,7 +22347,6 @@ qemuDomainSetBlockThreshold(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); =20 cleanup: - VIR_FREE(nodename); virDomainObjEndAPI(&vm); return ret; } @@ -22550,7 +22520,7 @@ qemuDomainGetSEVMeasurement(virQEMUDriverPtr driver, unsigned int flags) { int ret =3D -1; - char *tmp =3D NULL; + VIR_AUTOFREE(char *) tmp =3D NULL; int maxpar =3D 0; =20 virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1); @@ -22575,7 +22545,6 @@ qemuDomainGetSEVMeasurement(virQEMUDriverPtr driver, ret =3D 0; =20 endjob: - VIR_FREE(tmp); qemuDomainObjEndJob(driver, vm); return ret; } --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 9 02:14:23 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=1571170745; cv=none; d=zoho.com; s=zohoarc; b=ewUuJKUQVQtYkPyUmbqUdwYEIqpy8BQbMmRh7CAUnGPi7LG3gNh5iAA+5xxoT0A0D6KUPtObhLOf3YykY2iIf4InCKFcOu9wAiOTepEMRT7hfrT8pne5z9VML7Lb6ung+fZlBnHBKmn6jmLBitVqGKORDJhbIdzl8Ysx/70EFE8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571170745; 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=IUTTUC7v2wRKzOMAu3y2YMA2AMEr8YnU8y4r0M4/LWk=; b=P6ZqtX2Z4uvGMmIoWsjjHHWVoRpcZ33RS4aG2HBowBjaSZqytqK64633BdEpLcmZ95f8URDo0eYP123lk5JJTgmqb/URDf0fTa+Yp5difXiThQKl4CnYPXmpQ3xnX1yCAUgsLAcBTEeTksKIaTsyAS11z1CZv8d4XDwJ9TlYwcw= 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 1571170745023612.3741068485858; Tue, 15 Oct 2019 13:19:05 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EDF7D18C427E; Tue, 15 Oct 2019 20:19:01 +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 C320860BE2; Tue, 15 Oct 2019 20:19:01 +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 832BF180B761; Tue, 15 Oct 2019 20:19:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9FK9IF8010288 for ; Tue, 15 Oct 2019 16:09:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8052460166; Tue, 15 Oct 2019 20:09:18 +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 760D760127; Tue, 15 Oct 2019 20:09:18 +0000 (UTC) Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E30F83082B3F; Tue, 15 Oct 2019 20:09:17 +0000 (UTC) Received: by mail-qt1-f194.google.com with SMTP id v52so32471247qtb.8; Tue, 15 Oct 2019 13:09:17 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c7:d25e:a983:2b3:2523:a41]) by smtp.gmail.com with ESMTPSA id t199sm10089455qke.36.2019.10.15.13.09.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2019 13:09:16 -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=CKl7Z2VuhTcFfDr6EUZbBVX7VUXevlj8RGBdlwE0HXo=; b=RRDVCZvcAiVQ16kC01U/11ZyINEw7gD4n4hG/Z0o6+DtKXADt1uF1eQUFvLyUA9j7Q TF8UEuumTytm8AnUkR717lSv7LEYAu+1uR9/73Mz7+/Rdl3iRzu+nAX7/gqfTCcDxnOi TVeoiradBVrGqG4ufDaNNquF+sehMW+wQ+vDh5WZsd23CcsEBw8wLue1PcaBofhe4652 6Sjsn3Nu6UXVt4/97hKB1hzMUA/HCLu1iV2cFsdcQDhMNuw39btJEgbcbfeH1FXwJX8z Md9dzVmgKZiWzoQoGvmWD2JTe2j6IisfY4+v5yYmTtl9f0ulJbmB1Q1WOfbeyGMQOfoB AF4Q== 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=CKl7Z2VuhTcFfDr6EUZbBVX7VUXevlj8RGBdlwE0HXo=; b=NCxm3zNOAxEBTO/jQb3k7Lvru6y/YrUL9QmTu651M8JryzSkEqH2Gjn7WEr99BV8FM wV4hZkJb6izM/h+mIu5+Y1FwhfadFACfYUjNOd9F4sZ/NPrpaG1xnhk5xBnnjUR9cFNq iiMTCLCARCCBd72AxJoeguOn+WFGWK8CDFTY0ieBIMQ7lHN1Kp0uLejoQVwB73WPamIj uLUYzOSKyVOaZKp/CHkcK6QmtEkuYCiqvqFJvb7IOzES6LbQGHcvokGzPs853OF0M0M7 4HA6BZEJywvqLo7sT/vIJLr0JYFxNavFUcWIfS7lA96YKoqbveTOQMQ88l48E+lvfRcg EIvg== X-Gm-Message-State: APjAAAWCGHTO/9Hyn6JjMtJsCsF8dgZyV18W5obTlUZG76qSeOeOdNlp uha2mhQUepCBxqSCIwN1kgAAOUHI X-Google-Smtp-Source: APXvYqy/F5YenIs+OJAf2R8jttGsNYUltEEwhtI/6QuDfirfxiqbOae71bksWt5HfYFhu/ZSJUqH+w== X-Received: by 2002:ac8:356e:: with SMTP id z43mr5186836qtb.88.1571170157122; Tue, 15 Oct 2019 13:09:17 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Tue, 15 Oct 2019 17:08:51 -0300 Message-Id: <20191015200852.15778-10-danielhb413@gmail.com> In-Reply-To: <20191015200852.15778-1-danielhb413@gmail.com> References: <20191015200852.15778-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 20:09:18 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Tue, 15 Oct 2019 20:09:18 +0000 (UTC) for IP:'209.85.160.194' DOMAIN:'mail-qt1-f194.google.com' HELO:'mail-qt1-f194.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.153 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS) 209.85.160.194 mail-qt1-f194.google.com 209.85.160.194 mail-qt1-f194.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.45 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , eskultet@redhat.com Subject: [libvirt] [PATCH v3 09/10] qemu_driver: VIR_AUTOFREE on other scalar pointers X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.62]); Tue, 15 Oct 2019 20:19:02 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This patch uses VIR_AUTOFREE on instances of 'unsigned int *' and 'unsigned long long *' found in qemu_driver.c. Suggested-by: Erik Skultety Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_driver.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fd7c8bb1be..6f283d2de3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1082,7 +1082,7 @@ qemuStateStop(void) size_t i; int state; virDomainPtr *domains =3D NULL; - unsigned int *flags =3D NULL; + VIR_AUTOFREE(unsigned int *) flags =3D NULL; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(q= emu_driver); =20 if (!(conn =3D virConnectOpen(cfg->uri))) @@ -1120,7 +1120,6 @@ qemuStateStop(void) virObjectUnref(domains[i]); VIR_FREE(domains); } - VIR_FREE(flags); =20 return ret; } @@ -20715,7 +20714,7 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver, size_t i; int ret =3D -1; virVcpuInfoPtr cpuinfo =3D NULL; - unsigned long long *cpuwait =3D NULL; + VIR_AUTOFREE(unsigned long long *) cpuwait =3D NULL; =20 if (virTypedParamListAddUInt(params, virDomainDefGetVcpus(dom->def), "vcpu.current") < 0) @@ -20780,7 +20779,6 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver, =20 cleanup: VIR_FREE(cpuinfo); - VIR_FREE(cpuwait); return ret; } =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 9 02:14:23 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=1571170829; cv=none; d=zoho.com; s=zohoarc; b=Z4iCWmGO7lxuVDnx8yYpWbpS+vCrb3L2yiD6gCMtC5YhO8Yqt5t6b7h64zuTDnkiQ8chUEuEUF8Zdw8jK/VmzEVr5yO/eu6Pmg6aLYADqclZs0s2J3KqHH4y4CCTn7b+vKZArozUL6+Iakfdat7TkhpCUIdHTvWmXFfWA72sMKk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571170829; 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=zDbYPgKjp+q9br54tSTtmi14Iw4svTDm5QfydNbi4Bs=; b=leTSAzzlBCtU3K4zPuSYseU0TZr4UAbHFIhJleZqt7+qExH/AIB3QJzKlXqrBdZg5IGIC5uKNkEO8nEL2HPIQTY5XPhiqYVLzYBQ6JPk5GOEn2Ib/zNeR8RSXu4ZiaTpGRRpLDRx5QAFrb/xw6cQTAoMupiTvnpyTzSoVPp0DFg= 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 15711708293945.567766904486007; Tue, 15 Oct 2019 13:20:29 -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 9F10B18CB90D; Tue, 15 Oct 2019 20:20:27 +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 7404B60468; Tue, 15 Oct 2019 20:20:27 +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 3311818005A0; Tue, 15 Oct 2019 20:20:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9FK9Our010346 for ; Tue, 15 Oct 2019 16:09:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id AEEE060605; Tue, 15 Oct 2019 20:09:24 +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 A44E660923; Tue, 15 Oct 2019 20:09:24 +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 0E65E3082B3F; Tue, 15 Oct 2019 20:09:22 +0000 (UTC) Received: by mail-qt1-f196.google.com with SMTP id u22so32480995qtq.13; Tue, 15 Oct 2019 13:09:22 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c7:d25e:a983:2b3:2523:a41]) by smtp.gmail.com with ESMTPSA id t199sm10089455qke.36.2019.10.15.13.09.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2019 13:09:18 -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=fEnzWEgjzu+LvT3n5lFkgWuYriOOTusjJCQ2b6s1uv0=; b=hHJvJ6xiKvyVyuDkIi7SjClJyB8K9AYd+D606m+9o4p5RCSw9saJxK7ZFWBhqwNMzM Yd6m0r6m7u3AZkDJQ/7pGfRPnIfRgoZq4REnQa/8faqKc+N1BEkDH9K1jg0W7xrsBZSP SXePIOpDITTix/bCz13LWZDTF1HrF+MZdHsX0kSWnz25+/YrxxNdXEZDgWfWYgbewYCJ P4CQQiohaSc27avbnZTKFwVnhREl76jFJWq2OGH2Qumiy8Mo3uEbacd+GJqHpwbi3ERe 8OWVOmQweDfxYUrn8EuXHX9Q5sBpxqXmMTXtzhhaa7EDtYdpi0A331R5OuoQOdxxKJrl 38+A== 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=fEnzWEgjzu+LvT3n5lFkgWuYriOOTusjJCQ2b6s1uv0=; b=q4z4kLHLYiljaKUIabAYv8ST4SVXpZLZm6i4mQGFVhhATbWA1ZUpWT/tr3vdyAoo6F Rqy3KGOkEmKGIKs7n98IuWW0///efqwntK3dTQBdCeLe6FkXs8mkZ79Qf7s9wTw9vp3K IBpDIDGLjCZRsWGepjKeKfIHRnmMQ8WhB4KKzcOGfmAFdy5hqDDrkfcJ4CxOtEbGsSwq ny5BlMZWxD27IlLARDRwsDAjWgp09psMg7DnldT9gguv8BNOOxsUGURnSlu9RUoKDB5L SWbJKDicAVT3MK6klHE2nkjw23GUmSh61V/jW/MqKjgnatWioBv2QL947AbTpai1a95F 82mQ== X-Gm-Message-State: APjAAAWvleiUfnvsmmeSIUJ3k4bXvT4HjdLtVhKyk1Kg7+3q2PArDn6c MOxXqo1fLY9WUHQkbHn5qc0sxg+t X-Google-Smtp-Source: APXvYqwstOs+Ys8KIoHXoa87Cwrcw00CDQmQ1+GBXXe+B0OCbm505m1UUzpETbZZQnUrbVr83evacw== X-Received: by 2002:ac8:33a1:: with SMTP id c30mr39928952qtb.315.1571170159255; Tue, 15 Oct 2019 13:09:19 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Tue, 15 Oct 2019 17:08:52 -0300 Message-Id: <20191015200852.15778-11-danielhb413@gmail.com> In-Reply-To: <20191015200852.15778-1-danielhb413@gmail.com> References: <20191015200852.15778-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 20:09:22 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Tue, 15 Oct 2019 20:09:22 +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.13 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , eskultet@redhat.com Subject: [libvirt] [PATCH v3 10/10] qemu_driver.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.6.2 (mx1.redhat.com [10.5.110.63]); Tue, 15 Oct 2019 20:20:28 +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_driver.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. After this patch, VIR_AUTO* macros are being used only in three functions: - qemuSecurityInit - qemuDomainSaveInternal - qemuDomainSaveImageStartVM The rest of the file was converted to GLib macros. Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_driver.c | 366 ++++++++++++++++++++--------------------- 1 file changed, 183 insertions(+), 183 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6f283d2de3..046f68ad40 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -202,7 +202,7 @@ qemuAutostartDomain(virDomainObjPtr vm, { virQEMUDriverPtr driver =3D opaque; int flags =3D 0; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); int ret =3D -1; =20 if (cfg->autoStartBypassCache) @@ -254,7 +254,7 @@ qemuSecurityChownCallback(const virStorageSource *src, int save_errno =3D 0; int ret =3D -1; int rv; - VIR_AUTOUNREF(virStorageSourcePtr) cpy =3D NULL; + g_autoptr(virStorageSource) cpy =3D NULL; =20 rv =3D virStorageFileSupportsSecurityDriver(src); if (rv <=3D 0) @@ -381,7 +381,7 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, void *data) { char *baseDir =3D (char *)data; - VIR_AUTOFREE(char *) snapDir =3D NULL; + g_autofree char *snapDir =3D NULL; DIR *dir =3D NULL; struct dirent *entry; virDomainSnapshotDefPtr def =3D NULL; @@ -392,7 +392,7 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, VIR_DOMAIN_SNAPSHOT_PARSE_DISKS | VIR_DOMAIN_SNAPSHOT_PARSE_INTERNAL); int ret =3D -1; - VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; int direrr; qemuDomainObjPrivatePtr priv; =20 @@ -418,8 +418,8 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, goto cleanup; =20 while ((direrr =3D virDirRead(dir, &entry, NULL)) > 0) { - VIR_AUTOFREE(char *) xmlStr =3D NULL; - VIR_AUTOFREE(char *) fullpath =3D NULL; + g_autofree char *xmlStr =3D NULL; + g_autofree char *fullpath =3D NULL; =20 /* NB: ignoring errors, so one malformed config doesn't kill the whole process */ @@ -497,7 +497,7 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm, void *data) { char *baseDir =3D (char *)data; - VIR_AUTOFREE(char *) chkDir =3D NULL; + g_autofree char *chkDir =3D NULL; DIR *dir =3D NULL; struct dirent *entry; virDomainCheckpointDefPtr def =3D NULL; @@ -505,7 +505,7 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm, virDomainMomentObjPtr current =3D NULL; unsigned int flags =3D VIR_DOMAIN_CHECKPOINT_PARSE_REDEFINE; int ret =3D -1; - VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; int direrr; qemuDomainObjPrivatePtr priv; =20 @@ -530,8 +530,8 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm, goto cleanup; =20 while ((direrr =3D virDirRead(dir, &entry, NULL)) > 0) { - VIR_AUTOFREE(char *) xmlStr =3D NULL; - VIR_AUTOFREE(char *) fullpath =3D NULL; + g_autofree char *xmlStr =3D NULL; + g_autofree char *fullpath =3D NULL; =20 /* NB: ignoring errors, so one malformed config doesn't kill the whole process */ @@ -648,11 +648,11 @@ qemuStateInitialize(bool privileged, virStateInhibitCallback callback, void *opaque) { - VIR_AUTOFREE(char *) driverConf =3D NULL; + g_autofree char *driverConf =3D NULL; virQEMUDriverConfigPtr cfg; uid_t run_uid =3D -1; gid_t run_gid =3D -1; - VIR_AUTOFREE(char *) memoryBackingPath =3D NULL; + g_autofree char *memoryBackingPath =3D NULL; bool autostart =3D true; size_t i; =20 @@ -816,7 +816,7 @@ qemuStateInitialize(bool privileged, goto error; =20 if (privileged) { - VIR_AUTOFREE(char *) channeldir =3D NULL; + g_autofree char *channeldir =3D NULL; =20 if (chown(cfg->libDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, @@ -921,7 +921,7 @@ qemuStateInitialize(bool privileged, * it, since we can't assume the root mount point has permissions that * will let our spawned QEMU instances use it. */ for (i =3D 0; i < cfg->nhugetlbfs; i++) { - VIR_AUTOFREE(char *) hugepagePath =3D NULL; + g_autofree char *hugepagePath =3D NULL; =20 hugepagePath =3D qemuGetBaseHugepagePath(&cfg->hugetlbfs[i]); =20 @@ -1048,8 +1048,8 @@ static void qemuNotifyLoadDomain(virDomainObjPtr vm, = int newVM, void *opaque) static int qemuStateReload(void) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; - VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; + g_autoptr(virCaps) caps =3D NULL; =20 if (!qemu_driver) return 0; @@ -1077,13 +1077,13 @@ static int qemuStateStop(void) { int ret =3D -1; - VIR_AUTOUNREF(virConnectPtr) conn =3D NULL; + g_autoptr(virConnect) conn =3D NULL; int numDomains =3D 0; size_t i; int state; virDomainPtr *domains =3D NULL; - VIR_AUTOFREE(unsigned int *) flags =3D NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(q= emu_driver); + g_autofree unsigned int *flags =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(qemu_dri= ver); =20 if (!(conn =3D virConnectOpen(cfg->uri))) goto cleanup; @@ -1177,7 +1177,7 @@ qemuStateCleanup(void) static int qemuConnectURIProbe(char **uri) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 if (qemu_driver =3D=3D NULL) return 0; @@ -1329,7 +1329,7 @@ qemuConnectGetMaxVcpus(virConnectPtr conn G_GNUC_UNUS= ED, const char *type) =20 static char *qemuConnectGetCapabilities(virConnectPtr conn) { virQEMUDriverPtr driver =3D conn->privateData; - VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; =20 if (virConnectGetCapabilitiesEnsureACL(conn) < 0) return NULL; @@ -1345,8 +1345,8 @@ static int qemuGetSchedInfo(unsigned long long *cpuWait, pid_t pid, pid_t tid) { - VIR_AUTOFREE(char *) proc =3D NULL; - VIR_AUTOFREE(char *) data =3D NULL; + g_autofree char *proc =3D NULL; + g_autofree char *data =3D NULL; char **lines =3D NULL; size_t i; int ret =3D -1; @@ -1419,7 +1419,7 @@ static int qemuGetProcessInfo(unsigned long long *cpuTime, int *lastCpu, long *vm_rss, pid_t pid, int tid) { - VIR_AUTOFREE(char *) proc =3D NULL; + g_autofree char *proc =3D NULL; FILE *pidinfo; unsigned long long usertime =3D 0, systime =3D 0; long rss =3D 0; @@ -1681,7 +1681,7 @@ static int qemuConnectGetVersion(virConnectPtr conn, = unsigned long *version) { virQEMUDriverPtr driver =3D conn->privateData; unsigned int qemuVersion =3D 0; - VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; =20 if (virConnectGetVersionEnsureACL(conn) < 0) return -1; @@ -1748,7 +1748,7 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr= conn, virObjectEventPtr event =3D NULL; virObjectEventPtr event2 =3D NULL; unsigned int start_flags =3D VIR_QEMU_PROCESS_START_COLD; - VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_ABI_UPDATE; =20 @@ -1836,7 +1836,7 @@ static int qemuDomainSuspend(virDomainPtr dom) qemuDomainObjPrivatePtr priv; virDomainPausedReason reason; int state; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 if (!(vm =3D qemuDomainObjFromDomain(dom))) return -1; @@ -1890,7 +1890,7 @@ static int qemuDomainResume(virDomainPtr dom) int ret =3D -1; int state; int reason; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 if (!(vm =3D qemuDomainObjFromDomain(dom))) return -1; @@ -2316,7 +2316,7 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom,= unsigned long newmem, virDomainDefPtr def; virDomainDefPtr persistentDef; int ret =3D -1, r; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG | @@ -2443,7 +2443,7 @@ static int qemuDomainSetMemoryStatsPeriod(virDomainPt= r dom, int period, virDomainDefPtr def; virDomainDefPtr persistentDef; int ret =3D -1, r; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); @@ -2888,7 +2888,7 @@ virQEMUSaveDataWrite(virQEMUSaveDataPtr data, size_t xml_len; size_t cookie_len =3D 0; size_t zerosLen =3D 0; - VIR_AUTOFREE(char *) zeros =3D NULL; + g_autofree char *zeros =3D NULL; =20 xml_len =3D strlen(data->xml) + 1; if (data->cookie) @@ -3012,7 +3012,7 @@ qemuOpenFile(virQEMUDriverPtr driver, int oflags, bool *needUnlink) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); uid_t user =3D cfg->user; gid_t group =3D cfg->group; bool dynamicOwnership =3D cfg->dynamicOwnership; @@ -3191,7 +3191,7 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, unsigned int flags, qemuDomainAsyncJob asyncJob) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); bool needUnlink =3D false; int ret =3D -1; int fd =3D -1; @@ -3272,7 +3272,7 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, int compressed, const char *compressedpath, const char *xmlin, unsigned int flags) { - VIR_AUTOFREE(char *) xml =3D NULL; + g_autofree char *xml =3D NULL; bool was_running =3D false; int ret =3D -1; virObjectEventPtr event =3D NULL; @@ -3474,10 +3474,10 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *p= ath, const char *dxml, { virQEMUDriverPtr driver =3D dom->conn->privateData; int compressed; - VIR_AUTOFREE(char *) compressedpath =3D NULL; + g_autofree char *compressedpath =3D NULL; int ret =3D -1; virDomainObjPtr vm =3D NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 virCheckFlags(VIR_DOMAIN_SAVE_BYPASS_CACHE | VIR_DOMAIN_SAVE_RUNNING | @@ -3516,7 +3516,7 @@ static char * qemuDomainManagedSavePath(virQEMUDriverPtr driver, virDomainObjPtr vm) { char *ret; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 if (virAsprintf(&ret, "%s/%s.save", cfg->saveDir, vm->def->name) < 0) return NULL; @@ -3528,11 +3528,11 @@ static int qemuDomainManagedSave(virDomainPtr dom, unsigned int flags) { virQEMUDriverPtr driver =3D dom->conn->privateData; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; int compressed; - VIR_AUTOFREE(char *) compressedpath =3D NULL; + g_autofree char *compressedpath =3D NULL; virDomainObjPtr vm; - VIR_AUTOFREE(char *) name =3D NULL; + g_autofree char *name =3D NULL; int ret =3D -1; =20 virCheckFlags(VIR_DOMAIN_SAVE_BYPASS_CACHE | @@ -3581,7 +3581,7 @@ qemuDomainManagedSaveLoad(virDomainObjPtr vm, void *opaque) { virQEMUDriverPtr driver =3D opaque; - VIR_AUTOFREE(char *) name =3D NULL; + g_autofree char *name =3D NULL; int ret =3D -1; =20 virObjectLock(vm); @@ -3625,7 +3625,7 @@ qemuDomainManagedSaveRemove(virDomainPtr dom, unsigne= d int flags) virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainObjPtr vm; int ret =3D -1; - VIR_AUTOFREE(char *) name =3D NULL; + g_autofree char *name =3D NULL; =20 virCheckFlags(0, -1); =20 @@ -3767,8 +3767,8 @@ doCoreDump(virQEMUDriverPtr driver, int directFlag =3D 0; unsigned int flags =3D VIR_FILE_WRAPPER_NON_BLOCKING; const char *memory_dump_format =3D NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); - VIR_AUTOFREE(char *) compressedpath =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); + g_autofree char *compressedpath =3D NULL; =20 /* We reuse "save" flag for "dump" here. Then, we can support the same * format in "save" and "dump". This path doesn't need the compression @@ -3973,13 +3973,13 @@ qemuDomainScreenshot(virDomainPtr dom, virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainObjPtr vm; qemuDomainObjPrivatePtr priv; - VIR_AUTOFREE(char *) tmp =3D NULL; + g_autofree char *tmp =3D NULL; int tmp_fd =3D -1; size_t i; const char *videoAlias =3D NULL; char *ret =3D NULL; bool unlink_tmp =3D false; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 virCheckFlags(0, NULL); =20 @@ -4078,11 +4078,11 @@ getAutoDumpPath(virQEMUDriverPtr driver, virDomainObjPtr vm) { char *dumpfile =3D NULL; - VIR_AUTOFREE(char *domname) =3D virDomainDefGetShortName(vm->def); + g_autofree char *domname =3D virDomainDefGetShortName(vm->def); char timestr[100]; struct tm time_info; time_t curtime =3D time(NULL); - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 if (!domname) return NULL; @@ -4106,8 +4106,8 @@ processWatchdogEvent(virQEMUDriverPtr driver, int action) { int ret; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); - VIR_AUTOFREE(char *) dumpfile =3D getAutoDumpPath(driver, vm); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); + g_autofree char *dumpfile =3D getAutoDumpPath(driver, vm); unsigned int flags =3D VIR_DUMP_MEMORY_ONLY; =20 if (!dumpfile) @@ -4153,8 +4153,8 @@ doCoreDumpToAutoDumpPath(virQEMUDriverPtr driver, unsigned int flags) { int ret =3D -1; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); - VIR_AUTOFREE(char *) dumpfile =3D getAutoDumpPath(driver, vm); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); + g_autofree char *dumpfile =3D getAutoDumpPath(driver, vm); =20 if (!dumpfile) return -1; @@ -4173,8 +4173,8 @@ qemuProcessGuestPanicEventInfo(virQEMUDriverPtr drive= r, virDomainObjPtr vm, qemuMonitorEventPanicInfoPtr info) { - VIR_AUTOFREE(char *) msg =3D qemuMonitorGuestPanicEventInfoFormatMsg(i= nfo); - VIR_AUTOFREE(char *) timestamp =3D virTimeStringNow(); + g_autofree char *msg =3D qemuMonitorGuestPanicEventInfoFormatMsg(info); + g_autofree char *timestamp =3D virTimeStringNow(); =20 if (msg && timestamp) qemuDomainLogAppendMessage(driver, vm, "%s: panic %s\n", timestamp= , msg); @@ -4189,7 +4189,7 @@ processGuestPanicEvent(virQEMUDriverPtr driver, { qemuDomainObjPrivatePtr priv =3D vm->privateData; virObjectEventPtr event =3D NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); bool removeInactive =3D false; unsigned long flags =3D VIR_DUMP_MEMORY_ONLY; =20 @@ -4270,7 +4270,7 @@ processDeviceDeletedEvent(virQEMUDriverPtr driver, virDomainObjPtr vm, const char *devAlias) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virDomainDeviceDef dev; =20 VIR_DEBUG("Removing device %s from domain %p %s", @@ -4504,7 +4504,7 @@ processNicRxFilterChangedEvent(virQEMUDriverPtr drive= r, virDomainObjPtr vm, const char *devAlias) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv =3D vm->privateData; virDomainDeviceDef dev; virDomainNetDefPtr def; @@ -4612,7 +4612,7 @@ processSerialChangedEvent(virQEMUDriverPtr driver, const char *devAlias, bool connected) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virDomainChrDeviceState newstate; virObjectEventPtr event =3D NULL; virDomainDeviceDef dev; @@ -4697,7 +4697,7 @@ processBlockJobEvent(virQEMUDriverPtr driver, int status) { virDomainDiskDefPtr disk; - VIR_AUTOUNREF(qemuBlockJobDataPtr) job =3D NULL; + g_autoptr(qemuBlockJobData) job =3D NULL; =20 if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) return; @@ -4814,7 +4814,7 @@ processRdmaGidStatusChangedEvent(virDomainObjPtr vm, { unsigned int prefix_len; virSocketAddr addr; - VIR_AUTOFREE(char *) addrStr =3D NULL; + g_autofree char *addrStr =3D NULL; int rc; =20 if (!virDomainObjIsActive(vm)) @@ -4958,7 +4958,7 @@ qemuDomainSetVcpusMax(virQEMUDriverPtr driver, virDomainDefPtr persistentDef, unsigned int nvcpus) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); unsigned int topologycpus; =20 if (def) { @@ -5073,7 +5073,7 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm, virDomainVcpuDefPtr vcpuinfo; qemuDomainObjPrivatePtr priv =3D vm->privateData; virCgroupPtr cgroup_vcpu =3D NULL; - VIR_AUTOFREE(char *) str =3D NULL; + g_autofree char *str =3D NULL; virObjectEventPtr event =3D NULL; char paramField[VIR_TYPED_PARAM_FIELD_LENGTH] =3D ""; virTypedParameterPtr eventParams =3D NULL; @@ -5156,7 +5156,7 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, int ret =3D -1; virBitmapPtr pcpumap =3D NULL; virDomainVcpuDefPtr vcpuinfo =3D NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); @@ -5275,9 +5275,9 @@ qemuDomainPinEmulator(virDomainPtr dom, int ret =3D -1; qemuDomainObjPrivatePtr priv; virBitmapPtr pcpumap =3D NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; virObjectEventPtr event =3D NULL; - VIR_AUTOFREE(char *) str =3D NULL; + g_autofree char *str =3D NULL; virTypedParameterPtr eventParams =3D NULL; int eventNparams =3D 0; int eventMaxparams =3D 0; @@ -5738,7 +5738,7 @@ qemuDomainPinIOThread(virDomainPtr dom, { int ret =3D -1; virQEMUDriverPtr driver =3D dom->conn->privateData; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; virDomainObjPtr vm; virDomainDefPtr def; virDomainDefPtr persistentDef; @@ -5747,7 +5747,7 @@ qemuDomainPinIOThread(virDomainPtr dom, virCgroupPtr cgroup_iothread =3D NULL; virObjectEventPtr event =3D NULL; char paramField[VIR_TYPED_PARAM_FIELD_LENGTH] =3D ""; - VIR_AUTOFREE(char *) str =3D NULL; + g_autofree char *str =3D NULL; virTypedParameterPtr eventParams =3D NULL; int eventNparams =3D 0; int eventMaxparams =3D 0; @@ -5870,7 +5870,7 @@ qemuDomainHotplugAddIOThread(virQEMUDriverPtr driver, unsigned int iothread_id) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - VIR_AUTOFREE(char *) alias =3D NULL; + g_autofree char *alias =3D NULL; size_t idx; int ret =3D -1; unsigned int orig_niothreads =3D vm->def->niothreadids; @@ -5990,7 +5990,7 @@ qemuDomainHotplugDelIOThread(virQEMUDriverPtr driver, { qemuDomainObjPrivatePtr priv =3D vm->privateData; size_t idx; - VIR_AUTOFREE(char *) alias =3D NULL; + g_autofree char *alias =3D NULL; int rc =3D -1; int ret =3D -1; unsigned int orig_niothreads =3D vm->def->niothreadids; @@ -6207,7 +6207,7 @@ qemuDomainChgIOThread(virQEMUDriverPtr driver, virDomainIOThreadAction action, unsigned int flags) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; qemuDomainObjPrivatePtr priv; virDomainDefPtr def; virDomainDefPtr persistentDef; @@ -6532,7 +6532,7 @@ static int qemuNodeGetSecurityModel(virConnectPtr con= n, { virQEMUDriverPtr driver =3D conn->privateData; char *p; - VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; =20 memset(secmodel, 0, sizeof(*secmodel)); =20 @@ -6586,7 +6586,7 @@ qemuDomainSaveImageUpdateDef(virQEMUDriverPtr driver, virDomainDefPtr ret =3D NULL; virDomainDefPtr newdef_migr =3D NULL; virDomainDefPtr newdef =3D NULL; - VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; =20 if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) goto cleanup; @@ -6663,7 +6663,7 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, virQEMUSaveHeaderPtr header; virDomainDefPtr def =3D NULL; int oflags =3D open_write ? O_RDWR : O_RDONLY; - VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; size_t xml_len; size_t cookie_len; =20 @@ -6808,7 +6808,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, virObjectEventPtr event; int intermediatefd =3D -1; virCommandPtr cmd =3D NULL; - VIR_AUTOFREE(char *) errbuf =3D NULL; + g_autofree char *errbuf =3D NULL; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); virQEMUSaveHeaderPtr header =3D &data->header; VIR_AUTOUNREF(qemuDomainSaveCookiePtr) cookie =3D NULL; @@ -6942,7 +6942,7 @@ qemuDomainRestoreFlags(virConnectPtr conn, qemuDomainObjPrivatePtr priv =3D NULL; virDomainDefPtr def =3D NULL; virDomainObjPtr vm =3D NULL; - VIR_AUTOFREE(char *) xmlout =3D NULL; + g_autofree char *xmlout =3D NULL; const char *newxml =3D dxml; int fd =3D -1; int ret =3D -1; @@ -7149,7 +7149,7 @@ qemuDomainManagedSaveGetXMLDesc(virDomainPtr dom, uns= igned int flags) { virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainObjPtr vm; - VIR_AUTOFREE(char *) path =3D NULL; + g_autofree char *path =3D NULL; char *ret =3D NULL; virDomainDefPtr def =3D NULL; int fd =3D -1; @@ -7196,7 +7196,7 @@ qemuDomainManagedSaveDefineXML(virDomainPtr dom, cons= t char *dxml, virQEMUDriverPtr driver =3D dom->conn->privateData; virConnectPtr conn =3D dom->conn; virDomainObjPtr vm; - VIR_AUTOFREE(char *) path =3D NULL; + g_autofree char *path =3D NULL; int ret =3D -1; =20 if (!(vm =3D qemuDomainObjFromDomain(dom))) @@ -7236,7 +7236,7 @@ qemuDomainObjRestore(virConnectPtr conn, qemuDomainObjPrivatePtr priv =3D vm->privateData; int fd =3D -1; int ret =3D -1; - VIR_AUTOFREE(char *) xmlout =3D NULL; + g_autofree char *xmlout =3D NULL; virQEMUSaveDataPtr data =3D NULL; virFileWrapperFdPtr wrapperFd =3D NULL; =20 @@ -7349,8 +7349,8 @@ static char *qemuConnectDomainXMLToNative(virConnectP= tr conn, virCommandPtr cmd =3D NULL; char *ret =3D NULL; size_t i; - 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 virCheckFlags(0, NULL); =20 @@ -7382,7 +7382,7 @@ static char *qemuConnectDomainXMLToNative(virConnectP= tr conn, for (i =3D 0; i < vm->def->nnets; i++) { virDomainNetDefPtr net =3D vm->def->nets[i]; unsigned int bootIndex =3D net->info.bootIndex; - VIR_AUTOFREE(char *) model =3D NULL; + g_autofree char *model =3D NULL; virMacAddr mac =3D net->mac; char *script =3D net->script; =20 @@ -7457,7 +7457,7 @@ qemuDomainObjStart(virConnectPtr conn, qemuDomainAsyncJob asyncJob) { int ret =3D -1; - VIR_AUTOFREE(char *) managed_save =3D NULL; + g_autofree char *managed_save =3D NULL; bool start_paused =3D (flags & VIR_DOMAIN_START_PAUSED) !=3D 0; bool autodestroy =3D (flags & VIR_DOMAIN_START_AUTODESTROY) !=3D 0; bool bypass_cache =3D (flags & VIR_DOMAIN_START_BYPASS_CACHE) !=3D 0; @@ -7596,8 +7596,8 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, virDomainObjPtr vm =3D NULL; virDomainPtr dom =3D NULL; virObjectEventPtr event =3D NULL; - 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; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_ABI_UPDATE; =20 @@ -7677,7 +7677,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainObjPtr vm; virObjectEventPtr event =3D NULL; - VIR_AUTOFREE(char *) name =3D NULL; + g_autofree char *name =3D NULL; int ret =3D -1; int nsnapshots; int ncheckpoints; @@ -8627,11 +8627,11 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr= vm, { qemuDomainObjPrivatePtr priv =3D vm->privateData; virDomainDefPtr vmdef =3D NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; virDomainDeviceDefPtr devConf =3D NULL; virDomainDeviceDefPtr devLive =3D NULL; int ret =3D -1; - VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_ABI_UPDATE; =20 @@ -8771,8 +8771,8 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr d= om, virDomainDeviceDefPtr dev =3D NULL, dev_copy =3D NULL; bool force =3D (flags & VIR_DOMAIN_DEVICE_MODIFY_FORCE) !=3D 0; int ret =3D -1; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; - VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; + g_autoptr(virCaps) caps =3D NULL; unsigned int parse_flags =3D 0; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | @@ -8882,8 +8882,8 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriverPtr = driver, unsigned int flags) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virCaps) caps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; virDomainDeviceDefPtr dev =3D NULL, dev_copy =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE; virDomainDefPtr vmdef =3D NULL; @@ -8976,8 +8976,8 @@ qemuDomainDetachDeviceAliasLiveAndConfig(virQEMUDrive= rPtr driver, unsigned int flags) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virCaps) caps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; virDomainDefPtr def =3D NULL; virDomainDefPtr persistentDef =3D NULL; virDomainDefPtr vmdef =3D NULL; @@ -9143,10 +9143,10 @@ static int qemuDomainSetAutostart(virDomainPtr dom, { virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainObjPtr vm; - VIR_AUTOFREE(char *) configFile =3D NULL; - VIR_AUTOFREE(char *) autostartLink =3D NULL; + g_autofree char *configFile =3D NULL; + g_autofree char *autostartLink =3D NULL; int ret =3D -1; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 if (!(vm =3D qemuDomainObjFromDomain(dom))) return -1; @@ -9455,7 +9455,7 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, virDomainDefPtr def; virDomainDefPtr persistentDef; int ret =3D -1; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; qemuDomainObjPrivatePtr priv; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | @@ -9766,7 +9766,7 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, bool set_swap_hard_limit =3D false; bool set_hard_limit =3D false; bool set_soft_limit =3D false; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; int rc; int ret =3D -1; qemuDomainObjPrivatePtr priv; @@ -9987,7 +9987,7 @@ qemuDomainSetNumaParamsLive(virDomainObjPtr vm, { virCgroupPtr cgroup_temp =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; - VIR_AUTOFREE(char *) nodeset_str =3D NULL; + g_autofree char *nodeset_str =3D NULL; virDomainNumatuneMemMode mode; size_t i =3D 0; int ret =3D -1; @@ -10054,7 +10054,7 @@ qemuDomainSetNumaParameters(virDomainPtr dom, virDomainDefPtr persistentDef; virDomainObjPtr vm =3D NULL; int ret =3D -1; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; qemuDomainObjPrivatePtr priv; virBitmapPtr nodeset =3D NULL; virDomainNumatuneMemMode config_mode; @@ -10179,7 +10179,7 @@ qemuDomainGetNumaParameters(virDomainPtr dom, virDomainObjPtr vm =3D NULL; virDomainNumatuneMemMode tmpmode =3D VIR_DOMAIN_NUMATUNE_MEM_STRICT; qemuDomainObjPrivatePtr priv; - VIR_AUTOFREE(char *) nodeset =3D NULL; + g_autofree char *nodeset =3D NULL; int ret =3D -1; virDomainDefPtr def =3D NULL; bool live =3D false; @@ -10269,7 +10269,7 @@ qemuDomainSetPerfEvents(virDomainPtr dom, virQEMUDriverPtr driver =3D dom->conn->privateData; size_t i; virDomainObjPtr vm =3D NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; qemuDomainObjPrivatePtr priv; virDomainDefPtr def; virDomainDefPtr persistentDef; @@ -10547,8 +10547,8 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr = dom, long long value_l; int ret =3D -1; int rc; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; - VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; + g_autoptr(virCaps) caps =3D NULL; qemuDomainObjPrivatePtr priv; virObjectEventPtr event =3D NULL; virTypedParameterPtr eventParams =3D NULL; @@ -11109,7 +11109,7 @@ qemuDomainBlockResize(virDomainPtr dom, virDomainObjPtr vm; qemuDomainObjPrivatePtr priv; int ret =3D -1; - VIR_AUTOFREE(char *) device =3D NULL; + g_autofree char *device =3D NULL; const char *nodename =3D NULL; virDomainDiskDefPtr disk =3D NULL; =20 @@ -11503,7 +11503,7 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, int ret =3D -1; virDomainNetDefPtr net =3D NULL, persistentNet =3D NULL; virNetDevBandwidthPtr bandwidth =3D NULL, newBandwidth =3D NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; bool inboundSpecified =3D false, outboundSpecified =3D false; int actualType; bool qosSupported =3D true; @@ -11889,7 +11889,7 @@ qemuDomainBlockPeek(virDomainPtr dom, virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainDiskDefPtr disk =3D NULL; virDomainObjPtr vm; - VIR_AUTOFREE(char *) tmpbuf =3D NULL; + g_autofree char *tmpbuf =3D NULL; ssize_t nread; int ret =3D -1; =20 @@ -11955,10 +11955,10 @@ qemuDomainMemoryPeek(virDomainPtr dom, { virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainObjPtr vm; - VIR_AUTOFREE(char *) tmp =3D NULL; + g_autofree char *tmp =3D NULL; int fd =3D -1, ret =3D -1; qemuDomainObjPrivatePtr priv; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 virCheckFlags(VIR_MEMORY_VIRTUAL | VIR_MEMORY_PHYSICAL, -1); =20 @@ -12192,7 +12192,7 @@ qemuStorageLimitsRefresh(virQEMUDriverPtr driver, int ret =3D -1; int fd =3D -1; struct stat sb; - VIR_AUTOFREE(char *) buf =3D NULL; + g_autofree char *buf =3D NULL; ssize_t len; =20 if ((rc =3D qemuDomainStorageOpenStat(driver, cfg, vm, src, &fd, &sb, @@ -12243,7 +12243,7 @@ qemuDomainGetBlockInfo(virDomainPtr dom, virDomainObjPtr vm; int ret =3D -1; virDomainDiskDefPtr disk; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; qemuBlockStatsPtr entry =3D NULL; =20 virCheckFlags(0, -1); @@ -12448,7 +12448,7 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, { virQEMUDriverPtr driver =3D dconn->privateData; virDomainDefPtr def =3D NULL; - VIR_AUTOFREE(char *) origname =3D NULL; + g_autofree char *origname =3D NULL; qemuMigrationParamsPtr migParams =3D NULL; int ret =3D -1; =20 @@ -12504,7 +12504,7 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, { virQEMUDriverPtr driver =3D dconn->privateData; virDomainDefPtr def =3D NULL; - VIR_AUTOFREE(char *) origname =3D NULL; + g_autofree char *origname =3D NULL; qemuMigrationParamsPtr migParams =3D NULL; int ret =3D -1; =20 @@ -12749,7 +12749,7 @@ qemuDomainMigratePrepare3(virConnectPtr dconn, { virQEMUDriverPtr driver =3D dconn->privateData; virDomainDefPtr def =3D NULL; - VIR_AUTOFREE(char *) origname =3D NULL; + g_autofree char *origname =3D NULL; qemuMigrationParamsPtr migParams =3D NULL; int ret =3D -1; =20 @@ -12800,7 +12800,7 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, unsigned int flags) { virQEMUDriverPtr driver =3D dconn->privateData; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virDomainDefPtr def =3D NULL; const char *dom_xml =3D NULL; const char *dname =3D NULL; @@ -12809,7 +12809,7 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, int nbdPort =3D 0; int nmigrate_disks; const char **migrate_disks =3D NULL; - VIR_AUTOFREE(char *) origname =3D NULL; + g_autofree char *origname =3D NULL; qemuMigrationParamsPtr migParams =3D NULL; int ret =3D -1; =20 @@ -12891,7 +12891,7 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, { virQEMUDriverPtr driver =3D dconn->privateData; virDomainDefPtr def =3D NULL; - VIR_AUTOFREE(char *) origname =3D NULL; + g_autofree char *origname =3D NULL; qemuMigrationParamsPtr migParams =3D NULL; int ret =3D -1; =20 @@ -12939,7 +12939,7 @@ qemuDomainMigratePrepareTunnel3Params(virConnectPtr= dconn, virDomainDefPtr def =3D NULL; const char *dom_xml =3D NULL; const char *dname =3D NULL; - VIR_AUTOFREE(char *) origname =3D NULL; + g_autofree char *origname =3D NULL; qemuMigrationParamsPtr migParams =3D NULL; int ret =3D -1; =20 @@ -13299,7 +13299,7 @@ qemuNodeDeviceDetachFlags(virNodeDevicePtr dev, unsigned domain =3D 0, bus =3D 0, slot =3D 0, function =3D 0; int ret =3D -1; virNodeDeviceDefPtr def =3D NULL; - VIR_AUTOFREE(char *) xml =3D NULL; + g_autofree char *xml =3D NULL; bool vfio =3D qemuHostdevHostSupportsPassthroughVFIO(); virHostdevManagerPtr hostdev_mgr =3D driver->hostdevMgr; =20 @@ -13366,7 +13366,7 @@ qemuNodeDeviceReAttach(virNodeDevicePtr dev) unsigned domain =3D 0, bus =3D 0, slot =3D 0, function =3D 0; int ret =3D -1; virNodeDeviceDefPtr def =3D NULL; - VIR_AUTOFREE(char *) xml =3D NULL; + g_autofree char *xml =3D NULL; virHostdevManagerPtr hostdev_mgr =3D driver->hostdevMgr; =20 xml =3D virNodeDeviceGetXMLDesc(dev, 0); @@ -13403,7 +13403,7 @@ qemuNodeDeviceReset(virNodeDevicePtr dev) unsigned domain =3D 0, bus =3D 0, slot =3D 0, function =3D 0; int ret =3D -1; virNodeDeviceDefPtr def =3D NULL; - VIR_AUTOFREE(char *) xml =3D NULL; + g_autofree char *xml =3D NULL; virHostdevManagerPtr hostdev_mgr =3D driver->hostdevMgr; =20 xml =3D virNodeDeviceGetXMLDesc(dev, 0); @@ -13438,7 +13438,7 @@ qemuConnectCompareCPU(virConnectPtr conn, unsigned int flags) { virQEMUDriverPtr driver =3D conn->privateData; - VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; bool failIncompatible; =20 virCheckFlags(VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE, @@ -13507,8 +13507,8 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn, { int ret =3D VIR_CPU_COMPARE_ERROR; virQEMUDriverPtr driver =3D conn->privateData; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); - VIR_AUTOUNREF(virQEMUCapsPtr) qemuCaps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUCaps) qemuCaps =3D NULL; bool failIncompatible; virCPUDefPtr hvCPU; virCPUDefPtr cpu =3D NULL; @@ -13719,9 +13719,9 @@ qemuConnectBaselineHypervisorCPU(virConnectPtr conn, unsigned int flags) { virQEMUDriverPtr driver =3D conn->privateData; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virCPUDefPtr *cpus =3D NULL; - VIR_AUTOUNREF(virQEMUCapsPtr) qemuCaps =3D NULL; + g_autoptr(virQEMUCaps) qemuCaps =3D NULL; virArch arch; virDomainVirtType virttype; virDomainCapsCPUModelsPtr cpuModels; @@ -14297,7 +14297,7 @@ qemuDomainMigrateSetMaxSpeed(virDomainPtr dom, virDomainObjPtr vm; qemuDomainObjPrivatePtr priv; bool postcopy =3D !!(flags & VIR_DOMAIN_MIGRATE_MAX_SPEED_POSTCOPY); - VIR_AUTOPTR(qemuMigrationParams) migParams =3D NULL; + g_autoptr(qemuMigrationParams) migParams =3D NULL; unsigned long long max; int ret =3D -1; =20 @@ -14375,7 +14375,7 @@ qemuDomainMigrationGetPostcopyBandwidth(virQEMUDriv= erPtr driver, virDomainObjPtr vm, unsigned long *bandwidth) { - VIR_AUTOPTR(qemuMigrationParams) migParams =3D NULL; + g_autoptr(qemuMigrationParams) migParams =3D NULL; unsigned long long bw; int rc; int ret =3D -1; @@ -14584,7 +14584,7 @@ qemuDomainSnapshotCreateInactiveExternal(virQEMUDri= verPtr driver, virCommandPtr cmd =3D NULL; const char *qemuImgPath; virBitmapPtr created =3D NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); int ret =3D -1; virBuffer buf =3D VIR_BUFFER_INITIALIZER; virDomainSnapshotDefPtr snapdef =3D virDomainSnapshotObjGetDef(snap); @@ -15266,7 +15266,7 @@ qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr d= river, { qemuDomainObjPrivatePtr priv =3D vm->privateData; virDomainDiskDefPtr persistdisk; - VIR_AUTOUNREF(virStorageSourcePtr) terminator =3D NULL; + g_autoptr(virStorageSource) terminator =3D NULL; bool supportsCreate; bool supportsBacking; int rc; @@ -15310,7 +15310,7 @@ qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr d= river, * block commit still works */ if (reuse) { if (supportsBacking) { - VIR_AUTOFREE(char *) backingStoreStr =3D NULL; + g_autofree char *backingStoreStr =3D NULL; =20 if (virStorageFileGetBackingStoreStr(dd->src, &backingStor= eStr) < 0) return -1; @@ -15495,7 +15495,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr= driver, qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - VIR_AUTOPTR(virJSONValue) actions =3D NULL; + g_autoptr(virJSONValue) actions =3D NULL; int rc; int ret =3D -1; size_t i; @@ -15585,14 +15585,14 @@ qemuDomainSnapshotCreateActiveExternal(virQEMUDri= verPtr driver, bool resume =3D false; int ret =3D -1; qemuDomainObjPrivatePtr priv =3D vm->privateData; - VIR_AUTOFREE(char *) xml =3D NULL; + g_autofree char *xml =3D NULL; virDomainSnapshotDefPtr snapdef =3D virDomainSnapshotObjGetDef(snap); bool memory =3D snapdef->memory =3D=3D VIR_DOMAIN_SNAPSHOT_LOCATION_EX= TERNAL; bool memory_unlink =3D false; int thaw =3D 0; /* 1 if freeze succeeded, -1 if freeze failed */ bool pmsuspended =3D false; int compressed; - VIR_AUTOFREE(char *) compressedpath =3D NULL; + g_autofree char *compressedpath =3D NULL; virQEMUSaveDataPtr data =3D NULL; =20 /* If quiesce was requested, then issue a freeze command, and a @@ -15763,7 +15763,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, { virQEMUDriverPtr driver =3D domain->conn->privateData; virDomainObjPtr vm =3D NULL; - VIR_AUTOFREE(char *) xml =3D NULL; + g_autofree char *xml =3D NULL; virDomainMomentObjPtr snap =3D NULL; virDomainSnapshotPtr snapshot =3D NULL; virDomainMomentObjPtr current =3D NULL; @@ -15772,11 +15772,11 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, unsigned int parse_flags =3D VIR_DOMAIN_SNAPSHOT_PARSE_DISKS; int align_location =3D VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL; bool align_match =3D true; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; - VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; + g_autoptr(virCaps) caps =3D NULL; qemuDomainObjPrivatePtr priv; virDomainSnapshotState state; - VIR_AUTOUNREF(virDomainSnapshotDefPtr) def =3D NULL; + g_autoptr(virDomainSnapshotDef) def =3D NULL; =20 virCheckFlags(VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE | VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT | @@ -16453,8 +16453,8 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr sna= pshot, int rc; virDomainDefPtr config =3D NULL; virDomainDefPtr inactiveConfig =3D NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; - VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; + g_autoptr(virCaps) caps =3D NULL; bool was_stopped =3D false; qemuDomainSaveCookiePtr cookie; virCPUDefPtr origCPU =3D NULL; @@ -16931,7 +16931,7 @@ qemuDomainSnapshotDelete(virDomainSnapshotPtr snaps= hot, virQEMUMomentReparent rep; bool metadata_only =3D !!(flags & VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_= ONLY); int external =3D 0; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 virCheckFlags(VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN | VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY | @@ -17484,8 +17484,8 @@ qemuDomainBlockPullCommon(virDomainObjPtr vm, virDomainDiskDefPtr disk; virStorageSourcePtr baseSource =3D NULL; unsigned int baseIndex =3D 0; - VIR_AUTOFREE(char *) basePath =3D NULL; - VIR_AUTOFREE(char *) backingPath =3D NULL; + g_autofree char *basePath =3D NULL; + g_autofree char *backingPath =3D NULL; unsigned long long speed =3D bandwidth; qemuBlockJobDataPtr job =3D NULL; bool persistjob =3D false; @@ -17602,10 +17602,10 @@ qemuDomainBlockJobAbort(virDomainPtr dom, { virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainDiskDefPtr disk =3D NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); bool pivot =3D !!(flags & VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT); bool async =3D !!(flags & VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC); - VIR_AUTOUNREF(qemuBlockJobDataPtr) job =3D NULL; + g_autoptr(qemuBlockJobData) job =3D NULL; virDomainObjPtr vm; qemuDomainObjPrivatePtr priv =3D NULL; bool blockdev =3D false; @@ -17770,7 +17770,7 @@ qemuDomainGetBlockJobInfo(virDomainPtr dom, virDomainDiskDefPtr disk; int ret =3D -1; qemuMonitorBlockJobInfo rawInfo; - VIR_AUTOUNREF(qemuBlockJobDataPtr) job =3D NULL; + g_autoptr(qemuBlockJobData) job =3D NULL; =20 virCheckFlags(VIR_DOMAIN_BLOCK_JOB_INFO_BANDWIDTH_BYTES, -1); =20 @@ -17830,7 +17830,7 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom, virDomainDiskDefPtr disk; int ret =3D -1; virDomainObjPtr vm; - VIR_AUTOFREE(char *) device =3D NULL; + g_autofree char *device =3D NULL; unsigned long long speed =3D bandwidth; =20 virCheckFlags(VIR_DOMAIN_BLOCK_JOB_SPEED_BANDWIDTH_BYTES, -1); @@ -18013,17 +18013,17 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, virDomainDiskDefPtr disk =3D NULL; int ret =3D -1; bool need_unlink =3D false; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); const char *format =3D NULL; bool mirror_reuse =3D !!(flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT); bool mirror_shallow =3D !!(flags & VIR_DOMAIN_BLOCK_COPY_SHALLOW); bool existing =3D mirror_reuse; qemuBlockJobDataPtr job =3D NULL; - VIR_AUTOUNREF(virStorageSourcePtr) mirror =3D mirrorsrc; + g_autoptr(virStorageSource) mirror =3D mirrorsrc; bool blockdev =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); bool mirror_initialized =3D false; - VIR_AUTOPTR(qemuBlockStorageSourceChainData) data =3D NULL; - VIR_AUTOPTR(qemuBlockStorageSourceChainData) crdata =3D NULL; + g_autoptr(qemuBlockStorageSourceChainData) data =3D NULL; + g_autoptr(qemuBlockStorageSourceChainData) crdata =3D NULL; virStorageSourcePtr n; virStorageSourcePtr mirrorBacking =3D NULL; int rc =3D 0; @@ -18292,7 +18292,7 @@ qemuDomainBlockRebase(virDomainPtr dom, const char = *path, const char *base, virDomainObjPtr vm; int ret =3D -1; unsigned long long speed =3D bandwidth; - VIR_AUTOUNREF(virStorageSourcePtr) dest =3D NULL; + g_autoptr(virStorageSource) dest =3D NULL; =20 virCheckFlags(VIR_DOMAIN_BLOCK_REBASE_SHALLOW | VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT | @@ -18492,12 +18492,12 @@ qemuDomainBlockCommit(virDomainPtr dom, unsigned int baseIndex =3D 0; virStorageSourcePtr top_parent =3D NULL; bool clean_access =3D false; - VIR_AUTOFREE(char *) topPath =3D NULL; - VIR_AUTOFREE(char *) basePath =3D NULL; - VIR_AUTOFREE(char *) backingPath =3D NULL; + g_autofree char *topPath =3D NULL; + g_autofree char *basePath =3D NULL; + g_autofree char *backingPath =3D NULL; unsigned long long speed =3D bandwidth; qemuBlockJobDataPtr job =3D NULL; - VIR_AUTOUNREF(virStorageSourcePtr) mirror =3D NULL; + g_autoptr(virStorageSource) mirror =3D NULL; const char *nodetop =3D NULL; const char *nodebase =3D NULL; bool persistjob =3D false; @@ -18954,7 +18954,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, virDomainDefPtr def =3D NULL; virDomainDefPtr persistentDef =3D NULL; virDomainBlockIoTuneInfo info; - VIR_AUTOFREE(char *) drivealias =3D NULL; + g_autofree char *drivealias =3D NULL; const char *qdevid =3D NULL; int ret =3D -1; size_t i; @@ -18964,7 +18964,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, bool supportMaxOptions =3D true; bool supportGroupNameOption =3D true; bool supportMaxLengthOptions =3D true; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; virObjectEventPtr event =3D NULL; virTypedParameterPtr eventParams =3D NULL; int eventNparams =3D 0; @@ -19301,7 +19301,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, virDomainDefPtr def =3D NULL; virDomainDefPtr persistentDef =3D NULL; virDomainBlockIoTuneInfo reply =3D {0}; - VIR_AUTOFREE(char *) drivealias =3D NULL; + g_autofree char *drivealias =3D NULL; const char *qdevid =3D NULL; int ret =3D -1; int maxparams; @@ -19532,8 +19532,8 @@ qemuDomainSetMetadata(virDomainPtr dom, { virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainObjPtr vm; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; - VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; + g_autoptr(virCaps) caps =3D NULL; int ret =3D -1; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | @@ -20373,10 +20373,10 @@ qemuConnectGetDomainCapabilities(virConnectPtr co= nn, unsigned int flags) { virQEMUDriverPtr driver =3D conn->privateData; - VIR_AUTOUNREF(virQEMUCapsPtr) qemuCaps =3D NULL; + g_autoptr(virQEMUCaps) qemuCaps =3D NULL; virArch arch; virDomainVirtType virttype; - VIR_AUTOUNREF(virDomainCapsPtr) domCaps =3D NULL; + g_autoptr(virDomainCaps) domCaps =3D NULL; =20 virCheckFlags(0, NULL); =20 @@ -20482,7 +20482,7 @@ qemuDomainGetResctrlMonData(virQEMUDriverPtr driver, virDomainResctrlDefPtr resctrl =3D NULL; virQEMUResctrlMonDataPtr res =3D NULL; char **features =3D NULL; - VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; size_t i =3D 0; size_t j =3D 0; =20 @@ -20714,7 +20714,7 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver, size_t i; int ret =3D -1; virVcpuInfoPtr cpuinfo =3D NULL; - VIR_AUTOFREE(unsigned long long *) cpuwait =3D NULL; + g_autofree unsigned long long *cpuwait =3D NULL; =20 if (virTypedParamListAddUInt(params, virDomainDefGetVcpus(dom->def), "vcpu.current") < 0) @@ -21080,7 +21080,7 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDefP= tr disk, } =20 for (n =3D disk->src; virStorageSourceIsBacking(n); n =3D n->backingSt= ore) { - VIR_AUTOFREE(char *) alias =3D NULL; + g_autofree char *alias =3D NULL; =20 if (blockdev) { frontendalias =3D QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName; @@ -21142,7 +21142,7 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr driver, virHashTablePtr nodestats =3D NULL; virJSONValuePtr nodedata =3D NULL; qemuDomainObjPrivatePtr priv =3D dom->privateData; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); bool blockdev =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); bool fetchnodedata =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_QUERY_NAMED_BLOCK_NODES)= && !blockdev; @@ -21367,8 +21367,8 @@ qemuDomainGetStats(virConnectPtr conn, virDomainStatsRecordPtr *record, unsigned int flags) { - VIR_AUTOFREE(virDomainStatsRecordPtr) tmp =3D NULL; - VIR_AUTOPTR(virTypedParamList) params =3D NULL; + g_autofree virDomainStatsRecordPtr tmp =3D NULL; + g_autoptr(virTypedParamList) params =3D NULL; size_t i; =20 if (VIR_ALLOC(params) < 0) @@ -21634,7 +21634,7 @@ qemuGetDHCPInterfaces(virDomainPtr dom, int n_leases =3D 0; size_t i, j; size_t ifaces_count =3D 0; - VIR_AUTOUNREF(virNetworkPtr) network =3D NULL; + g_autoptr(virNetwork) network =3D NULL; char macaddr[VIR_MAC_STRING_BUFLEN]; virDomainInterfacePtr iface =3D NULL; virNetworkDHCPLeasePtr *leases =3D NULL; @@ -21837,16 +21837,16 @@ qemuDomainRenameCallback(virDomainObjPtr vm, void *opaque) { virQEMUDriverPtr driver =3D opaque; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; virObjectEventPtr event_new =3D NULL; virObjectEventPtr event_old =3D NULL; int ret =3D -1; - VIR_AUTOFREE(char *) new_dom_name =3D NULL; - VIR_AUTOFREE(char *) old_dom_name =3D NULL; - VIR_AUTOFREE(char *) new_dom_cfg_file =3D NULL; - VIR_AUTOFREE(char *) old_dom_cfg_file =3D NULL; - VIR_AUTOFREE(char *) new_dom_autostart_link =3D NULL; - VIR_AUTOFREE(char *) old_dom_autostart_link =3D NULL; + g_autofree char *new_dom_name =3D NULL; + g_autofree char *old_dom_name =3D NULL; + g_autofree char *new_dom_cfg_file =3D NULL; + g_autofree char *old_dom_cfg_file =3D NULL; + g_autofree char *new_dom_autostart_link =3D NULL; + g_autofree char *old_dom_autostart_link =3D NULL; =20 virCheckFlags(0, ret); =20 @@ -22022,7 +22022,7 @@ qemuDomainGetGuestVcpusParams(virTypedParameterPtr = *params, virBitmapPtr vcpus =3D NULL; virBitmapPtr online =3D NULL; virBitmapPtr offlinable =3D NULL; - VIR_AUTOFREE(char *) tmp =3D NULL; + g_autofree char *tmp =3D NULL; size_t i; int ret =3D -1; =20 @@ -22291,7 +22291,7 @@ qemuDomainSetBlockThreshold(virDomainPtr dom, qemuDomainObjPrivatePtr priv; virDomainObjPtr vm =3D NULL; virStorageSourcePtr src; - VIR_AUTOFREE(char *) nodename =3D NULL; + g_autofree char *nodename =3D NULL; int rc; int ret =3D -1; =20 @@ -22379,7 +22379,7 @@ qemuDomainSetLifecycleAction(virDomainPtr dom, unsigned int flags) { virQEMUDriverPtr driver =3D dom->conn->privateData; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv; virDomainObjPtr vm =3D NULL; virDomainDefPtr def =3D NULL; @@ -22487,7 +22487,7 @@ qemuNodeGetSEVInfo(virConnectPtr conn, unsigned int flags) { virQEMUDriverPtr driver =3D conn->privateData; - VIR_AUTOUNREF(virQEMUCapsPtr) qemucaps =3D NULL; + g_autoptr(virQEMUCaps) qemucaps =3D NULL; =20 if (virNodeGetSevInfoEnsureACL(conn) < 0) return -1; @@ -22518,7 +22518,7 @@ qemuDomainGetSEVMeasurement(virQEMUDriverPtr driver, unsigned int flags) { int ret =3D -1; - VIR_AUTOFREE(char *) tmp =3D NULL; + g_autofree char *tmp =3D NULL; int maxpar =3D 0; =20 virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1); @@ -22604,7 +22604,7 @@ qemuDomainGetGuestInfo(virDomainPtr dom, qemuAgentPtr agent; int ret =3D -1; int maxparams =3D 0; - VIR_AUTOFREE(char *) hostname =3D NULL; + g_autofree char *hostname =3D NULL; unsigned int supportedTypes =3D types; int rc; =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list