From nobody Sun May 19 17:42:36 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=1569865703; cv=none; d=zoho.com; s=zohoarc; b=R3ebdZA3F8YQ0t4qh8aTohQm5Uvenc8gPMtvAmiPz8TokT/c8rYqgieEBGsywpgtQ8sEl7YA6Y//9Pxa2flZW3GibUi+OvedIwl3e7ELshFWYvg5NKPE/2euw75e0ZLp2ZWna/zQdm4GG5KiNiXNy5Ta3aQokabmQGqtYJMXaUk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569865703; 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:ARC-Authentication-Results; bh=qYelk/MjLNKO5e3IqYuobFRb6BZpItDHa7NP1qFuMog=; b=QDfhCLtG4wNY20ar3dXtE4Hn6rZfMZSnlQRKIzpuYbepu+et6hu0Qj4AJOxwa3fFOOjynAK2Es50mUxJAk9AzaOjJlZgNRibrJFVa07YZCyRiQbqOa8idyYrhC7s1C0STNRMeFT3LyFVvmhol3CtAa5K5jiVHs3BQg0zP2ddkXw= 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 1569865703652452.9354937969215; Mon, 30 Sep 2019 10:48:23 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D41D3A44ACB; Mon, 30 Sep 2019 17:48:21 +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 A9AA45D9C9; Mon, 30 Sep 2019 17:48:21 +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 3779D1803518; Mon, 30 Sep 2019 17:48:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x8UHmI0M029172 for ; Mon, 30 Sep 2019 13:48:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id C585219C6A; Mon, 30 Sep 2019 17:48:18 +0000 (UTC) Received: from mx1.redhat.com (ext-mx05.extmail.prod.ext.phx2.redhat.com [10.5.110.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2D17F19C58; Mon, 30 Sep 2019 17:48:16 +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 C6AA73DE0C; Mon, 30 Sep 2019 17:48:14 +0000 (UTC) Received: by mail-qt1-f196.google.com with SMTP id n7so18116626qtb.6; Mon, 30 Sep 2019 10:48:14 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:2a15:38ab:f72b:e1c1:67e7]) by smtp.gmail.com with ESMTPSA id v26sm10204538qta.88.2019.09.30.10.48.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2019 10:48:13 -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=hz46uz9/0T3Blc6deXHFz5RPkJtUXp2SzvQukzQnzl4=; b=VhwjpYWxCNiX//D/33Hdt+k9hBlggfASvJpejPw3c1tIGzqDI5qDxqvH2B9X1y/SAb uS1Ltdv80vXHX2/dJLzMvqwy/sij4YG2LFMHoAkolSz2kPXGFZ5hf3jqcZwXuLYVNU2q qxqnw9YFSreseNsABIqHTi28pRo1oFsvJ3awkHi+fjNXdG+/kOKhYkW5ih2LK5EeDGxY sJrXLjgPXhk7BfdKkR8PSVLsLUoRFBJ4dDh9U/73iubbnCAhW5oI/TQ4bfw2cZHmORkM vNlS2JUkUAQJvcb5NpHlUHCLnt+h1BAV2r19CJXj8sxka5YQZJQwRGcHTCBNQG92P7pe kgyw== 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=hz46uz9/0T3Blc6deXHFz5RPkJtUXp2SzvQukzQnzl4=; b=eOO3buABoqH0CxGo7E+UnqGVr1bGDOYBUNBd34gbvGyV+vWfEE1E3WjhS4s7H/E4YY OXQxFu3R6FTWO3KmTN2ZzNTelTBA3+Xp6nX3OTFm6TQYMBkCbS0MhKxB6sGhc03RQ7WK vgpzes9lgncdg8LJ2SiYMAHw4R2fPG3v4cHUZbnJhkLEsQxOMWTsWoDvCy9qiiXDqCoK pNBXvp5ZEQTqfN3vZ/hk3imzBOmGiiA/WJqIdZbPIFHvGdHJkNivm8N1IKn/Pxtcxhmf UK8jGqLtQkVL52yeHZEmYTHC1FLr1D4S2SJ4WHuPQ8opyfnRqTVQONDoDj2xrOD1ohtr Wjug== X-Gm-Message-State: APjAAAWP4b/GRO6T2jUw4D6zWKLNY3trK4BOiy8MNO4vf/Rq0cE9wvJx cYpALkYkSdySoN6kMU3yYIqzXeq2JzI= X-Google-Smtp-Source: APXvYqy7SOc/+sut6lCyb14TQryo4d+2e/pfTRPuICYEuqKoNLrFHPk//w84SVLeEshO70Ug1Gnhzw== X-Received: by 2002:a0c:e0c4:: with SMTP id x4mr21673712qvk.176.1569865693786; Mon, 30 Sep 2019 10:48:13 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 30 Sep 2019 14:47:54 -0300 Message-Id: <20190930174802.22426-2-danielhb413@gmail.com> In-Reply-To: <20190930174802.22426-1-danielhb413@gmail.com> References: <20190930174802.22426-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.29]); Mon, 30 Sep 2019 17:48:15 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 30 Sep 2019 17:48:15 +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.15 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS) 209.85.160.196 mail-qt1-f196.google.com 209.85.160.196 mail-qt1-f196.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.29 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , eskultet@redhat.com Subject: [libvirt] [PATCH v2 1/9] 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.68]); Mon, 30 Sep 2019 17:48:22 +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 8751145ea0..1e709c1e97 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 @@ -1069,7 +1066,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) @@ -1085,7 +1082,6 @@ qemuStateReload(void) caps, qemu_driver->xmlopt, qemuNotifyLoadDomain, qemu_driver); cleanup: - virObjectUnref(cfg); virObjectUnref(caps); return 0; } @@ -1107,7 +1103,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; @@ -1146,7 +1142,6 @@ qemuStateStop(void) } VIR_FREE(flags); virObjectUnref(conn); - virObjectUnref(cfg); =20 return ret; } @@ -1204,20 +1199,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, @@ -1882,7 +1873,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; @@ -1925,7 +1916,6 @@ static int qemuDomainSuspend(virDomainPtr dom) cleanup: virDomainObjEndAPI(&vm); =20 - virObjectUnref(cfg); return ret; } =20 @@ -1937,7 +1927,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; @@ -1983,7 +1973,6 @@ static int qemuDomainResume(virDomainPtr dom) =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -2364,7 +2353,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 | @@ -2469,7 +2458,6 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom,= unsigned long newmem, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -2492,7 +2480,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); @@ -2555,7 +2543,6 @@ static int qemuDomainSetMemoryStatsPeriod(virDomainPt= r dom, int period, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -3067,27 +3054,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 @@ -3252,7 +3233,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; @@ -3315,7 +3296,6 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, if (qemuFileWrapperFDClose(vm, wrapperFd) < 0) ret =3D -1; virFileWrapperFdFree(wrapperFd); - virObjectUnref(cfg); =20 if (ret < 0 && needUnlink) unlink(path); @@ -3543,7 +3523,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 | @@ -3570,7 +3550,6 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *pat= h, const char *dxml, cleanup: virDomainObjEndAPI(&vm); VIR_FREE(compressedpath); - virObjectUnref(cfg); return ret; } =20 @@ -3584,14 +3563,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 @@ -3599,7 +3575,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; @@ -3645,7 +3621,6 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int = flags) virDomainObjEndAPI(&vm); VIR_FREE(name); VIR_FREE(compressedpath); - virObjectUnref(cfg); =20 return ret; } @@ -3843,7 +3818,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 @@ -3925,7 +3900,6 @@ doCoreDump(virQEMUDriverPtr driver, if (ret !=3D 0) unlink(path); VIR_FREE(compressedpath); - virObjectUnref(cfg); return ret; } =20 @@ -4057,7 +4031,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 @@ -4149,7 +4123,6 @@ qemuDomainScreenshot(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -4162,7 +4135,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; @@ -4177,7 +4150,6 @@ getAutoDumpPath(virQEMUDriverPtr driver, domname, timestr)); =20 - virObjectUnref(cfg); VIR_FREE(domname); return dumpfile; } @@ -4188,7 +4160,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 @@ -4229,7 +4201,6 @@ processWatchdogEvent(virQEMUDriverPtr driver, qemuDomainObjEndAsyncJob(driver, vm); =20 cleanup: - virObjectUnref(cfg); VIR_FREE(dumpfile); } =20 @@ -4239,7 +4210,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) @@ -4252,7 +4223,6 @@ doCoreDumpToAutoDumpPath(virQEMUDriverPtr driver, "%s", _("Dump failed")); cleanup: VIR_FREE(dumpfile); - virObjectUnref(cfg); return ret; } =20 @@ -4281,13 +4251,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", @@ -4354,9 +4324,6 @@ processGuestPanicEvent(virQEMUDriverPtr driver, qemuDomainObjEndAsyncJob(driver, vm); if (removeInactive) qemuDomainRemoveInactiveJob(driver, vm); - - cleanup: - virObjectUnref(cfg); } =20 =20 @@ -4365,14 +4332,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"); @@ -4395,9 +4362,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 Sun May 19 17:42:36 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=1569865711; cv=none; d=zoho.com; s=zohoarc; b=HamaK9B6ZetTCKQ8l/X0y16sSnzyJbjl82LkADQi/9tbs741xv8lFq6DVQPYfZ+0ThWNID3gypWDOuANfWgN/8dL44ZS5sX4JpCvzfRpF8hwBUyOHtstl7Sep3p5fsxQAkm+PzKVrvLFdyGnL2a76Sq7SVUmPEpC4RLbQSsA/ks= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569865711; 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:ARC-Authentication-Results; bh=Ov1XOkeJwZ/gcn0REF7J0gpGI4nBQOXv5cyxEqHbJvQ=; b=ohtX3HFppuSVLxdBmLZvUwlgoR1N7laq0w84aEeJr2lHjYiP6Snik+xqIw3WjpNjgScoBacbncegua9YsimdNEstP2Wawo5WQ3l5FN25GGv2N7FR7g7pFg1+53dYtqsOmHXcbMprq0OBVz+sfqMov93kmIgPhgNGWQmJWKhghbk= 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 1569865711886372.5979481141063; Mon, 30 Sep 2019 10:48:31 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0FADE3004144; Mon, 30 Sep 2019 17:48:30 +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 E2A1B5D9D5; Mon, 30 Sep 2019 17:48:29 +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 AC32F4EDA5; Mon, 30 Sep 2019 17:48:29 +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 x8UHmJ7B029182 for ; Mon, 30 Sep 2019 13:48:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id D740C1001B13; Mon, 30 Sep 2019 17:48:19 +0000 (UTC) Received: from mx1.redhat.com (ext-mx17.extmail.prod.ext.phx2.redhat.com [10.5.110.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7000C1001281; Mon, 30 Sep 2019 17:48:17 +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 33BEB3082E6E; Mon, 30 Sep 2019 17:48:16 +0000 (UTC) Received: by mail-qt1-f193.google.com with SMTP id l3so18130701qtr.4; Mon, 30 Sep 2019 10:48:16 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:2a15:38ab:f72b:e1c1:67e7]) by smtp.gmail.com with ESMTPSA id v26sm10204538qta.88.2019.09.30.10.48.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2019 10:48:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=X5eTRFI3TOdma19AtEnnNJtC3FjuRYp4qIxWKO92XfM=; b=UqBBYB2wvUKvkPq6HfXTd/O31wuBCt/wRGftU2sC+IsBJ6p7d0ttnJixjHyn/MYNc6 hRUHkTGbMoog2ni5/ev7AdNGMVnnHg4Op9fLKuQNceRSQCWhbKPR62I24fEqDXVzbw03 qQSNb55j4HySGn+0H0rYK2AxLgvyRZcthEbSsbkT/XiiKD3ggXy8p7Rg+ASmB1++mTzE Tc/6phMY42jKltmfwymEwmjpSjspuu6lSzso71u1CwhZ/+tOxCr2be0wHfd6s+4olT/w TYHYEtVlA2V2YLOd4mJtD3SQcyTT4XO0uDw+mKVvPnPQl7EGZqf35KBD0JTDhGPvZw76 upsw== 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=X5eTRFI3TOdma19AtEnnNJtC3FjuRYp4qIxWKO92XfM=; b=C0ToJ+ew6pxlOefsVF8xl6kxFzQMTPyrSW7SB9wuT6s+3zRn4GBIrUHsAXr1AKCTIm S8A7v47ZqAhSHAcBZgXLXHz/x5+zkwOVwAdR1GOu5zxTDo00e39qomotWeAv273mXAsb jyOXfeqXmxNFUisJDtiohetCF6GJoIQtIqroy5TTfa9fDtRChYxiSRNSArrO4cyzEL+C XF1WWkdIm5V6F6PhLVrrJtviyI6fS86P84qX1kOVk6tcsngAbMpAMV+U9t2S077Hpoyq tYDYp6IX8r/Fkj9BlrGrz6rmDREAnRGg0r69cgLrd7ONINQ+e7GcPnkIAz8iWCxgGp8w A4PQ== X-Gm-Message-State: APjAAAXfIXOXgnhbK5UEonp6gNUVSi8x0T12N8B+RWMWcR/8Jyu9d1cj rbC+JIBYC1uMxdGnEMUZ4nL8DDfZe60= X-Google-Smtp-Source: APXvYqy0wG3vXXUEZJ4eCgbJekokM+4wreQoqG+MkhLd8lCjCs1ew6ztHvoD6D/tzeMefurVuW0b2A== X-Received: by 2002:ac8:458e:: with SMTP id l14mr25841804qtn.153.1569865695258; Mon, 30 Sep 2019 10:48:15 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 30 Sep 2019 14:47:55 -0300 Message-Id: <20190930174802.22426-3-danielhb413@gmail.com> In-Reply-To: <20190930174802.22426-1-danielhb413@gmail.com> References: <20190930174802.22426-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.46]); Mon, 30 Sep 2019 17:48:16 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Mon, 30 Sep 2019 17:48:16 +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.15 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS) 209.85.160.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.46 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 v2 2/9] 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Mon, 30 Sep 2019 17:48:30 +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. 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 1e709c1e97..8321fbbe8b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4566,7 +4566,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; @@ -4665,7 +4665,6 @@ processNicRxFilterChangedEvent(virQEMUDriverPtr drive= r, cleanup: virNetDevRxFilterFree(hostFilter); virNetDevRxFilterFree(guestFilter); - virObjectUnref(cfg); } =20 =20 @@ -4675,7 +4674,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; @@ -4708,7 +4707,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"); @@ -4749,9 +4748,6 @@ processSerialChangedEvent(virQEMUDriverPtr driver, =20 endjob: qemuDomainObjEndJob(driver, vm); - - cleanup: - virObjectUnref(cfg); } =20 =20 @@ -5024,21 +5020,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 && @@ -5047,23 +5042,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 @@ -5228,7 +5219,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); @@ -5285,7 +5276,6 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, cleanup: virDomainObjEndAPI(&vm); virBitmapFree(pcpumap); - virObjectUnref(cfg); return ret; } =20 @@ -5348,7 +5338,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; @@ -5442,7 +5432,6 @@ qemuDomainPinEmulator(virDomainPtr dom, VIR_FREE(str); virBitmapFree(pcpumap); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -5813,7 +5802,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; @@ -5937,7 +5926,6 @@ qemuDomainPinIOThread(virDomainPtr dom, VIR_FREE(str); virBitmapFree(pcpumap); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -6286,7 +6274,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; @@ -6297,7 +6285,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; @@ -6385,8 +6373,6 @@ qemuDomainChgIOThread(virQEMUDriverPtr driver, endjob: qemuDomainObjEndJob(driver, vm); =20 - cleanup: - virObjectUnref(cfg); return ret; } =20 @@ -6897,7 +6883,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 @@ -7019,7 +7005,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 @@ -7444,13 +7429,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 @@ -7510,7 +7493,6 @@ static char *qemuConnectDomainXMLToNative(virConnectP= tr conn, virCommandFree(cmd); virObjectUnref(vm); virObjectUnref(caps); - virObjectUnref(cfg); return ret; } =20 @@ -7697,7 +7679,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; @@ -7707,8 +7689,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 @@ -7765,7 +7745,6 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(caps); - virObjectUnref(cfg); return dom; } =20 @@ -7786,7 +7765,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, int ret =3D -1; int nsnapshots; int ncheckpoints; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; =20 virCheckFlags(VIR_DOMAIN_UNDEFINE_MANAGED_SAVE | VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA | @@ -7906,7 +7885,6 @@ qemuDomainUndefineFlags(virDomainPtr dom, VIR_FREE(name); virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(cfg); return ret; } =20 @@ -8726,7 +8704,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; @@ -8811,7 +8789,6 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr v= m, virDomainDefFree(vmdef); virDomainDeviceDefFree(devConf); virDomainDeviceDefFree(devLive); - virObjectUnref(cfg); virObjectUnref(caps); =20 return ret; @@ -8872,7 +8849,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 @@ -8973,7 +8950,6 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr d= om, virDomainDeviceDefFree(dev); virDomainObjEndAPI(&vm); virObjectUnref(caps); - virObjectUnref(cfg); virNWFilterUnlockFilterUpdates(); return ret; } @@ -8986,7 +8962,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; @@ -9065,7 +9041,6 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriverPtr = driver, =20 cleanup: virObjectUnref(caps); - virObjectUnref(cfg); if (dev !=3D dev_copy) virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); @@ -9082,7 +9057,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; @@ -9143,7 +9118,6 @@ qemuDomainDetachDeviceAliasLiveAndConfig(virQEMUDrive= rPtr driver, ret =3D 0; cleanup: virDomainDefFree(vmdef); - virObjectUnref(cfg); virObjectUnref(caps); return ret; } @@ -9252,7 +9226,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; @@ -9317,7 +9291,6 @@ static int qemuDomainSetAutostart(virDomainPtr dom, VIR_FREE(configFile); VIR_FREE(autostartLink); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -9564,7 +9537,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 | @@ -9764,7 +9737,6 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -9876,7 +9848,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; @@ -10001,7 +9973,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 Sun May 19 17:42:36 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=1569865716; cv=none; d=zoho.com; s=zohoarc; b=NZVgg4f0gHMMGm+Sku2ayamfCxr5auP19pAUvr8lcGHO5Jhtri6cZYMqCM5vMxXI1nkLuw4HPa/2v6clSGxY+gzS30OEiTm5enBqaoTb/EkHg2VvnPK4RYGcH/3cY5DGsPmpLFHV3hGRSlwsnCVVUaXQGFKZZ8F45JWMo1+Qmu0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569865716; 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:ARC-Authentication-Results; bh=OKMqaVO+AnFwF9kkPl7hNIHr6g2xJ9ETbFrBA3zncnE=; b=lwsN8Sj3PVU5yH1MUUzSLHt7PYrwmR8eIThU2BPYnIsjWp22uDhsgCviC/F2AOvy3Wsn8EodTjgilQwk3gnBrCaMxUMnuxptK5bMqIYD21VzpXVHwSG6yv8evDREL9hX3NrV7pz6MPn796Ab3QcUjcEnaQFTiklmg9bDNfsA6Ks= 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 1569865716355908.7527631250897; Mon, 30 Sep 2019 10:48:36 -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 9177EC049D7C; Mon, 30 Sep 2019 17:48:34 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6BA936012D; Mon, 30 Sep 2019 17:48:34 +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 2216E1803B4A; Mon, 30 Sep 2019 17:48:34 +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 x8UHmLCv029200 for ; Mon, 30 Sep 2019 13:48:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id BD4CD5D71C; Mon, 30 Sep 2019 17:48:21 +0000 (UTC) Received: from mx1.redhat.com (ext-mx18.extmail.prod.ext.phx2.redhat.com [10.5.110.47]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4097E5D717; Mon, 30 Sep 2019 17:48:19 +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 33B953092775; Mon, 30 Sep 2019 17:48:18 +0000 (UTC) Received: by mail-qt1-f195.google.com with SMTP id u40so18108413qth.11; Mon, 30 Sep 2019 10:48:18 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:2a15:38ab:f72b:e1c1:67e7]) by smtp.gmail.com with ESMTPSA id v26sm10204538qta.88.2019.09.30.10.48.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2019 10:48: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=zfRDj3Qjh2iBkFBfbOwzsuz5Q39rcT7eKX8vVT4KIic=; b=nANn4d61XQVbv3EGp5yVpo2mHWJUgY/kVTgOIx5XC4dVYUwlcOyefSkixIjTcbGgo/ WFMxLSzK6JCOdyIU+vMwQ5d1tT5wkJXDVLeAkNbJ8hQ40V3BCZRHZU0qrz7Y4J+gi7ba rLqvF/Mwhrd8agg3wsbClqgN1mWGrFI0C2eQ9dxJCj5TIX0GQAEpgaJojJ8ZWwgn/WPw 2Z2ohB14hoFg8qcUfU5LEyHTDMUNnscgFkmxt2nyTHqplMusmQfjpx23eWPP//Cm3VW8 P7LDp1ewAJSXkPn7X4td5nEHQrTG7DdChFz6Eo0McFlERNjumr3yD4AwvguQ8jPRUx9g be9A== 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=zfRDj3Qjh2iBkFBfbOwzsuz5Q39rcT7eKX8vVT4KIic=; b=G14uozbSDmCW1aYtOwdhCFZpWJg/WUhXhllP51u9pDSwN4QKfgsBO6HFUseOawkA82 KHNpyqwEb9yNG8wb7qhpJABgcXpvxHtfK/aTr05r286Zx3dCUvEJU9KyyNsh273auQXF v8U/xQ51GheqVV66O49apv13BVuNKxmLcpWHAm5dKpNBUgf2daXt7NfLq5Qzy0u/T/Ht U525JKoGdP0+87ItPHX7RlunHhn+2F+Ou1OKKT/pbiFnH75mM4BfzXbe07C120JakAZV 1Yr/nkzVB10MT4adjaU9rbXSbTI833+Nyq0y6c4h0neD1EtbJA8503YVulC0p359nn3k kwkw== X-Gm-Message-State: APjAAAV4XyJteLzkKfoWtRtDdzucYHT+tj7UNt8Wo6YrgmMuq+lln38c UrB9WzfWjd4m4tPTPO0llH+uIUXnWJc= X-Google-Smtp-Source: APXvYqzVhJetnsZBdV7yWGzJ0U208bLfR9pRRHRgQ5WPe46KbqMyZjueA3WHfvQXDtZiNTbHYK/ORg== X-Received: by 2002:a0c:a988:: with SMTP id a8mr20852075qvb.34.1569865697148; Mon, 30 Sep 2019 10:48:17 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 30 Sep 2019 14:47:56 -0300 Message-Id: <20190930174802.22426-4-danielhb413@gmail.com> In-Reply-To: <20190930174802.22426-1-danielhb413@gmail.com> References: <20190930174802.22426-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.47]); Mon, 30 Sep 2019 17:48:18 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Mon, 30 Sep 2019 17:48:18 +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.15 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS) 209.85.160.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.47 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 v2 3/9] 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 30 Sep 2019 17:48:35 +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 8321fbbe8b..2204b2bf5d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10137,7 +10137,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; @@ -10249,7 +10249,6 @@ qemuDomainSetNumaParameters(virDomainPtr dom, cleanup: virBitmapFree(nodeset); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -10354,7 +10353,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; @@ -10446,7 +10445,6 @@ qemuDomainSetPerfEvents(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -10633,7 +10631,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; @@ -10927,7 +10925,6 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr = dom, if (eventNparams) virTypedParamsFree(eventParams, eventNparams); virObjectUnref(caps); - virObjectUnref(cfg); return ret; } #undef SCHED_RANGE_CHECK @@ -11592,7 +11589,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; @@ -11787,7 +11784,6 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, virNetDevBandwidthFree(bandwidth); virNetDevBandwidthFree(newBandwidth); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -12049,7 +12045,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 @@ -12120,7 +12116,6 @@ qemuDomainMemoryPeek(virDomainPtr dom, unlink(tmp); VIR_FREE(tmp); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -12337,7 +12332,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); @@ -12426,7 +12421,6 @@ qemuDomainGetBlockInfo(virDomainPtr dom, cleanup: VIR_FREE(entry); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -12898,7 +12892,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; @@ -12972,7 +12966,6 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, VIR_FREE(migrate_disks); VIR_FREE(origname); virDomainDefFree(def); - virObjectUnref(cfg); return ret; } =20 @@ -14542,7 +14535,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); @@ -14630,7 +14623,6 @@ qemuDomainSnapshotCreateInactiveExternal(virQEMUDri= verPtr driver, } } virBitmapFree(created); - virObjectUnref(cfg); =20 return ret; } @@ -15732,7 +15724,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; @@ -16013,7 +16005,6 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, virDomainObjEndAPI(&vm); VIR_FREE(xml); virObjectUnref(caps); - virObjectUnref(cfg); return snapshot; } =20 @@ -16424,7 +16415,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; @@ -16854,7 +16845,6 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr sna= pshot, virObjectEventStateQueue(driver->domainEventState, event2); virDomainObjEndAPI(&vm); virObjectUnref(caps); - virObjectUnref(cfg); virNWFilterUnlockFilterUpdates(); virCPUDefFree(origCPU); virDomainDefFree(config); @@ -16915,7 +16905,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 | @@ -17007,7 +16997,6 @@ qemuDomainSnapshotDelete(virDomainSnapshotPtr snaps= hot, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -17587,7 +17576,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; @@ -17692,7 +17681,6 @@ qemuDomainBlockJobAbort(virDomainPtr dom, =20 cleanup: virObjectUnref(job); - virObjectUnref(cfg); virDomainObjEndAPI(&vm); return ret; } @@ -18952,7 +18940,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; @@ -19273,7 +19261,6 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, virDomainObjEndAPI(&vm); if (eventNparams) virTypedParamsFree(eventParams, eventNparams); - virObjectUnref(cfg); return ret; } =20 @@ -19523,7 +19510,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 @@ -19559,7 +19546,6 @@ qemuDomainSetMetadata(virDomainPtr dom, cleanup: virDomainObjEndAPI(&vm); virObjectUnref(caps); - virObjectUnref(cfg); return ret; } =20 @@ -21146,7 +21132,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; @@ -21204,7 +21190,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr driver, virHashFree(stats); virHashFree(nodestats); virJSONValueFree(nodedata); - virObjectUnref(cfg); return ret; } =20 @@ -21843,7 +21828,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; @@ -21932,7 +21917,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: @@ -22395,7 +22379,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; @@ -22452,7 +22436,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 Sun May 19 17:42:36 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=1569865711; cv=none; d=zoho.com; s=zohoarc; b=jjKrLDBfGXsJ4wVejnNgc0hXdIWqX3Leuu2cjzm8oBk8LmghMe3N4cpVfvh26ugOgFxCHZ5eJmQf3lDV9eslj4OznYrEUh+hRQ/UmDsdsDhN54gRlpbcUcmVd9oZf5xCSO+IbppEcwWQ4hJuVIZmq4oZ6FLrfOCI5JB5eMEcv98= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569865711; 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:ARC-Authentication-Results; bh=jPlwXzHqnHdaxSl1lKZGZ600QoKVAkWO/7+/Qrop0Pk=; b=OhG89GZEUAr0SeDxRcAmsAR38olVqRXCPGnxrkjdqaUWQLLwrEonAlWxjqX6fuXQd33bKWb0aTgvQYpvlWAa4z+901bZrfjvd5Kzl2dlN06rNK247IqSMxFc76pLiZmyayQefOlwAOBCDRFhos7m9NOpfiMKkX/B0UQ5Vbk0SZ8= 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 156986571164156.93367770071484; Mon, 30 Sep 2019 10:48:31 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 23C1BA44AE9; Mon, 30 Sep 2019 17:48:30 +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 F35C75D9E1; Mon, 30 Sep 2019 17:48:29 +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 B8FFD18037CD; Mon, 30 Sep 2019 17:48:29 +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 x8UHmLSk029194 for ; Mon, 30 Sep 2019 13:48:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6B5486012C; Mon, 30 Sep 2019 17:48:21 +0000 (UTC) Received: from mx1.redhat.com (ext-mx04.extmail.prod.ext.phx2.redhat.com [10.5.110.28]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6205C60126; Mon, 30 Sep 2019 17:48:21 +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 35C03882EA; Mon, 30 Sep 2019 17:48:20 +0000 (UTC) Received: by mail-qt1-f193.google.com with SMTP id u40so18108554qth.11; Mon, 30 Sep 2019 10:48:20 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:2a15:38ab:f72b:e1c1:67e7]) by smtp.gmail.com with ESMTPSA id v26sm10204538qta.88.2019.09.30.10.48.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2019 10:48: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=FZMmuTpRlhM62AdXnogj5lrQVXZxzZadut0jB2ilp/Q=; b=C4c/BtjzLszGZgS2PPoQFOkzfHEswqWX4stfOINksX6Y826N4usD9nI9xViJmpWsNw pFcxPJEQzIeqIgaqE6qmFbbxp4v6sdjSDV53EmJMD15ftaEfgV2J1+7NpAq0n0ovs5BF L2E/vhvnracKH5LXa0RDwlAsz1k1PUAkblkji9MHmoXgabsoRuWRn4NesVICMp0Nbe7r zZWx875hMOhBB1Q5XJHr1NtMHA6JioosV3IU6LVOVi1uqtnOF/eahdvjubuES+MzeBFI pbiKAAPAMuAC/w2Kpvr/WwLXpd/YJydRvrMG8PXqFo0yeIB1qYMrltXuubPud9ysjX9D Y2MQ== 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=FZMmuTpRlhM62AdXnogj5lrQVXZxzZadut0jB2ilp/Q=; b=hGIC0OhMRV+au6Csr1T2zNUq1DWYTf7MSIULXz7aLkPYKJg9fAswXjJNvIL20hA945 DOoJ9zrN3YVGPcArsL2fO3vyCJRUsoZ+DNtVQacfUP0MvpI/F7VrL64ajJg0dpKZ8c4A gqgInT6iohlRLCzRtGO2wsr9SJLHgNjZNzQHu2CRf30oVJfXjj/qeGPw3DNZq92fNC3x nCerM4Gnfedogt9qL88+nGxFkWT2ppSzQOK4vo4yvNAJAKrlval0PBxeKe69aAPflPe2 H1620PhkxInibn/RHcZBqkGkD3e+GRBEvuTzGRxNH6mkkgqdlq8tRk7S4LBrlBM6e9fI pueA== X-Gm-Message-State: APjAAAUBeneEKzOiD5/h6JwHV+IzP+Xnmqsm6HNcexBUANlLEBUfX+Cz +sD7UxcgbvLDjOaEL25bsqGf5jiKSL8= X-Google-Smtp-Source: APXvYqxmht0cvR4FDohQ48vT6lK+K1qd2e80gJlXAzALlFOpdl3hznChOaaKODfTz/ok4egyMz4z7A== X-Received: by 2002:ac8:3b52:: with SMTP id r18mr26669252qtf.62.1569865699140; Mon, 30 Sep 2019 10:48:19 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 30 Sep 2019 14:47:57 -0300 Message-Id: <20190930174802.22426-5-danielhb413@gmail.com> In-Reply-To: <20190930174802.22426-1-danielhb413@gmail.com> References: <20190930174802.22426-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.28]); Mon, 30 Sep 2019 17:48:20 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 30 Sep 2019 17:48:20 +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.15 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS) 209.85.160.193 mail-qt1-f193.google.com 209.85.160.193 mail-qt1-f193.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.28 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 v2 4/9] 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.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.68]); Mon, 30 Sep 2019 17:48:30 +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 2204b2bf5d..9958164788 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; } @@ -1067,13 +1065,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, @@ -1081,8 +1079,6 @@ qemuStateReload(void) cfg->autostartDir, false, caps, qemu_driver->xmlopt, qemuNotifyLoadDomain, qemu_driver); - cleanup: - virObjectUnref(caps); return 0; } =20 @@ -1351,21 +1347,15 @@ qemuConnectGetMaxVcpus(virConnectPtr conn ATTRIBUTE= _UNUSED, 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 @@ -1711,27 +1701,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 @@ -1784,7 +1769,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 @@ -1859,7 +1844,6 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr= conn, virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event2); - virObjectUnref(caps); virNWFilterUnlockFilterUpdates(); return dom; } @@ -3319,7 +3303,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 @@ -3434,7 +3418,6 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, VIR_FREE(xml); virQEMUSaveDataFree(data); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(caps); return ret; } =20 @@ -6599,29 +6582,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 @@ -6630,14 +6611,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 @@ -6658,7 +6636,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; @@ -6696,7 +6674,6 @@ qemuDomainSaveImageUpdateDef(virQEMUDriverPtr driver, } =20 cleanup: - virObjectUnref(caps); virDomainDefFree(newdef); virDomainDefFree(newdef_migr); =20 @@ -6736,7 +6713,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 @@ -6856,7 +6833,6 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, *ret_data =3D data; =20 cleanup: - virObjectUnref(caps); return fd; =20 error: @@ -7430,7 +7406,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 @@ -7492,7 +7468,6 @@ static char *qemuConnectDomainXMLToNative(virConnectP= tr conn, cleanup: virCommandFree(cmd); virObjectUnref(vm); - virObjectUnref(caps); return ret; } =20 @@ -7680,7 +7655,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 @@ -7744,7 +7719,6 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, virDomainDefFree(def); virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(caps); return dom; } =20 @@ -8708,7 +8682,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 @@ -8789,7 +8763,6 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr v= m, virDomainDefFree(vmdef); virDomainDeviceDefFree(devConf); virDomainDeviceDefFree(devLive); - virObjectUnref(caps); =20 return ret; } @@ -8850,7 +8823,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 | @@ -8949,7 +8922,6 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr d= om, virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); virDomainObjEndAPI(&vm); - virObjectUnref(caps); virNWFilterUnlockFilterUpdates(); return ret; } @@ -8961,7 +8933,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; @@ -9040,7 +9012,6 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriverPtr = driver, ret =3D 0; =20 cleanup: - virObjectUnref(caps); if (dev !=3D dev_copy) virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); @@ -9056,7 +9027,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; @@ -9118,7 +9089,6 @@ qemuDomainDetachDeviceAliasLiveAndConfig(virQEMUDrive= rPtr driver, ret =3D 0; cleanup: virDomainDefFree(vmdef); - virObjectUnref(caps); return ret; } =20 @@ -10632,7 +10602,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; @@ -10924,7 +10894,6 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr = dom, virDomainObjEndAPI(&vm); if (eventNparams) virTypedParamsFree(eventParams, eventNparams); - virObjectUnref(caps); return ret; } #undef SCHED_RANGE_CHECK @@ -13536,27 +13505,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 @@ -15725,7 +15689,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; @@ -16004,7 +15968,6 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, cleanup: virDomainObjEndAPI(&vm); VIR_FREE(xml); - virObjectUnref(caps); return snapshot; } =20 @@ -16416,7 +16379,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; @@ -16844,7 +16807,6 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr sna= pshot, virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event2); virDomainObjEndAPI(&vm); - virObjectUnref(caps); virNWFilterUnlockFilterUpdates(); virCPUDefFree(origCPU); virDomainDefFree(config); @@ -19511,7 +19473,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 | @@ -19545,7 +19507,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 Sun May 19 17:42:36 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=1569865717; cv=none; d=zoho.com; s=zohoarc; b=ciiAIckZVbEUXvjv0Q4dqt1FKHTWPFTJy6/NI0uvqo8p41DDIY3b1t+abqSES7YZ75wvbdLOnXm3Vdp4GkRifZC8eq3BQP4+8025SeojCGeIkGcTMNiFZR2afObfEhCwwNv495CI+u8ahC6WvhP6pKOM7y8Qi3z3Jw3X4kzY+OY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569865717; 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:ARC-Authentication-Results; bh=XB4Fb/OlMel3HDSEJD0KagyyJes1I2sQYjAk5+Pg4C8=; b=hdqpDpNPEsOjVOeNKT3WVCxc8TX/W8wdHAiuEYrVSM7raibtGBPE36BMUFkUuLAEQqHBl82g6/Wb4dkJ7fJJeBZmVbjdzrwBJjRUt9Dy/PFq5EzLLqeOC7Cpj+Thu0o1wubnCbVqDyIzKKGidCKIbW4ATP+wmesnz3cZ5mnUWlM= 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 1569865717077847.9510720796475; Mon, 30 Sep 2019 10:48:37 -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 4600358569; Mon, 30 Sep 2019 17:48:35 +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 205FA5D71C; Mon, 30 Sep 2019 17:48:35 +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 D509D4EE6A; Mon, 30 Sep 2019 17:48:34 +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 x8UHmPK0029225 for ; Mon, 30 Sep 2019 13:48:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id 99C765C224; Mon, 30 Sep 2019 17:48:25 +0000 (UTC) Received: from mx1.redhat.com (ext-mx30.extmail.prod.ext.phx2.redhat.com [10.5.110.71]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 536CD5C223; Mon, 30 Sep 2019 17:48:23 +0000 (UTC) Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.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 0D1077F746; Mon, 30 Sep 2019 17:48:22 +0000 (UTC) Received: by mail-qk1-f195.google.com with SMTP id f16so8560718qkl.9; Mon, 30 Sep 2019 10:48:22 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:2a15:38ab:f72b:e1c1:67e7]) by smtp.gmail.com with ESMTPSA id v26sm10204538qta.88.2019.09.30.10.48.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2019 10:48:20 -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=7WVGHpJlYTU25HZC+opfau8VkrvzatezRFpIeEMksME=; b=mAtkfyhezwxubxe5mTXyjBSBaksPP6rMryQWgnvEMKRkPRiDfBW9hHrpfmIy7jla7l 0HdneiQ5LtYj/WvVPHw3qB/zabbPdCSdTpV8TDVj0K7RHNSj9APkrys+BmUfHcRACNjr qBIfZqD5SGAu/KfaoZVEXO5VlSUwtBvbshu2fnLojnCOgF3xwZh8XxZMvR+C/Hf7BBNR j3OCaSAeR8YAABoB4/68erJsjDidxA01GLgciuAfclYKi0LX/kEDEVNU/JFVyX3BOFcI T6GL3eaFGTrc1OybHPqZXJEn895eR6KO68G/YxZLvALkNbp88pjwaOO7dM7aHvnTZ8Jt WKBg== 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=7WVGHpJlYTU25HZC+opfau8VkrvzatezRFpIeEMksME=; b=ju9QzLBUFj5CUqhLb0D8O+5W/Y7vDFHnLhxzNXgrUy1ioplDBSrtpvSPQ+WDgWp7Dv moNh7XXPyCEdvkC/OzWBRnvkwe1wyTQdFhffVcCgZHWw5QN4M1nkzdwGeI9APVn5HCZH csCdMv6wY/Fg6VJ1m1J/XweUIgVHRTBlM+gbVmje1oItFzo0hBTakhD+Gkn0/J8i6bxj X4yJnQ9wNXP7UOPdj6rG9TgYvRdxXYMo4YBuUoBocl7TI0r0lw4n2suX9m/uz5L8f0I1 0tXanKZybeRgXQ2gAPrxnO3UI3SWzkIpddwfGBAsR1584cNPnD61wxN7KL58XfwyOZfU WoUg== X-Gm-Message-State: APjAAAUl8OY0Lj3pgmiw3a/5gFV21Cv/03MrVwgizZazq5/JR+0NU8ik /LzZCky5Oz7ZI8TQZvQAGKTVjDWXFCQ= X-Google-Smtp-Source: APXvYqw8j765JZRGAncJakHaX0il+p4FMQ5g4F3a5MJsZsPezNug9t4xSeBldEg28ohmpKKTv434Og== X-Received: by 2002:a37:6789:: with SMTP id b131mr1344751qkc.358.1569865701109; Mon, 30 Sep 2019 10:48:21 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 30 Sep 2019 14:47:58 -0300 Message-Id: <20190930174802.22426-6-danielhb413@gmail.com> In-Reply-To: <20190930174802.22426-1-danielhb413@gmail.com> References: <20190930174802.22426-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.71]); Mon, 30 Sep 2019 17:48:22 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.71]); Mon, 30 Sep 2019 17:48:22 +0000 (UTC) for IP:'209.85.222.195' DOMAIN:'mail-qk1-f195.google.com' HELO:'mail-qk1-f195.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.195 mail-qk1-f195.google.com 209.85.222.195 mail-qk1-f195.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.71 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 v2 5/9] 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 30 Sep 2019 17:48:35 +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 | 76 +++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 49 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9958164788..48eca00777 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 @@ -1093,7 +1091,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; @@ -1137,7 +1135,6 @@ qemuStateStop(void) VIR_FREE(domains); } VIR_FREE(flags); - virObjectUnref(conn); =20 return ret; } @@ -3305,7 +3302,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; @@ -3414,7 +3411,6 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, qemuDomainRemoveInactiveJob(driver, vm); =20 cleanup: - virObjectUnref(cookie); VIR_FREE(xml); virQEMUSaveDataFree(data); virObjectEventStateQueue(driver->domainEventState, event); @@ -6861,7 +6857,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) @@ -6976,7 +6972,6 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, ret =3D 0; =20 cleanup: - virObjectUnref(cookie); virCommandFree(cmd); VIR_FREE(errbuf); if (qemuSecurityRestoreSavedStateLabel(driver, vm, path) < 0) @@ -13533,9 +13528,8 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn, const char *xmlCPU, unsigned int flags) { - int ret =3D VIR_CPU_COMPARE_ERROR; virQEMUDriverPtr driver =3D conn->privateData; - virQEMUCapsPtr qemuCaps =3D NULL; + VIR_AUTOUNREF(virQEMUCapsPtr) qemuCaps =3D NULL; bool failIncompatible; virCPUDefPtr hvCPU; virArch arch; @@ -13545,7 +13539,7 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn, VIR_CPU_COMPARE_ERROR); =20 if (virConnectCompareHypervisorCPUEnsureACL(conn) < 0) - goto cleanup; + return VIR_CPU_COMPARE_ERROR; =20 failIncompatible =3D !!(flags & VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATI= BLE); =20 @@ -13556,7 +13550,7 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn, machine, &arch, &virttype, NULL); if (!qemuCaps) - goto cleanup; + return VIR_CPU_COMPARE_ERROR; =20 hvCPU =3D virQEMUCapsGetHostModel(qemuCaps, virttype, VIR_QEMU_CAPS_HOST_CPU_REPORTED); @@ -13567,20 +13561,18 @@ qemuConnectCompareHypervisorCPU(virConnectPtr con= n, "virttype '%s'"), virQEMUCapsGetBinary(qemuCaps), virDomainVirtTypeToString(virttype)); - goto cleanup; + return VIR_CPU_COMPARE_ERROR; } =20 if (ARCH_IS_X86(arch)) { - ret =3D virCPUCompareXML(arch, hvCPU, xmlCPU, failIncompatible); + return virCPUCompareXML(arch, hvCPU, xmlCPU, failIncompatible); } else { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("comparing with the hypervisor CPU is not support= ed " "for arch %s"), virArchToString(arch)); } =20 - cleanup: - virObjectUnref(qemuCaps); - return ret; + return VIR_CPU_COMPARE_ERROR; } =20 =20 @@ -13643,7 +13635,7 @@ qemuConnectBaselineHypervisorCPU(virConnectPtr conn, { virQEMUDriverPtr driver =3D conn->privateData; virCPUDefPtr *cpus =3D NULL; - virQEMUCapsPtr qemuCaps =3D NULL; + VIR_AUTOUNREF(virQEMUCapsPtr) qemuCaps =3D NULL; virArch arch; virDomainVirtType virttype; virDomainCapsCPUModelsPtr cpuModels; @@ -13714,7 +13706,6 @@ qemuConnectBaselineHypervisorCPU(virConnectPtr conn, cleanup: virCPUDefListFree(cpus); virCPUDefFree(cpu); - virObjectUnref(qemuCaps); virStringListFree(features); =20 return cpustr; @@ -17541,7 +17532,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; @@ -17642,7 +17633,6 @@ qemuDomainBlockJobAbort(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); =20 cleanup: - virObjectUnref(job); virDomainObjEndAPI(&vm); return ret; } @@ -20312,17 +20302,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, @@ -20331,18 +20320,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 @@ -21585,7 +21570,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; @@ -21653,7 +21638,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]); @@ -22448,32 +22432,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 Sun May 19 17:42:36 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=1569865711; cv=none; d=zoho.com; s=zohoarc; b=ScWpaSXSqHnOcBwdzLmFXeSgQe+Q0Hgdg5FG8nX+z7IRuwG0ZG9SG5936+pE9GW4qdR8fEu3jHKC6ql7cTER0Ggl+yDAQ39e+Pml9H8vusNGc6OYajE/fscHX+ZnP6pYhrJ8dG415qxjNKSgIrjV5kiYC7D2Yi87OjrJUDlg7U0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569865711; 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:ARC-Authentication-Results; bh=KHnoHArMku+HLaREEmdJJ1Ue/DC32/bs4NqzO8/Qtpg=; b=BjQPvN7W8EphSPe/2rXRkjd9IOyDcJjXY+q1X42z5XLSbQXztpEORw1QgpyEBTfu0+H/vdvfm/mwEue46gSk764G40R1O4Bmv8C3wY8J5ZkHvWzxEbpSUUgRCkzsq984KrX3I4iRHP1YURB5tebrAinUg7s7AvSPUfQ3mGeNN4M= 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 1569865710995154.11896456244233; Mon, 30 Sep 2019 10:48:30 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 23BD118C4273; Mon, 30 Sep 2019 17:48:29 +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 EFECF5D9D5; Mon, 30 Sep 2019 17:48:28 +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 AF6C84E9F5; Mon, 30 Sep 2019 17:48:28 +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 x8UHmRqE029246 for ; Mon, 30 Sep 2019 13:48:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id A61D860624; Mon, 30 Sep 2019 17:48:27 +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 31C6B60623; Mon, 30 Sep 2019 17:48:25 +0000 (UTC) Received: from mail-qk1-f196.google.com (mail-qk1-f196.google.com [209.85.222.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 F2F9C308FC4D; Mon, 30 Sep 2019 17:48:23 +0000 (UTC) Received: by mail-qk1-f196.google.com with SMTP id w2so8597413qkf.2; Mon, 30 Sep 2019 10:48:23 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:2a15:38ab:f72b:e1c1:67e7]) by smtp.gmail.com with ESMTPSA id v26sm10204538qta.88.2019.09.30.10.48.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2019 10:48:22 -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=sKzOT6vMNqxpwquhJ+Do9eJXAlICAgxaa5qK3WcdV8M=; b=buJh6PWJvbWWFSsaXX6BW3tg5ykS7P8t34HGHjOWqawdtFVzNV5USE+HQbYt5TciEW 56poQ9YQTUgYMt4DTdCqUPN69sdKppVe0r5DTtDYsz8nZbqAEGnb4HlVnuOtrgwrw9sN t+nDR17lRXubl0Ly1LOOcWhU6l/a5qhdDQi675ZtuWbit5l54QAZTu+KPWMgj4d9K261 CbDlUFgZed8YXCmExHj2EZnvUPUcfle2CDDuigEu12/qIIxp5Te45EmrX/R0jnEz6oY1 FRixjPKb1uqSggqQM7szZYeUk7mOYhq1hYFRMx8Q5HbFT3NN99kD/KXjJhejY+YsAqfG lF0A== 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=sKzOT6vMNqxpwquhJ+Do9eJXAlICAgxaa5qK3WcdV8M=; b=cu8OMmXHMo7cGFuRd/DrZKhNc2S/KGQQzB+wsZDnPfuyeGwQbfGzYoEXFLzjWJfGV+ lbEnKCJ20q535bOY3h+KyIWClFaDmSyf+LwNyi4JOnGNNRvYWZMbH4e9V/aPJ4Joe+Qu dMPmMDZzoUl6lbeV38rT1N6q/AjzyrYoh5I+la4I2LXmcnNkat3WyVqWyziLW4Tdh73K 0c5W1gWTrCGk6HyEODyCUjF29tnzauS8NMHDKoZv5lWR3cI80MtzS3ERnt8Zx7wFczpJ PkBFwjiBZ324FgN1OUB2M6bXAqhudF8CSoW3NDdtI48OUQ/6pBIHEoCNHkx2jqnjbloe PN4g== X-Gm-Message-State: APjAAAWqv+DT0qaqKWuiSbwKC7sX3wtuz+PbnS4PWHYlVfMQdd6rjlk3 TXTHXeZQ6Vyr0gjauW4sHQd2EzV35PA= X-Google-Smtp-Source: APXvYqyK/Qu2abcpeyuQ5die9BpaurirgUa/i1xR8T78WLTWJjijKMVD/YGSTy+DAFBAyJoqLXXrEQ== X-Received: by 2002:a05:620a:5b5:: with SMTP id q21mr1223172qkq.160.1569865702838; Mon, 30 Sep 2019 10:48:22 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 30 Sep 2019 14:47:59 -0300 Message-Id: <20190930174802.22426-7-danielhb413@gmail.com> In-Reply-To: <20190930174802.22426-1-danielhb413@gmail.com> References: <20190930174802.22426-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]); Mon, 30 Sep 2019 17:48:24 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Mon, 30 Sep 2019 17:48:24 +0000 (UTC) for IP:'209.85.222.196' DOMAIN:'mail-qk1-f196.google.com' HELO:'mail-qk1-f196.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.196 mail-qk1-f196.google.com 209.85.222.196 mail-qk1-f196.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.43 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 v2 6/9] 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.62]); Mon, 30 Sep 2019 17:48:29 +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 48eca00777..22c872e912 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; size_t i; =20 if (VIR_ALLOC(qemu_driver) < 0) @@ -705,7 +692,6 @@ qemuStateInitialize(bool privileged, =20 if (virQEMUDriverConfigLoadFile(cfg, driverConf, privileged) < 0) goto error; - VIR_FREE(driverConf); =20 if (virQEMUDriverConfigValidate(cfg) < 0) goto error; @@ -829,7 +815,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, @@ -882,10 +868,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"), @@ -936,6 +920,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) @@ -951,7 +937,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) @@ -968,7 +953,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; @@ -1033,9 +1017,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; } @@ -1360,8 +1341,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; @@ -1425,8 +1406,6 @@ qemuGetSchedInfo(unsigned long long *cpuWait, ret =3D 0; =20 cleanup: - VIR_FREE(data); - VIR_FREE(proc); virStringListFree(lines); return ret; } @@ -1436,7 +1415,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; @@ -1453,7 +1432,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 */ @@ -2905,9 +2883,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) @@ -2919,12 +2896,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; } @@ -2936,14 +2913,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 && @@ -2951,21 +2928,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 @@ -3295,7 +3268,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; @@ -3376,7 +3349,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); @@ -3411,7 +3383,6 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, qemuDomainRemoveInactiveJob(driver, vm); =20 cleanup: - VIR_FREE(xml); virQEMUSaveDataFree(data); virObjectEventStateQueue(driver->domainEventState, event); return ret; @@ -3499,7 +3470,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; @@ -3528,7 +3499,6 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *pat= h, const char *dxml, =20 cleanup: virDomainObjEndAPI(&vm); - VIR_FREE(compressedpath); return ret; } =20 @@ -3556,9 +3526,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 | @@ -3598,8 +3568,6 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int = flags) =20 cleanup: virDomainObjEndAPI(&vm); - VIR_FREE(name); - VIR_FREE(compressedpath); =20 return ret; } @@ -3609,7 +3577,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); @@ -3622,7 +3590,6 @@ qemuDomainManagedSaveLoad(virDomainObjPtr vm, ret =3D 0; cleanup: virObjectUnlock(vm); - VIR_FREE(name); return ret; } =20 @@ -3654,7 +3621,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 @@ -3678,7 +3645,6 @@ qemuDomainManagedSaveRemove(virDomainPtr dom, unsigne= d int flags) ret =3D 0; =20 cleanup: - VIR_FREE(name); virDomainObjEndAPI(&vm); return ret; } @@ -3798,7 +3764,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 @@ -3878,7 +3844,6 @@ doCoreDump(virQEMUDriverPtr driver, virFileWrapperFdFree(wrapperFd); if (ret !=3D 0) unlink(path); - VIR_FREE(compressedpath); return ret; } =20 @@ -4004,7 +3969,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; @@ -4096,7 +4061,6 @@ qemuDomainScreenshot(virDomainPtr dom, VIR_FORCE_CLOSE(tmp_fd); if (unlink_tmp) unlink(tmp); - VIR_FREE(tmp); =20 qemuDomainObjEndJob(driver, vm); =20 @@ -4110,7 +4074,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); @@ -4129,7 +4093,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 Sun May 19 17:42:36 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=1569865719; cv=none; d=zoho.com; s=zohoarc; b=iqHyuUMZqdNZOB1yfFZcBNOLwEbHXETpzyS7LYooPBUjVgOkYr9NuJOi5NriJLZG0vqv9DbqSkqqc4tg0H4li/NLJ7r+0lKQ+yTm9h96K8kuq/WenHnzKGNeuVIq92XQHTFn2x6o//lJnn/afPe78mzs/F2P0qX11r4RPgOOubE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569865719; 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:ARC-Authentication-Results; bh=1v/WfTJiojP6HyAqUBAnLBZ68TVsZUZI+h+1UHemJYI=; b=TrpDrTYwT2zU2cnql1Y/+47t8yDDFkQ/DmH/t8714aNWHYV5VzCKNIctxoc6TP+DRjxYUUM8mR74ur6Dg0RxERmeoxDYJL+cl4D2V8DsDzpRQ+lRY+HpGobVBDmRI6drYVJbQf/tq9m7neygUW5IGl3nYtU8KF6eMXSM1iiEQqU= 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 15698657198209.068934079408109; Mon, 30 Sep 2019 10:48:39 -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 2ACB63082B5F; Mon, 30 Sep 2019 17:48:38 +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 042DC60628; Mon, 30 Sep 2019 17:48:38 +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 B7AF1180BA9B; Mon, 30 Sep 2019 17:48:37 +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 x8UHmQx2029239 for ; Mon, 30 Sep 2019 13:48:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id E3F515C240; Mon, 30 Sep 2019 17:48:26 +0000 (UTC) Received: from mx1.redhat.com (ext-mx30.extmail.prod.ext.phx2.redhat.com [10.5.110.71]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D80565C231; Mon, 30 Sep 2019 17:48:26 +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 B82DF20F2; Mon, 30 Sep 2019 17:48:25 +0000 (UTC) Received: by mail-qt1-f193.google.com with SMTP id r5so18160533qtd.0; Mon, 30 Sep 2019 10:48:25 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:2a15:38ab:f72b:e1c1:67e7]) by smtp.gmail.com with ESMTPSA id v26sm10204538qta.88.2019.09.30.10.48.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2019 10:48:24 -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=liUFFRI5ByIUan03gsHJFzKEw6s5ir1KxCLwybCBAL0=; b=MKuyofOzX+7od4baPSp8dlPQaYeatW6lHGbSUTCkkROo9X2rW+p20ok/PIjd/Bg6sn C62TO+omxFoPHlgZHWg4V473gz79IHSA22Fqyd7nlo3Bf9KPjocw3rZo6jgu1ihjQNN6 ymaHlaJwp8G1IVcWUDmkzJjy04JMqltUsKXgqUXkiMUfEw+Vfg96Q98jnzXxDypJAp2e 8jN9MQ2Z+MY0zZv0dVHfwzQ2w2hh6lKuFo1ROX9eBYi2xZRz9KFZ/MAbrlqAaeehAr/V vJCSX2GmBPTtJ1ZDxz+JbZ12f3r6wKy3EWnR8xrellZ+naOINluaA1YC0pxEFWgKL4Mq bQ0Q== 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=liUFFRI5ByIUan03gsHJFzKEw6s5ir1KxCLwybCBAL0=; b=Y2AiRVPCxyNPafRnTNtTyus1btaBtFt+EPIOs9fIApSY/yk3OptcWakEiTPmypafoL EyWFIamR0Sm3RxbXcl50KRIG+Vkul0u/kJdqxBpVu3t0vaOrDxANSIHqAKiE5aA9ctoS Xpu4gvdB3pXJaTdEhAPW2TubuC2Aola0yQyBPrYg9Qm0Z+BV1avUpOksfxl/tyNlhbGP gLcSWSZ81lRBBeaWvdX9/iQeCGM5h70JvH/G54Y2NxsmMaRiBr0GsAX84ICvEzCM/eUQ 1Y1uFmUWmcdYdjwW6Ou17nMUaR3coiMG4mTxIu9mXn6VJmap+VUp+KnLPUzkpNuBkSEt 8PsQ== X-Gm-Message-State: APjAAAUR7Hteen9KLEfSkujakQ51d7FF4/c3b7+r6ghajEtBWO+O77ci eJX2/uTzOBXAVnEB2gwsPLTAvxHqoWs= X-Google-Smtp-Source: APXvYqwAh8y5AdErFAS035miAv4dlaUQQ5ttwSXQFRo6UNspGMSUB0jhtLZMqBauDqEdRPYRD2OmEQ== X-Received: by 2002:ac8:7244:: with SMTP id l4mr26305646qtp.40.1569865704664; Mon, 30 Sep 2019 10:48:24 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 30 Sep 2019 14:48:00 -0300 Message-Id: <20190930174802.22426-8-danielhb413@gmail.com> In-Reply-To: <20190930174802.22426-1-danielhb413@gmail.com> References: <20190930174802.22426-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.71]); Mon, 30 Sep 2019 17:48:25 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.71]); Mon, 30 Sep 2019 17:48:25 +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.15 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS) 209.85.160.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.71 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 v2 7/9] 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Mon, 30 Sep 2019 17:48:38 +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 22c872e912..05736fbd26 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4103,11 +4103,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: @@ -4115,7 +4115,7 @@ processWatchdogEvent(virQEMUDriverPtr driver, QEMU_ASYNC_JOB_DUMP, VIR_DOMAIN_JOB_OPERATION_DUMP, flags) < 0) { - goto cleanup; + return; } =20 if (virDomainObjCheckActive(vm) < 0) @@ -4136,14 +4136,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 @@ -4153,18 +4150,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 @@ -4174,14 +4169,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 @@ -5077,7 +5069,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; @@ -5141,7 +5133,6 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm, cleanup: virBitmapFree(tmpmap); virCgroupFree(&cgroup_vcpu); - VIR_FREE(str); virObjectEventStateQueue(driver->domainEventState, event); return ret; } @@ -5282,7 +5273,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; @@ -5371,7 +5362,6 @@ qemuDomainPinEmulator(virDomainPtr dom, if (cgroup_emulator) virCgroupFree(&cgroup_emulator); virObjectEventStateQueue(driver->domainEventState, event); - VIR_FREE(str); virBitmapFree(pcpumap); virDomainObjEndAPI(&vm); return ret; @@ -5753,7 +5743,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; @@ -5865,7 +5855,6 @@ qemuDomainPinIOThread(virDomainPtr dom, if (cgroup_iothread) virCgroupFree(&cgroup_iothread); virObjectEventStateQueue(driver->domainEventState, event); - VIR_FREE(str); virBitmapFree(pcpumap); virDomainObjEndAPI(&vm); return ret; @@ -5877,7 +5866,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; @@ -5953,7 +5942,6 @@ qemuDomainHotplugAddIOThread(virQEMUDriverPtr driver, } virDomainAuditIOThread(vm, orig_niothreads, new_niothreads, "update", ret =3D=3D 0); - VIR_FREE(alias); virJSONValueFree(props); return ret; =20 @@ -5998,7 +5986,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; @@ -6047,7 +6035,6 @@ qemuDomainHotplugDelIOThread(virQEMUDriverPtr driver, } virDomainAuditIOThread(vm, orig_niothreads, new_niothreads, "update", rc =3D=3D 0); - VIR_FREE(alias); return ret; =20 exit_monitor: @@ -6817,7 +6804,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; @@ -6936,7 +6923,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; @@ -6952,7 +6938,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; @@ -7037,7 +7023,6 @@ qemuDomainRestoreFlags(virConnectPtr conn, ret =3D -1; virFileWrapperFdFree(wrapperFd); virQEMUSaveDataFree(data); - VIR_FREE(xmlout); if (vm && ret < 0) qemuDomainRemoveInactiveJob(driver, vm); virDomainObjEndAPI(&vm); @@ -7160,7 +7145,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; @@ -7197,7 +7182,6 @@ qemuDomainManagedSaveGetXMLDesc(virDomainPtr dom, uns= igned int flags) virDomainDefFree(def); VIR_FORCE_CLOSE(fd); virDomainObjEndAPI(&vm); - VIR_FREE(path); return ret; } =20 @@ -7208,7 +7192,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))) @@ -7230,7 +7214,6 @@ qemuDomainManagedSaveDefineXML(virDomainPtr dom, cons= t char *dxml, =20 cleanup: virDomainObjEndAPI(&vm); - VIR_FREE(path); return ret; } =20 @@ -7249,7 +7232,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 @@ -7306,7 +7289,6 @@ qemuDomainObjRestore(virConnectPtr conn, =20 cleanup: virQEMUSaveDataFree(data); - VIR_FREE(xmlout); virDomainDefFree(def); VIR_FORCE_CLOSE(fd); if (virFileWrapperFdClose(wrapperFd) < 0) @@ -7471,7 +7453,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; @@ -7489,7 +7471,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) { @@ -7497,7 +7479,7 @@ qemuDomainObjStart(virConnectPtr conn, virReportSystemError(errno, _("cannot remove managed save file %s= "), managed_save); - goto cleanup; + return ret; } vm->hasManagedSave =3D false; } else { @@ -7513,11 +7495,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; @@ -7544,8 +7526,6 @@ qemuDomainObjStart(virConnectPtr conn, } } =20 - cleanup: - VIR_FREE(managed_save); return ret; } =20 @@ -7693,7 +7673,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; @@ -7814,7 +7794,6 @@ qemuDomainUndefineFlags(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); =20 cleanup: - VIR_FREE(name); virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); return ret; @@ -9152,7 +9131,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 @@ -9216,8 +9196,6 @@ static int qemuDomainSetAutostart(virDomainPtr dom, ret =3D 0; =20 cleanup: - VIR_FREE(configFile); - VIR_FREE(autostartLink); virDomainObjEndAPI(&vm); return ret; } @@ -9997,7 +9975,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; @@ -10047,7 +10025,6 @@ qemuDomainSetNumaParamsLive(virDomainObjPtr vm, =20 ret =3D 0; cleanup: - VIR_FREE(nodeset_str); virCgroupFree(&cgroup_temp); =20 return ret; @@ -10190,7 +10167,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; @@ -10254,7 +10231,6 @@ qemuDomainGetNumaParameters(virDomainPtr dom, ret =3D 0; =20 cleanup: - VIR_FREE(nodeset); virDomainObjEndAPI(&vm); return ret; } @@ -11121,7 +11097,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 @@ -11193,7 +11169,6 @@ qemuDomainBlockResize(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); =20 cleanup: - VIR_FREE(device); virDomainObjEndAPI(&vm); return ret; } @@ -11902,7 +11877,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 @@ -11957,7 +11932,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 Sun May 19 17:42:36 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=1569865723; cv=none; d=zoho.com; s=zohoarc; b=NuxJovKkCqw928WNO0zvI4YndNhgJ3Lgq3R8pXoj7npD8C82J5AdDEbgpYJulauPFi+m8edE5jDk6cxv4T/qhlQ8kRzValFcMZ1jlZfv4Og4FI+5rFbsrXp87yL/j3i0nCV0q63gT7paLUMxyna7mCB5sVSc6oKwq7joNDBVJnk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569865723; 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:ARC-Authentication-Results; bh=3k8kpC83UASngp2Zce0eLHkca/sMqiIT/mM6xlqD1Ro=; b=Yc766CYDRWKaxqm3Q4u7E+oKW3q4ogPO/5ulfWzSnNzsch1o0Z1VfR7CbL/8EAMgGzEcjtsgDTiNH8AQYh6wNlj4zMiWk2w3FJHa2lr5lWxdEs6PG9bl2CgbI/SMoNHjr7u2K3uDjPDVaYgXCCFbKaY+HXFNRfIaYiwFknrGoGE= 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 1569865723858711.1955975315523; Mon, 30 Sep 2019 10:48:43 -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 6308B30860BF; Mon, 30 Sep 2019 17:48:42 +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 D78B260872; Mon, 30 Sep 2019 17:48:41 +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 9C5E74EE6E; Mon, 30 Sep 2019 17:48:41 +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 x8UHmSk6029253 for ; Mon, 30 Sep 2019 13:48:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6CB116012A; Mon, 30 Sep 2019 17:48:28 +0000 (UTC) Received: from mx1.redhat.com (ext-mx01.extmail.prod.ext.phx2.redhat.com [10.5.110.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 63EF560126; Mon, 30 Sep 2019 17:48:28 +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 4F9C485362; Mon, 30 Sep 2019 17:48:27 +0000 (UTC) Received: by mail-qt1-f195.google.com with SMTP id m15so18166852qtq.2; Mon, 30 Sep 2019 10:48:27 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:2a15:38ab:f72b:e1c1:67e7]) by smtp.gmail.com with ESMTPSA id v26sm10204538qta.88.2019.09.30.10.48.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2019 10:48:25 -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=pECBRouUCHxGBsnvNAHRoQ2wEy8hYaYJdcRYmHNTMM4=; b=UUiULOMRW5bHBXTB65dZ2XPmfWuPZZdlxAJcCmNKU4bic+LUTNmKQScG030qJ04TzD jNbBL5NTBfzmZA0uxnI1IF6n5FSXJXYmfGvIgRVZOWoWHUmGEdits+WbvJ/bwSDCP6mK 2rQ8laGV39NVt7n8C+yC7RdCaQ+YaT2NuCah24/HY8Ajx6fa6Vbp7h1PvRTBrUwqUDRc Q0L/dD4FwP/GTvkher5xSQ1fyXYBlYeGuIBu55eKgnKd8QOHdwWhoaQhDtp4ud/il6fC 7DxI7rIZSu1KYrTtO4o0HmbYrovzU5Ix0nJfmejQaw9yhFsWkIzHdlodTvZDZ/6sEflL 6zxQ== 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=pECBRouUCHxGBsnvNAHRoQ2wEy8hYaYJdcRYmHNTMM4=; b=mSGXW0Dh35p5u60NcNdF+mlGFLLgSp6SgKJxdyFsP79wFEI2ei0qRjN1TQVBIT625J Op9iUH/+KSlbjt6QJ+dSWws1z7IoX5nlJmQFbSkAxwTRahaSp6nqpmze4rMITLgeop8j 8SIk0zNfO/7DuDpoF7uG/bSY0KTMG0omzsKrGhu104DJDsCrB0OThP2Ieb5e8oOVskCt rxvgkF3xbCxS8maQ2LZMA/SdrxUnhWRWgjwHbq3mmhN1gUewSwBkBhktt50v+UN2JV5B w8oHIRXnQkZAyUbe3sNHF2XT62uWaPHYY0iDd69lC/MTFCgXizjRtObBq+RztP9EfkQj hhDA== X-Gm-Message-State: APjAAAWRDcuwkilltXvf+VZFMHSLpOT9T5OopjUxciyP7XzhShKjeILw CEovWsk9rnTqESJIERqGpSzvmGf3p8U= X-Google-Smtp-Source: APXvYqzBfdKiDRtyNVMhEtxGAIR/2nv3Hp+PSJ1pYm58+4LCDe931LEB3LNiBSldDMKjXHGQqwz6Fw== X-Received: by 2002:ac8:2aaf:: with SMTP id b44mr26535109qta.359.1569865706176; Mon, 30 Sep 2019 10:48:26 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 30 Sep 2019 14:48:01 -0300 Message-Id: <20190930174802.22426-9-danielhb413@gmail.com> In-Reply-To: <20190930174802.22426-1-danielhb413@gmail.com> References: <20190930174802.22426-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.25]); Mon, 30 Sep 2019 17:48:27 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 30 Sep 2019 17:48:27 +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.15 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS) 209.85.160.195 mail-qt1-f195.google.com 209.85.160.195 mail-qt1-f195.google.com X-Scanned-By: MIMEDefang 2.83 on 10.5.110.25 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 v2 8/9] 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.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.44]); Mon, 30 Sep 2019 17:48:42 +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 05736fbd26..aac952363e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11943,7 +11943,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; @@ -12015,7 +12015,6 @@ qemuDomainMemoryPeek(virDomainPtr dom, VIR_FORCE_CLOSE(fd); if (tmp) unlink(tmp); - VIR_FREE(tmp); virDomainObjEndAPI(&vm); return ret; } @@ -12181,7 +12180,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, @@ -12217,7 +12216,6 @@ qemuStorageLimitsRefresh(virQEMUDriverPtr driver, ret =3D 1; =20 cleanup: - VIR_FREE(buf); qemuDomainStorageCloseStat(src, &fd); return ret; } @@ -12438,7 +12436,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 @@ -12473,7 +12471,6 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, =20 cleanup: qemuMigrationParamsFree(migParams); - VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -12495,7 +12492,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 @@ -12540,7 +12537,6 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, =20 cleanup: qemuMigrationParamsFree(migParams); - VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -12741,7 +12737,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 @@ -12776,7 +12772,6 @@ qemuDomainMigratePrepare3(virConnectPtr dconn, =20 cleanup: qemuMigrationParamsFree(migParams); - VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -12802,7 +12797,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 @@ -12865,7 +12860,6 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, cleanup: qemuMigrationParamsFree(migParams); VIR_FREE(migrate_disks); - VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -12885,7 +12879,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 @@ -12914,7 +12908,6 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, =20 cleanup: qemuMigrationParamsFree(migParams); - VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -12934,7 +12927,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 @@ -12973,7 +12966,6 @@ qemuDomainMigratePrepareTunnel3Params(virConnectPtr= dconn, =20 cleanup: qemuMigrationParamsFree(migParams); - VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -13295,7 +13287,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 @@ -13345,7 +13337,6 @@ qemuNodeDeviceDetachFlags(virNodeDevicePtr dev, cleanup: virPCIDeviceFree(pci); virNodeDeviceDefFree(def); - VIR_FREE(xml); return ret; } =20 @@ -13363,7 +13354,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); @@ -13389,7 +13380,6 @@ qemuNodeDeviceReAttach(virNodeDevicePtr dev) virPCIDeviceFree(pci); cleanup: virNodeDeviceDefFree(def); - VIR_FREE(xml); return ret; } =20 @@ -13401,7 +13391,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); @@ -13427,7 +13417,6 @@ qemuNodeDeviceReset(virNodeDevicePtr dev) virPCIDeviceFree(pci); cleanup: virNodeDeviceDefFree(def); - VIR_FREE(xml); return ret; } =20 @@ -15108,7 +15097,6 @@ qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr d= river, qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - char *backingStoreStr; virDomainDiskDefPtr persistdisk; VIR_AUTOUNREF(virStorageSourcePtr) terminator =3D NULL; bool supportsCreate; @@ -15154,13 +15142,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 { @@ -15607,7 +15595,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; @@ -15895,7 +15883,6 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, =20 cleanup: virDomainObjEndAPI(&vm); - VIR_FREE(xml); return snapshot; } =20 @@ -17694,7 +17681,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); @@ -17739,7 +17726,6 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); =20 cleanup: - VIR_FREE(device); virDomainObjEndAPI(&vm); =20 return ret; @@ -18819,7 +18805,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; @@ -19146,7 +19132,6 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, =20 cleanup: VIR_FREE(info.group_name); - VIR_FREE(drivealias); virDomainObjEndAPI(&vm); if (eventNparams) virTypedParamsFree(eventParams, eventNparams); @@ -19167,7 +19152,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; @@ -19304,7 +19289,6 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, =20 cleanup: VIR_FREE(reply.group_name); - VIR_FREE(drivealias); virDomainObjEndAPI(&vm); return ret; } @@ -20928,12 +20912,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 @@ -20950,6 +20932,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; @@ -20958,7 +20942,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 @@ -20968,37 +20952,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 @@ -21714,12 +21693,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 @@ -21791,12 +21770,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; @@ -21901,7 +21874,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 @@ -21930,7 +21903,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); @@ -21944,7 +21916,6 @@ qemuDomainGetGuestVcpusParams(virTypedParameterPtr = *params, ret =3D 0; =20 cleanup: - VIR_FREE(tmp); virBitmapFree(vcpus); virBitmapFree(online); virBitmapFree(offlinable); @@ -22172,7 +22143,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 @@ -22226,7 +22197,6 @@ qemuDomainSetBlockThreshold(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); =20 cleanup: - VIR_FREE(nodename); virDomainObjEndAPI(&vm); return ret; } @@ -22400,7 +22370,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); @@ -22425,7 +22395,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 Sun May 19 17:42:36 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=1569865726; cv=none; d=zoho.com; s=zohoarc; b=XBev0DOIyXLQZ59TCCPnuP9UqJpQX1hHRYSGx8hFERRXWbie4SdVtdq+dX2EqSn9YedWtfFVZOhgLodsvBzNJskMjnXUuoQNNHNNeatx919lyvPOHnRjwoWmaIv1pdPd1BumTnb5w0xdyCyjPhE0mVc/MLdgTIb1UoY7H18H47g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569865726; 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:ARC-Authentication-Results; bh=hGXa38npIGhwAmR02OX8K83WAIbDxiqNorFUq+8Hlzs=; b=cF9DWPVRqoajO7uVesKBHPQ0YeHG/IhveOBPU2MvumSVgqp9XUZp1vDVaC1eEpSBotL9upSYF+8B6Twkq7jsQUQdUWqg77Ql0GmMYv8Vlqgq1nD7fyK9jKCfNdy1KF2FoL3qNP+d23vgn6LXe6xl25WcgrO8L/ow3F+XCVeO068= 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 1569865726852316.67869386741813; Mon, 30 Sep 2019 10:48:46 -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 4166310CC1F9; Mon, 30 Sep 2019 17:48:45 +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 16FBF60FA2; Mon, 30 Sep 2019 17:48:45 +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 D10F44EE73; Mon, 30 Sep 2019 17:48:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x8UHmTlR029264 for ; Mon, 30 Sep 2019 13:48:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8B15A19C6A; Mon, 30 Sep 2019 17:48:29 +0000 (UTC) Received: from mx1.redhat.com (ext-mx25.extmail.prod.ext.phx2.redhat.com [10.5.110.66]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 833B019C58; Mon, 30 Sep 2019 17:48:29 +0000 (UTC) Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.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 6866D10C093C; Mon, 30 Sep 2019 17:48:28 +0000 (UTC) Received: by mail-qk1-f193.google.com with SMTP id u22so8559980qkk.11; Mon, 30 Sep 2019 10:48:28 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:2a15:38ab:f72b:e1c1:67e7]) by smtp.gmail.com with ESMTPSA id v26sm10204538qta.88.2019.09.30.10.48.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2019 10:48:27 -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=nmXy6Xne5l1JtsQtL9PITABkluWOMyiXrP5BxMdUyCI=; b=rLVldw3Yc6X92BwZi4IBpo4jCNH/de5e4/D/l+4v18qw3J3JveGJND7LqRAX0J7tgq EvSx5uGoZ1AeB1jgh09jK01u6hD9DgXRmchB0XFBC8XUnpbsE6dBWrokbI2PZpyWwGxQ ogTesmmQpNSLs4/rVg0HwKdT6TUi4tvWJeeJI8Y+R3Yh8TUo/dV5rXng5hhWbjYGLeK2 5+2vcS7OzjBX4cKDp4SxQ0ftdegmWzGwV11oSOTSoti+dumjV0WxxiA1mXztrXJbxSrN PE0IQwpqhFdtMXc1CTQ0OQwD1xjl7b4f2XR+QMDRD7J0kVnfO5RsXkluOEXnz7TxCf6b ppLA== 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=nmXy6Xne5l1JtsQtL9PITABkluWOMyiXrP5BxMdUyCI=; b=dihoWgsrtVGfgVIRgdUvC7QTAqG15zCTqVCHSV/XOZDSlcFz/HTwo6yOR4ZeqTWr31 UOx4sgOI8Qw9EPsTY/nTUEoMNY+zBg+LD0x2FsDwQIvt8QG0BWR0V7DYwdydQqMhuTi3 BM6t56T2CAhBKUFuWU3jex569Y/O3r/jqenlgfXb2dzkjT0Lh1c2lH6hRgBhRRrdY7NP 0H5gi3/9+5K4P5oFRjCOY+jytqTgBc+jLOMYAw0y7NzY8xvJn/6kTIHVTDwiU9JA7TO+ 7WjIVGTbo6jKnapLqInhms/z14QRhkOQjf9RzQzdZzzL2rnPEHqqoxdzlcHvz0KcfYcc 6lmg== X-Gm-Message-State: APjAAAWgGmvfd2zPyoJPHur5s2vDpNK4i66vQHd41NEQArq24wS+Le9G Ci4DTa3uAKcJF1VHbNrN6TvM4GjxNoM= X-Google-Smtp-Source: APXvYqySm8pnieAJtu1zo901+Bbtfsp5las4fg6wnK9lbiXN1FTz2NZsjiyOpsiX45rZpwIj34FJEg== X-Received: by 2002:a37:6292:: with SMTP id w140mr1353567qkb.24.1569865707615; Mon, 30 Sep 2019 10:48:27 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 30 Sep 2019 14:48:02 -0300 Message-Id: <20190930174802.22426-10-danielhb413@gmail.com> In-Reply-To: <20190930174802.22426-1-danielhb413@gmail.com> References: <20190930174802.22426-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.66]); Mon, 30 Sep 2019 17:48:28 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.66]); Mon, 30 Sep 2019 17:48:28 +0000 (UTC) for IP:'209.85.222.193' DOMAIN:'mail-qk1-f193.google.com' HELO:'mail-qk1-f193.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.193 mail-qk1-f193.google.com 209.85.222.193 mail-qk1-f193.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.66 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , eskultet@redhat.com Subject: [libvirt] [PATCH v2 9/9] 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.65]); Mon, 30 Sep 2019 17:48:45 +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 aac952363e..4940fb083b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1077,7 +1077,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))) @@ -1115,7 +1115,6 @@ qemuStateStop(void) virObjectUnref(domains[i]); VIR_FREE(domains); } - VIR_FREE(flags); =20 return ret; } @@ -20565,7 +20564,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) @@ -20630,7 +20629,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