From nobody Mon Apr 29 06:38:12 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=1568818641; cv=none; d=zoho.com; s=zohoarc; b=Rwe22FJ3K/AQAVzhz2VRd08cDzZ+ekj3oeGwAy6A4tEiFJf6zyloqqlQ5lJqWHt8HoZ13EUbcAFGwEbtDmc5sdpDKFYwbFVOGHc8/v6ni37ebhOr2p8qgwa6M4ahJLMFb4Z8jPAF3h74O7D6B1mIp9Y/nOM9tueQnU62YzPqJ4M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568818641; 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=8sBejgEYDsUmIOizrD7JwB+QedAi4GV+pkV/PK8uExo=; b=BgUU+t/I18mBUNej/LDyiiQCAsbHxihGq8IZusxx6i/9mUFSt4kwJa9opVGyCmQBEaDL4Fy7P65S/Syl4yNgqZP0C4bdAmH0zOkjJnNh0xrhh/5i9jPbuQsc+V8d3wh0IAupG8JLqLSYo+Nvobkr85CC318GZAROkoGV8s9iqBA= 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 1568818641581716.7474817327912; Wed, 18 Sep 2019 07:57:21 -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 9362A3B558; Wed, 18 Sep 2019 14:57:19 +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 6C9015D9DC; Wed, 18 Sep 2019 14:57:19 +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 253B81803B37; Wed, 18 Sep 2019 14:57:19 +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 x8IEvIWh004494 for ; Wed, 18 Sep 2019 10:57:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0EA9760610; Wed, 18 Sep 2019 14:57:18 +0000 (UTC) Received: from mx1.redhat.com (ext-mx26.extmail.prod.ext.phx2.redhat.com [10.5.110.67]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 08CCA60606 for ; Wed, 18 Sep 2019 14:57:15 +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 6704F8980EE for ; Wed, 18 Sep 2019 14:57:14 +0000 (UTC) Received: by mail-qk1-f193.google.com with SMTP id 201so8283984qkd.13 for ; Wed, 18 Sep 2019 07:57:14 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:df05:2a1f:6ce3:83c3:51c0]) by smtp.gmail.com with ESMTPSA id 1sm2924417qko.73.2019.09.18.07.57.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2019 07:57: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=HokbCvYdqwHyI7mzBUQ0Gc2W7xjZWR1bN6ghus116Nw=; b=nD45FlIjJC4GAS8eXtIurERCtPGGjdizbxkUOkJo6GP711j8SDHS2biQN4N9jg0/oS XB7zqzFZpOgQ6yDzxnPg1IO6ANMzVlj4UHwEg+uasdZ4/MizYisp5Y/m3x+Ng351MJq/ ZPQvXV4CIYbCoqUtP56QoiVqC34RItg41KBfwAoEseK5DzrltDOQbvsykGF7xln2qIm4 NTXa5nznIGJOmLo4BJH70dSg7LBSEgH6eWEK8faOYIjhZv6Iee9eNnFnN+fqkzIS4JKe dagqq8kAivsoqeyFt7x9HSOFKOE8OcrMtWQzr/uUHMh5nSj1xTjSnTHzRoroLPUuYh8X SpHA== 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=HokbCvYdqwHyI7mzBUQ0Gc2W7xjZWR1bN6ghus116Nw=; b=Ra64jiUNqofn5pVuQrSluT+atsQwuyNx2AoUmFunt5iU0eYPiFPbH14kbhYue3Qntb IaTPp/pqwzpuM/mM5IRQllp1ynZkReuVsOXG/ZU4qVlBWswbS5nuISs9y2n0rJZRlxSM zw7Xl6Bg2YAFysTMGdPLCdiLHAWG2aGS8T3nTo6yfBB7uRnRTiW20OgywzMAJuHNOlnb E+THoGQElO9dW0YjCtGn2wp7Vf2w90/jDAxkF29fMfQxGdS/aT/nGSSHjtvnyu8jYMdv ARqcv6fWkYQof2/FAkqfxxFf7ILThAlJn8HPFLnCsrHhTWaVQ+wDMyRMtaMMd2z2bq7B 7xkw== X-Gm-Message-State: APjAAAVeCwzHYUdYEBRoKZDJqMPuEi/Q1bza78Hhg5zLsxLb7g32sJaU 7mjpO1KnUjWz873+QPok3pRWniF1 X-Google-Smtp-Source: APXvYqyYvezb8CXUNJGywG+ZM3xx7PS7aiNUqkfa5h2WWh6O4FUZCeRyoxHuB/+HmVBzfpf/GWZAxg== X-Received: by 2002:a37:af81:: with SMTP id y123mr4360235qke.145.1568818633451; Wed, 18 Sep 2019 07:57:13 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Wed, 18 Sep 2019 11:56:53 -0300 Message-Id: <20190918145658.29895-2-danielhb413@gmail.com> In-Reply-To: <20190918145658.29895-1-danielhb413@gmail.com> References: <20190918145658.29895-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.67]); Wed, 18 Sep 2019 14:57:14 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.67]); Wed, 18 Sep 2019 14:57:14 +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.67 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH 1/6] 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.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 18 Sep 2019 14:57:20 +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 1e041a8bac..990c64cf95 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -264,7 +264,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) @@ -296,7 +296,6 @@ qemuAutostartDomain(virDomainObjPtr vm, ret =3D 0; cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -370,7 +369,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) @@ -430,7 +429,6 @@ qemuSecurityInit(virQEMUDriverPtr driver) } =20 driver->securityManager =3D stack; - virObjectUnref(cfg); return 0; =20 error: @@ -438,7 +436,6 @@ qemuSecurityInit(virQEMUDriverPtr driver) _("Failed to initialize security drivers")); virObjectUnref(stack); virObjectUnref(mgr); - virObjectUnref(cfg); return -1; } =20 @@ -1131,7 +1128,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) @@ -1147,7 +1144,6 @@ qemuStateReload(void) caps, qemu_driver->xmlopt, qemuNotifyLoadDomain, qemu_driver); cleanup: - virObjectUnref(cfg); virObjectUnref(caps); return 0; } @@ -1169,7 +1165,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; @@ -1208,7 +1204,6 @@ qemuStateStop(void) } VIR_FREE(flags); virObjectUnref(conn); - virObjectUnref(cfg); =20 return ret; } @@ -1266,20 +1261,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, @@ -1956,7 +1947,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 qemuDomObjFromDomain(dom))) return -1; @@ -1999,7 +1990,6 @@ static int qemuDomainSuspend(virDomainPtr dom) cleanup: virDomainObjEndAPI(&vm); =20 - virObjectUnref(cfg); return ret; } =20 @@ -2011,7 +2001,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 qemuDomObjFromDomain(dom))) return -1; @@ -2057,7 +2047,6 @@ static int qemuDomainResume(virDomainPtr dom) =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -2438,7 +2427,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 | @@ -2543,7 +2532,6 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom,= unsigned long newmem, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -2566,7 +2554,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); @@ -2629,7 +2617,6 @@ static int qemuDomainSetMemoryStatsPeriod(virDomainPt= r dom, int period, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -3141,27 +3128,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 @@ -3326,7 +3307,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; @@ -3389,7 +3370,6 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, if (qemuFileWrapperFDClose(vm, wrapperFd) < 0) ret =3D -1; virFileWrapperFdFree(wrapperFd); - virObjectUnref(cfg); =20 if (ret < 0 && needUnlink) unlink(path); @@ -3617,7 +3597,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 | @@ -3644,7 +3624,6 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *pat= h, const char *dxml, cleanup: virDomainObjEndAPI(&vm); VIR_FREE(compressedpath); - virObjectUnref(cfg); return ret; } =20 @@ -3658,14 +3637,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 @@ -3673,7 +3649,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; @@ -3719,7 +3695,6 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int = flags) virDomainObjEndAPI(&vm); VIR_FREE(name); VIR_FREE(compressedpath); - virObjectUnref(cfg); =20 return ret; } @@ -3917,7 +3892,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 @@ -3999,7 +3974,6 @@ doCoreDump(virQEMUDriverPtr driver, if (ret !=3D 0) unlink(path); VIR_FREE(compressedpath); - virObjectUnref(cfg); return ret; } =20 @@ -4131,7 +4105,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 @@ -4223,7 +4197,6 @@ qemuDomainScreenshot(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -4236,7 +4209,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; @@ -4251,7 +4224,6 @@ getAutoDumpPath(virQEMUDriverPtr driver, domname, timestr)); =20 - virObjectUnref(cfg); VIR_FREE(domname); return dumpfile; } @@ -4262,7 +4234,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 @@ -4303,7 +4275,6 @@ processWatchdogEvent(virQEMUDriverPtr driver, qemuDomainObjEndAsyncJob(driver, vm); =20 cleanup: - virObjectUnref(cfg); VIR_FREE(dumpfile); } =20 @@ -4313,7 +4284,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) @@ -4326,7 +4297,6 @@ doCoreDumpToAutoDumpPath(virQEMUDriverPtr driver, "%s", _("Dump failed")); cleanup: VIR_FREE(dumpfile); - virObjectUnref(cfg); return ret; } =20 @@ -4355,13 +4325,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", @@ -4428,9 +4398,6 @@ processGuestPanicEvent(virQEMUDriverPtr driver, qemuDomainObjEndAsyncJob(driver, vm); if (removeInactive) qemuDomainRemoveInactiveJob(driver, vm); - - cleanup: - virObjectUnref(cfg); } =20 =20 @@ -4439,14 +4406,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"); @@ -4469,9 +4436,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 Mon Apr 29 06:38:12 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=1568818643; cv=none; d=zoho.com; s=zohoarc; b=QYm3qowqx6BZvtPG5AKg5nU6/T34x0iqrabYERys+Y9B2DaXMlNxCtwCHdlzLHUgNFZB6kXV0xtSR37sg4TfM+EYorFWDH2Q8Vd9GWsAWxBLzUuTxVksMnMZVMZsgD981TmR9UmZ2qtFw5Y6PY2pY4mladqDXsF2SoSFZahx6Co= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568818643; 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=hEvZWILIncne91Ick5JCscW4EQlOPr4kU+RH4ATJqac=; b=WzKd0Kh59MedLp7gExf881SJqD6pIIXhQ1cF5xrZ/Q1acxv0M7SXbVMTECGHnGYMk+vrKfRQmVT0aPB9T1+djxTa9VrPVhMesAA+TagPeXwwYVGhwupi9YmC0XlJAG2A1JKCgZspVzxeT7E8Ems1SjvSiTv1iUsin5gvfiV7TY4= 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 1568818643413604.4956602951423; Wed, 18 Sep 2019 07:57: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 AAED04E926; Wed, 18 Sep 2019 14:57: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 894675D9DC; Wed, 18 Sep 2019 14:57: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 491071803B48; Wed, 18 Sep 2019 14:57:21 +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 x8IEvHMQ004489 for ; Wed, 18 Sep 2019 10:57:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id 189455D6B2; Wed, 18 Sep 2019 14:57:17 +0000 (UTC) Received: from mx1.redhat.com (ext-mx09.extmail.prod.ext.phx2.redhat.com [10.5.110.38]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 127A05D6A5 for ; Wed, 18 Sep 2019 14:57:17 +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 BFC144ACA5 for ; Wed, 18 Sep 2019 14:57:15 +0000 (UTC) Received: by mail-qk1-f196.google.com with SMTP id 4so8336114qki.6 for ; Wed, 18 Sep 2019 07:57:15 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:df05:2a1f:6ce3:83c3:51c0]) by smtp.gmail.com with ESMTPSA id 1sm2924417qko.73.2019.09.18.07.57.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2019 07:57: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=RHxwZ06vmj5m8rgRlgXVSmwd1CKV/1hRXPLmoms3wMI=; b=IhqjeLV9OLBfKh8Y7eBPeeDYskyjjTnAgHi+KmiNg6/kzDWIC0HBaR2rsS7D+G0FVB 01z6pu9HX25KdSjc5XLdNdaYPsrvuzplFm32UVuhqk8wfZgcOrkItajsv+mZauoKLaFJ 5C+a7kFrBCwXmws8hbQDN6BYfsMNOnbzKVjARVrf5aQdfIuQQC7fy+FqIEInMbwaYyLt L8g/BU4DYkCRbK3cPLr31uXVTTxnSO2fTKWzkK2lmg+7GMNYwuU0Z/wZWejxM7rR5GLb ZAy5WW1gSHKqRIc1Rjlh3bVUgSgcqQAnvSh6tkG1kgguzYtDl8Qt2EoMDdbGV5j+HzQj pm9g== 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=RHxwZ06vmj5m8rgRlgXVSmwd1CKV/1hRXPLmoms3wMI=; b=Uqn6jXZcZkzYdGaz9nE0IJFmVXgtakTianuvTSShYm7t/T+FZL2T4aIxnxvgsignEv Mpyo1S0BAhIwZl0fjVGFLlmV5T03ULj4OFJM9NOfjA2/snF86ux1kvunQZ2VmaFIU4d9 V8W/Ouyo71zvpqkRFIeRJX4Kyl9tumN9KofONsPx1yvajcG+9Ns3dcHFL1SmxzV/kyGC Ld8xVDHUCa6AwvqVqlw2P8vAG2GpDmxvYed6RkoE+qizJ0bPm9utw87K6EmqFguilerj 1uFPJhLpFWZSwLBYP1iOoesb+GU8NitzdGvRiprVrXfcbNgE3QW2gD1EzLfdgd/TsWwy B9LQ== X-Gm-Message-State: APjAAAVborksl7bVINBKkFQzasCYgOulP2/3kBtgGBDKDVFmtd3nQL4z DvR+k17upMns7VsoaHzS6JiHEiPB X-Google-Smtp-Source: APXvYqx6bLox8PMiFeosa6XRCoOeTtRfIP4YRW3S4GFg2WfWcsH4UnPvXhUqCXhP8PL+sZtfOMU9gA== X-Received: by 2002:ae9:dd07:: with SMTP id r7mr4517238qkf.248.1568818634721; Wed, 18 Sep 2019 07:57:14 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Wed, 18 Sep 2019 11:56:54 -0300 Message-Id: <20190918145658.29895-3-danielhb413@gmail.com> In-Reply-To: <20190918145658.29895-1-danielhb413@gmail.com> References: <20190918145658.29895-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 18 Sep 2019 14:57:16 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 18 Sep 2019 14:57:16 +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.78 on 10.5.110.38 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH 2/6] 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.38]); Wed, 18 Sep 2019 14:57: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. This is step 2. Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_driver.c | 78 ++++++++++++++---------------------------- 1 file changed, 25 insertions(+), 53 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 990c64cf95..c7ed662ff1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4640,7 +4640,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; @@ -4739,7 +4739,6 @@ processNicRxFilterChangedEvent(virQEMUDriverPtr drive= r, cleanup: virNetDevRxFilterFree(hostFilter); virNetDevRxFilterFree(guestFilter); - virObjectUnref(cfg); } =20 =20 @@ -4749,7 +4748,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; @@ -4782,7 +4781,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"); @@ -4823,9 +4822,6 @@ processSerialChangedEvent(virQEMUDriverPtr driver, =20 endjob: qemuDomainObjEndJob(driver, vm); - - cleanup: - virObjectUnref(cfg); } =20 =20 @@ -5098,21 +5094,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 && @@ -5121,23 +5116,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 @@ -5302,7 +5293,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); @@ -5359,7 +5350,6 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, cleanup: virDomainObjEndAPI(&vm); virBitmapFree(pcpumap); - virObjectUnref(cfg); return ret; } =20 @@ -5422,7 +5412,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; @@ -5516,7 +5506,6 @@ qemuDomainPinEmulator(virDomainPtr dom, VIR_FREE(str); virBitmapFree(pcpumap); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -5887,7 +5876,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; @@ -6011,7 +6000,6 @@ qemuDomainPinIOThread(virDomainPtr dom, VIR_FREE(str); virBitmapFree(pcpumap); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -6360,7 +6348,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; @@ -6460,7 +6448,6 @@ qemuDomainChgIOThread(virQEMUDriverPtr driver, qemuDomainObjEndJob(driver, vm); =20 cleanup: - virObjectUnref(cfg); return ret; } =20 @@ -6971,7 +6958,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 @@ -7093,7 +7080,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 @@ -7518,13 +7504,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 @@ -7584,7 +7568,6 @@ static char *qemuConnectDomainXMLToNative(virConnectP= tr conn, virCommandFree(cmd); virObjectUnref(vm); virObjectUnref(caps); - virObjectUnref(cfg); return ret; } =20 @@ -7771,7 +7754,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; @@ -7781,8 +7764,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 @@ -7839,7 +7820,6 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(caps); - virObjectUnref(cfg); return dom; } =20 @@ -7860,7 +7840,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 | @@ -7980,7 +7960,6 @@ qemuDomainUndefineFlags(virDomainPtr dom, VIR_FREE(name); virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(cfg); return ret; } =20 @@ -8797,7 +8776,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; @@ -8882,7 +8861,6 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr v= m, virDomainDefFree(vmdef); virDomainDeviceDefFree(devConf); virDomainDeviceDefFree(devLive); - virObjectUnref(cfg); virObjectUnref(caps); =20 return ret; @@ -8943,7 +8921,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 @@ -9044,7 +9022,6 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr d= om, virDomainDeviceDefFree(dev); virDomainObjEndAPI(&vm); virObjectUnref(caps); - virObjectUnref(cfg); virNWFilterUnlockFilterUpdates(); return ret; } @@ -9057,7 +9034,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; @@ -9136,7 +9113,6 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriverPtr = driver, =20 cleanup: virObjectUnref(caps); - virObjectUnref(cfg); if (dev !=3D dev_copy) virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); @@ -9153,7 +9129,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; @@ -9214,7 +9190,6 @@ qemuDomainDetachDeviceAliasLiveAndConfig(virQEMUDrive= rPtr driver, ret =3D 0; cleanup: virDomainDefFree(vmdef); - virObjectUnref(cfg); virObjectUnref(caps); return ret; } @@ -9323,7 +9298,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 qemuDomObjFromDomain(dom))) return -1; @@ -9388,7 +9363,6 @@ static int qemuDomainSetAutostart(virDomainPtr dom, VIR_FREE(configFile); VIR_FREE(autostartLink); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -9635,7 +9609,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 | @@ -9835,7 +9809,6 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -9947,7 +9920,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; @@ -10072,7 +10045,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 Mon Apr 29 06:38:12 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=1568818644; cv=none; d=zoho.com; s=zohoarc; b=cbEo9v8zVhhlBhozRCdZK0LjDaijntPbIHLbJ0iK7k1/t5IAHe1r2Kg6XsdNqzJLVHtINLAsJH0wVg645ZJfUW8hQC5NJyDo95KqrjnfgbngGK7haerdba61YAaNQ3vSRS4LyBK+GAngG4Ibu02UobBCoPFr2F03+OPitn1YhzA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568818644; 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=Iay5jLy841L8jS0slqy3nKYWvy0Xm1nHgN0I1clPYeQ=; b=YoIz0nvWJQ9XWRv7cfSOFa0jhn4rUYIOLVVa5U0sIJ5ftsJWUDlCgffeM1dNEW5XpMH+U6RkZE5H6V9KD7wFnZfBWSPEAE7oRXAYo7pIl4TDk9CEeOFmUTFmnXb7x1tulUq3FQ5+2eAhJ88zvSyMkdlM5BU1bmpcNBW6wNUc6Z0= 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 1568818644884209.86790601376435; Wed, 18 Sep 2019 07:57:24 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3803B81127; Wed, 18 Sep 2019 14:57:23 +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 0E25E5C219; Wed, 18 Sep 2019 14:57:23 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C0CB11803B4B; Wed, 18 Sep 2019 14:57:22 +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 x8IEvKaK004510 for ; Wed, 18 Sep 2019 10:57:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9E1595C221; Wed, 18 Sep 2019 14:57:20 +0000 (UTC) Received: from mx1.redhat.com (ext-mx24.extmail.prod.ext.phx2.redhat.com [10.5.110.65]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 978085C21A for ; Wed, 18 Sep 2019 14:57:18 +0000 (UTC) Received: from mail-qt1-f178.google.com (mail-qt1-f178.google.com [209.85.160.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EFCD7116BB20 for ; Wed, 18 Sep 2019 14:57:16 +0000 (UTC) Received: by mail-qt1-f178.google.com with SMTP id d2so105510qtr.4 for ; Wed, 18 Sep 2019 07:57:16 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:df05:2a1f:6ce3:83c3:51c0]) by smtp.gmail.com with ESMTPSA id 1sm2924417qko.73.2019.09.18.07.57.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2019 07:57:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=r5aurqE3TMN6qyCnxky00/ChJOOemv7t/4h4/wgAD9c=; b=SBS62+itTo1uJXWG3M655o4DK625zW/RPEp9ptBNRm6778DcIk0dxARgnR7AAnuClH MBeWCPdJUMJsNkf9dshgbyklGu46DZv7UYQNZ+5w2a1dJMEceIEaKRiGdiH3ghWnN4k6 bT6yFt5EmEw6pFkTakmwqbxpkXWILkjeKiRXgJ3RpF4qb5pevEhvg5GtJnkGLKquMYRm yyO5YYXVd++kKHeNgLVR1UZEe6z0JkfuGyS+5o1U+0iPmM8VNOc37L6LkWe621BN3BLk j0LtZNZsDojFPPi2FSXO3lT6KFp9J0bhr8RHb2ZYqHR+LziE+H5h0PQ2gCF7jt+oAX31 LT0A== 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=r5aurqE3TMN6qyCnxky00/ChJOOemv7t/4h4/wgAD9c=; b=PbiD7u4ngDzCMEv2QYCMqWAbayZTeH0LkSHBrqqdnUQWNMm0CTHcJ3qYokl4K2x4U3 LV/8PDlxmT3w37JYzkT8aCHgPLNpzqv4RoQq19dst/oVxGrKhabe9wP3SSP87J7zKK6E C9rK12nAnLgE1SU5r9Osn599LeEhcwELvamWR1ZB+KyrO8FYG1TCbYqtI/lgOtiGGqRl PCn6V+GXTKxSn1ejToS0NZRJy5cfYdiaZm4VC7nOP8qEyT6K/H4jIgAnWH1CLMV170Ww 3pSVEX0UaHcvVtLzHqTbY03WWbaFm2fGLbGXNEnQt/Z7vs3hYX/7W/3tLiOE2TwJef9A 4uAQ== X-Gm-Message-State: APjAAAWhqEuP/oIDd3WVIGeH0PqCOhPeUjV47YDZAFLXNOBQzN/3BPpl KNv1HLXaLrfi5aQFzVuhpn+a1zkb X-Google-Smtp-Source: APXvYqw72sNcSWI9luAvbRz97SMDCiYRdondTsTVdxVGE4MlZloaLgSGM16Xf1P1YYfUFZAtckVJqQ== X-Received: by 2002:a0c:c692:: with SMTP id d18mr3555048qvj.65.1568818635961; Wed, 18 Sep 2019 07:57:15 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Wed, 18 Sep 2019 11:56:55 -0300 Message-Id: <20190918145658.29895-4-danielhb413@gmail.com> In-Reply-To: <20190918145658.29895-1-danielhb413@gmail.com> References: <20190918145658.29895-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.65]); Wed, 18 Sep 2019 14:57:17 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.65]); Wed, 18 Sep 2019 14:57:17 +0000 (UTC) for IP:'209.85.160.178' DOMAIN:'mail-qt1-f178.google.com' HELO:'mail-qt1-f178.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.153 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS) 209.85.160.178 mail-qt1-f178.google.com 209.85.160.178 mail-qt1-f178.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.65 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH 3/6] 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 18 Sep 2019 14:57:23 +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 | 57 ++++++++++++++---------------------------- 1 file changed, 19 insertions(+), 38 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c7ed662ff1..bc2e2ccfc2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10209,7 +10209,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; @@ -10321,7 +10321,6 @@ qemuDomainSetNumaParameters(virDomainPtr dom, cleanup: virBitmapFree(nodeset); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -10426,7 +10425,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; @@ -10518,7 +10517,6 @@ qemuDomainSetPerfEvents(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -10705,7 +10703,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; @@ -10999,7 +10997,6 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr = dom, if (eventNparams) virTypedParamsFree(eventParams, eventNparams); virObjectUnref(caps); - virObjectUnref(cfg); return ret; } #undef SCHED_RANGE_CHECK @@ -11664,7 +11661,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; @@ -11859,7 +11856,6 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, virNetDevBandwidthFree(bandwidth); virNetDevBandwidthFree(newBandwidth); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -12121,7 +12117,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 @@ -12192,7 +12188,6 @@ qemuDomainMemoryPeek(virDomainPtr dom, unlink(tmp); VIR_FREE(tmp); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -12409,7 +12404,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); @@ -12498,7 +12493,6 @@ qemuDomainGetBlockInfo(virDomainPtr dom, cleanup: VIR_FREE(entry); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -12970,7 +12964,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; @@ -13044,7 +13038,6 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, VIR_FREE(migrate_disks); VIR_FREE(origname); virDomainDefFree(def); - virObjectUnref(cfg); return ret; } =20 @@ -14614,7 +14607,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); @@ -14702,7 +14695,6 @@ qemuDomainSnapshotCreateInactiveExternal(virQEMUDri= verPtr driver, } } virBitmapFree(created); - virObjectUnref(cfg); =20 return ret; } @@ -15804,7 +15796,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; @@ -16094,7 +16086,6 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, virDomainObjEndAPI(&vm); VIR_FREE(xml); virObjectUnref(caps); - virObjectUnref(cfg); return snapshot; } =20 @@ -16505,7 +16496,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; @@ -16935,7 +16926,6 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr sna= pshot, virObjectEventStateQueue(driver->domainEventState, event2); virDomainObjEndAPI(&vm); virObjectUnref(caps); - virObjectUnref(cfg); virNWFilterUnlockFilterUpdates(); virCPUDefFree(origCPU); virDomainDefFree(config); @@ -16996,7 +16986,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 | @@ -17088,7 +17078,6 @@ qemuDomainSnapshotDelete(virDomainSnapshotPtr snaps= hot, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -17216,7 +17205,7 @@ qemuDomainCheckpointCreateXML(virDomainPtr domain, bool redefine =3D flags & VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE; unsigned int parse_flags =3D 0; virDomainMomentObjPtr other =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; virCapsPtr caps =3D NULL; qemuDomainObjPrivatePtr priv; virJSONValuePtr actions =3D NULL; @@ -17358,7 +17347,6 @@ qemuDomainCheckpointCreateXML(virDomainPtr domain, virDomainObjEndAPI(&vm); VIR_FREE(xml); virObjectUnref(caps); - virObjectUnref(cfg); return checkpoint; } =20 @@ -17532,7 +17520,7 @@ qemuDomainCheckpointDelete(virDomainCheckpointPtr c= heckpoint, virQEMUMomentRemove rem; virQEMUMomentReparent rep; bool metadata_only =3D !!(flags & VIR_DOMAIN_CHECKPOINT_DELETE_METADAT= A_ONLY); - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; =20 virCheckFlags(VIR_DOMAIN_CHECKPOINT_DELETE_CHILDREN | VIR_DOMAIN_CHECKPOINT_DELETE_METADATA_ONLY | @@ -17622,7 +17610,6 @@ qemuDomainCheckpointDelete(virDomainCheckpointPtr c= heckpoint, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -18017,7 +18004,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; @@ -18122,7 +18109,6 @@ qemuDomainBlockJobAbort(virDomainPtr dom, =20 cleanup: virObjectUnref(job); - virObjectUnref(cfg); virDomainObjEndAPI(&vm); return ret; } @@ -19393,7 +19379,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; @@ -19714,7 +19700,6 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, virDomainObjEndAPI(&vm); if (eventNparams) virTypedParamsFree(eventParams, eventNparams); - virObjectUnref(cfg); return ret; } =20 @@ -19964,7 +19949,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 @@ -20000,7 +19985,6 @@ qemuDomainSetMetadata(virDomainPtr dom, cleanup: virDomainObjEndAPI(&vm); virObjectUnref(caps); - virObjectUnref(cfg); return ret; } =20 @@ -21757,7 +21741,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; @@ -21814,7 +21798,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr driver, virHashFree(stats); virHashFree(nodestats); virJSONValueFree(nodedata); - virObjectUnref(cfg); return ret; } =20 @@ -22513,7 +22496,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; @@ -22602,7 +22585,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: @@ -23065,7 +23047,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; @@ -23122,7 +23104,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 Mon Apr 29 06:38:12 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=1568818650; cv=none; d=zoho.com; s=zohoarc; b=VXLiBDOmgoNseAmFa8qmLlkFy1op1jeXw39vUtjdtFakWs0LwPlggM8cBkcTYLIBI6UleUhkfu/7GOrQreI+GGjMl1m5Cm+AKudvXeFlmnSzB78jUqoljrM0lBiEr4xzU9sIKnQ/ZPqnlrU4BONtprCSwAhe+RS4lsh4mxiMQ5U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568818650; 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=mvCYau9m69Qm3jtExJxFIJdzXoVEeBGgztiCvUngBZ0=; b=hfNHANeqTZo+8+22V/aj0omO/+9UHzeeVJY5QGjZ24D5si5s9vu/1eUqXMqKlMLM9l5s6axDQvq87OQi0pQt8UMmvgU6zvP6uzDfrWR4x/4ktQh3kYiAGnXckusd/KqhAaGYHr7uAnW5O8Z96/31+PRAG6ybvaKMofey7lEbZ6o= 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 1568818650655802.4782262088531; Wed, 18 Sep 2019 07:57:30 -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 C9F6E1918640; Wed, 18 Sep 2019 14:57:28 +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 A45E25D70D; Wed, 18 Sep 2019 14:57: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 68D7B180BA9B; Wed, 18 Sep 2019 14:57:28 +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 x8IEvPkm004532 for ; Wed, 18 Sep 2019 10:57:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id 462E71001DE4; Wed, 18 Sep 2019 14:57:25 +0000 (UTC) Received: from mx1.redhat.com (ext-mx11.extmail.prod.ext.phx2.redhat.com [10.5.110.40]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3DD2A1001DCD for ; Wed, 18 Sep 2019 14:57:19 +0000 (UTC) Received: from mail-qt1-f177.google.com (mail-qt1-f177.google.com [209.85.160.177]) (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 861AB308427C for ; Wed, 18 Sep 2019 14:57:18 +0000 (UTC) Received: by mail-qt1-f177.google.com with SMTP id r5so140281qtd.0 for ; Wed, 18 Sep 2019 07:57:18 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:df05:2a1f:6ce3:83c3:51c0]) by smtp.gmail.com with ESMTPSA id 1sm2924417qko.73.2019.09.18.07.57.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2019 07:57:17 -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=2eHCdYv6dvw8YV7X0+sYOYTpUGYwDad65+2T4AjVoXA=; b=gl61eShRkWw4nd94doM6F8uM2aShkWMwCx2J/3pWM/2Q9f+eRBKolhszNxr3qSdPlp W2aaZ9oVhXNKLWa42FS+X5GjAMG77MhSF1s0RrTKuBMyOEFSNwlcb42QDmagaluu+0uI AOjzNpyVxy/bfLnYQ4ZGeugenua3LG29KDFp3cCtLoi0fMdNMMzBz0r7dqQDVgWUqLvs 5Du49Gm4DwishDq8fYiOEo29jqjjQdZZE03cHXg5NFg4APsz6oxY/o7pxVaGAdTP92bQ aAhKyWWsdje6vq0G+9MRFlQ6KJPMjoBb7lLDETOrGpeLWg6DGNG8vcP5aYADwZB9hKXx XVQA== 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=2eHCdYv6dvw8YV7X0+sYOYTpUGYwDad65+2T4AjVoXA=; b=fuc+oeNr1LXM6tLJAqsCNio8ztkaPeOsFLL3ENg8UUUrtfdk9CiU2mXQ9TEcCBBpyZ dZ2ENPg9pHhkxfdVWNRv16+PTASMnblk1ZTIO5fXvR4e2j+jhaUEIcYOm8Gbd+5Xcuu0 O/cYf9RMage0kPBdDycH+rDluCvN0OioEjgQOezXwBrAdAgxYi1vlcT0iKG4ZjnFFuq9 wfJ/PUjPocsSd8UChXSHQa6BjtgrfF488zFpK3+fGIjUWFqavgVOEjA3FlPRgHbPXRAi cqL0udXJSxgzZPMPVqiqEnRxBVfnNIqGObhyklG+jz+W8SnDz5ixpBWy43ccqsbwGx5c Gt5Q== X-Gm-Message-State: APjAAAXx7JnijyAu1pXtVfyhTzRyDZ5cNW5hk1k8f/FyVw5w/VaxLxdx wRdiqNXu6VMKEQH8YiJF/6KzfCeV X-Google-Smtp-Source: APXvYqxbrX8KFBydLfx+Jh6jNSEvH/76o815ufJNlFBqs5dkVbeYkHJM2002TrRj14mnf43VXZdl/A== X-Received: by 2002:a0c:9638:: with SMTP id 53mr3717107qvx.13.1568818637413; Wed, 18 Sep 2019 07:57:17 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Wed, 18 Sep 2019 11:56:56 -0300 Message-Id: <20190918145658.29895-5-danielhb413@gmail.com> In-Reply-To: <20190918145658.29895-1-danielhb413@gmail.com> References: <20190918145658.29895-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.40]); Wed, 18 Sep 2019 14:57:18 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Wed, 18 Sep 2019 14:57:18 +0000 (UTC) for IP:'209.85.160.177' DOMAIN:'mail-qt1-f177.google.com' HELO:'mail-qt1-f177.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.153 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS) 209.85.160.177 mail-qt1-f177.google.com 209.85.160.177 mail-qt1-f177.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.40 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH 4/6] 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]); Wed, 18 Sep 2019 14:57:29 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" VIR_AUTOFREE is a beautiful macro. Let's use it across the board inside qemu_driver.c to 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 | 85 +++++++++++++----------------------------- 1 file changed, 26 insertions(+), 59 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index bc2e2ccfc2..29b8bbe9d9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -445,11 +445,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; @@ -484,6 +482,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); @@ -499,7 +500,6 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, virReportSystemError(errno, _("Failed to read snapshot file %s"), fullpath); - VIR_FREE(fullpath); continue; } =20 @@ -512,8 +512,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 @@ -527,9 +525,6 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, vm->def->name); current =3D snap; } - - VIR_FREE(fullpath); - VIR_FREE(xmlStr); } if (direrr < 0) virReportError(VIR_ERR_INTERNAL_ERROR, @@ -556,7 +551,6 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, ret =3D 0; cleanup: VIR_DIR_CLOSE(dir); - VIR_FREE(snapDir); virObjectUnref(caps); virObjectUnlock(vm); return ret; @@ -568,11 +562,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; @@ -603,6 +595,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); @@ -618,7 +613,6 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm, virReportSystemError(errno, _("Failed to read checkpoint file %s"), fullpath); - VIR_FREE(fullpath); continue; } =20 @@ -631,8 +625,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; } @@ -640,9 +632,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, @@ -667,7 +656,6 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm, ret =3D 0; cleanup: VIR_DIR_CLOSE(dir); - VIR_FREE(chkDir); virObjectUnref(caps); virObjectUnlock(vm); return ret; @@ -726,12 +714,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) @@ -771,7 +758,6 @@ qemuStateInitialize(bool privileged, =20 if (virQEMUDriverConfigLoadFile(cfg, driverConf, privileged) < 0) goto error; - VIR_FREE(driverConf); =20 if (virQEMUDriverConfigValidate(cfg) < 0) goto error; @@ -895,7 +881,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, @@ -948,10 +934,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"), @@ -1002,6 +986,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) @@ -1017,7 +1003,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) @@ -1034,7 +1019,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; @@ -1099,9 +1083,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; } @@ -1447,8 +1428,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; @@ -1512,8 +1493,6 @@ qemuGetSchedInfo(unsigned long long *cpuWait, ret =3D 0; =20 cleanup: - VIR_FREE(data); - VIR_FREE(proc); virStringListFree(lines); return ret; } @@ -1523,7 +1502,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; @@ -1540,7 +1519,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 */ @@ -3000,7 +2978,7 @@ virQEMUSaveDataWrite(virQEMUSaveDataPtr data, 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) @@ -3057,7 +3035,6 @@ virQEMUSaveDataWrite(virQEMUSaveDataPtr data, ret =3D 0; =20 cleanup: - VIR_FREE(zeros); return ret; } =20 @@ -3388,7 +3365,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; @@ -3469,7 +3446,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); @@ -3505,7 +3481,6 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, =20 cleanup: virObjectUnref(cookie); - VIR_FREE(xml); virQEMUSaveDataFree(data); virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(caps); @@ -3594,7 +3569,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; @@ -3623,7 +3598,6 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *pat= h, const char *dxml, =20 cleanup: virDomainObjEndAPI(&vm); - VIR_FREE(compressedpath); return ret; } =20 @@ -3651,9 +3625,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 | @@ -3693,8 +3667,6 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int = flags) =20 cleanup: virDomainObjEndAPI(&vm); - VIR_FREE(name); - VIR_FREE(compressedpath); =20 return ret; } @@ -3704,7 +3676,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); @@ -3717,7 +3689,6 @@ qemuDomainManagedSaveLoad(virDomainObjPtr vm, ret =3D 0; cleanup: virObjectUnlock(vm); - VIR_FREE(name); return ret; } =20 @@ -3749,7 +3720,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 @@ -3773,7 +3744,6 @@ qemuDomainManagedSaveRemove(virDomainPtr dom, unsigne= d int flags) ret =3D 0; =20 cleanup: - VIR_FREE(name); virDomainObjEndAPI(&vm); return ret; } @@ -3893,7 +3863,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 @@ -3973,7 +3943,6 @@ doCoreDump(virQEMUDriverPtr driver, virFileWrapperFdFree(wrapperFd); if (ret !=3D 0) unlink(path); - VIR_FREE(compressedpath); return ret; } =20 @@ -4099,7 +4068,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; @@ -4191,7 +4160,6 @@ qemuDomainScreenshot(virDomainPtr dom, VIR_FORCE_CLOSE(tmp_fd); if (unlink_tmp) unlink(tmp); - VIR_FREE(tmp); =20 qemuDomainObjEndJob(driver, vm); =20 @@ -4205,7 +4173,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); @@ -4224,7 +4192,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 Mon Apr 29 06:38:12 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=1568818647; cv=none; d=zoho.com; s=zohoarc; b=XZXdxUeMw9k35Q+xICL7bMFEOoq7y33JEIE3+QzlTaI3hasQgxlP/aRWgiAGSvPt5oQuwS5r4j4QYps9lbeUDoKgqm47GP9eG1vgoMV6C75MTEd+xMrcTAdSgfkoy+tLTihGfijXBhM4OkfhOdI9DObixIBR79irD0EWcATOmVQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568818647; 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=JL09tg/w/DoHfhTdTTjMlGo6gZCUpL8e3o074KeYp4E=; b=b57N4ZXU4pMLPHSQQM/Nh89KgipB4iR23qKXIUQt1gT1qlZSHDm+YMvlrfqbcTsQDBUljFXie985Lj5zpatP1TU89D3V3VuxZog3SszFEA0uASu76V3bVtMt4KjhoIoWdo2rJ2SNN2G04FsDb+H7vD2B6cxyBUNh+beTNHHD/14= 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 1568818647071409.06754089429273; Wed, 18 Sep 2019 07:57:27 -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 49232307D91E; Wed, 18 Sep 2019 14:57:25 +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 145E960C05; Wed, 18 Sep 2019 14:57:25 +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 B92314EA65; Wed, 18 Sep 2019 14:57:24 +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 x8IEvNMI004521 for ; Wed, 18 Sep 2019 10:57:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9FAC3600C8; Wed, 18 Sep 2019 14:57:23 +0000 (UTC) Received: from mx1.redhat.com (ext-mx24.extmail.prod.ext.phx2.redhat.com [10.5.110.65]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 99303600CC for ; Wed, 18 Sep 2019 14:57:21 +0000 (UTC) Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EDE22116BB23 for ; Wed, 18 Sep 2019 14:57:19 +0000 (UTC) Received: by mail-qt1-f194.google.com with SMTP id g16so60566qto.9 for ; Wed, 18 Sep 2019 07:57:19 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:df05:2a1f:6ce3:83c3:51c0]) by smtp.gmail.com with ESMTPSA id 1sm2924417qko.73.2019.09.18.07.57.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2019 07:57: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=ZtL1sjsP3LSzBKvGO9xSbaxHpz3G3LFCzOMi2xwcpp0=; b=Ul9ricubZdyWf18dQbbIyUrBYsBTaaAg/CTYxMetFeTHY+8NL73xNCp22xWjF7iLAD gPmUB+CuoUrIW6yUyAX7kemGH5mPJ7T8AHo7GhxSr2DrdRXuq3IPH+OMcVf8Y/KsYMHr Dy01BWlEE9rN2rotN3O+vtCR7pFk/XDuZnkG+P5oc02b6mAcgGqaFcWtyjleiWP1LDT+ U2YreAzWfMRaVaikBL9OPcLkd9fE+1PgAgOhG/sFDLVC9SruDgYfLzsLvO1jNo27RNJw Gxf9yTNTzL+cooEJrmlDA2x4gdhuAaLdmOgq5b/kPYGSR8rSpZX/nbfAGwuumG5KN4Y8 3TDg== 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=ZtL1sjsP3LSzBKvGO9xSbaxHpz3G3LFCzOMi2xwcpp0=; b=Z69TXBeE/PAH20fO//TvRcXZSldJ9nvcguZ2qqoQ6fZBZ1Czy3YQHCzdgB3bc6YUbX SIMEhULF14DVPhABJ/d3aSn4aEeW860JhttvkxFbTmIkMTjxgN1DpKIFvy4ubcmvxTrq mkJp6Y9Ki56DEu6vsGPLHSNSF8zX1nnS9tY2vUBNWhref+775pnKnFCUi2r6I9H7T+1E Nu8U3cHfKFYvh2Z8w36XnwF6NziIvg+oQqhrFIZN7x2GtAqWHlXMhPjIKHGLf50BYmLt +Fyvo/oeWSx7eRG4TYdiCct6Lo44ppDgX3gsE07BqifOc6sqwtfObzBl/ksPJLn8MEP0 Gg7Q== X-Gm-Message-State: APjAAAWxkrUk7LkQ/u4K+XrtmhqEI7yAQTMucfedooij9a3+xgc4krDN RShVsr4v0xgRAnS5CS3WeGjhXZdH X-Google-Smtp-Source: APXvYqwDoswUYvSIGnWuQs7ktPGET+N4LB7CptS9A/MQatKLbW41yFwZHi0+8qASQuWt4yZ86TkwoA== X-Received: by 2002:ad4:5445:: with SMTP id h5mr3625306qvt.32.1568818638758; Wed, 18 Sep 2019 07:57:18 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Wed, 18 Sep 2019 11:56:57 -0300 Message-Id: <20190918145658.29895-6-danielhb413@gmail.com> In-Reply-To: <20190918145658.29895-1-danielhb413@gmail.com> References: <20190918145658.29895-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.65]); Wed, 18 Sep 2019 14:57:20 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.65]); Wed, 18 Sep 2019 14:57:20 +0000 (UTC) for IP:'209.85.160.194' DOMAIN:'mail-qt1-f194.google.com' HELO:'mail-qt1-f194.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.153 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS) 209.85.160.194 mail-qt1-f194.google.com 209.85.160.194 mail-qt1-f194.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.65 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH 5/6] 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Wed, 18 Sep 2019 14:57:25 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" VIR_AUTOFREE is a beautiful macro. Let's use it across the board inside qemu_driver.c to 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 29b8bbe9d9..489698108d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4202,11 +4202,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: @@ -4214,7 +4214,7 @@ processWatchdogEvent(virQEMUDriverPtr driver, QEMU_ASYNC_JOB_DUMP, VIR_DOMAIN_JOB_OPERATION_DUMP, flags) < 0) { - goto cleanup; + return; } =20 if (virDomainObjCheckActive(vm) < 0) @@ -4235,14 +4235,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 @@ -4252,18 +4249,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 @@ -4273,14 +4268,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 @@ -5176,7 +5168,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; @@ -5240,7 +5232,6 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm, cleanup: virBitmapFree(tmpmap); virCgroupFree(&cgroup_vcpu); - VIR_FREE(str); virObjectEventStateQueue(driver->domainEventState, event); return ret; } @@ -5381,7 +5372,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; @@ -5470,7 +5461,6 @@ qemuDomainPinEmulator(virDomainPtr dom, if (cgroup_emulator) virCgroupFree(&cgroup_emulator); virObjectEventStateQueue(driver->domainEventState, event); - VIR_FREE(str); virBitmapFree(pcpumap); virDomainObjEndAPI(&vm); return ret; @@ -5852,7 +5842,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; @@ -5964,7 +5954,6 @@ qemuDomainPinIOThread(virDomainPtr dom, if (cgroup_iothread) virCgroupFree(&cgroup_iothread); virObjectEventStateQueue(driver->domainEventState, event); - VIR_FREE(str); virBitmapFree(pcpumap); virDomainObjEndAPI(&vm); return ret; @@ -5976,7 +5965,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; @@ -6052,7 +6041,6 @@ qemuDomainHotplugAddIOThread(virQEMUDriverPtr driver, } virDomainAuditIOThread(vm, orig_niothreads, new_niothreads, "update", ret =3D=3D 0); - VIR_FREE(alias); virJSONValueFree(props); return ret; =20 @@ -6097,7 +6085,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; @@ -6146,7 +6134,6 @@ qemuDomainHotplugDelIOThread(virQEMUDriverPtr driver, } virDomainAuditIOThread(vm, orig_niothreads, new_niothreads, "update", rc =3D=3D 0); - VIR_FREE(alias); return ret; =20 exit_monitor: @@ -6924,7 +6911,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; qemuDomainSaveCookiePtr cookie =3D NULL; @@ -7044,7 +7031,6 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, cleanup: virObjectUnref(cookie); virCommandFree(cmd); - VIR_FREE(errbuf); if (qemuSecurityRestoreSavedStateLabel(driver, vm, path) < 0) VIR_WARN("failed to restore save state label on %s", path); return ret; @@ -7060,7 +7046,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; @@ -7145,7 +7131,6 @@ qemuDomainRestoreFlags(virConnectPtr conn, ret =3D -1; virFileWrapperFdFree(wrapperFd); virQEMUSaveDataFree(data); - VIR_FREE(xmlout); if (vm && ret < 0) qemuDomainRemoveInactiveJob(driver, vm); virDomainObjEndAPI(&vm); @@ -7268,7 +7253,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; @@ -7305,7 +7290,6 @@ qemuDomainManagedSaveGetXMLDesc(virDomainPtr dom, uns= igned int flags) virDomainDefFree(def); VIR_FORCE_CLOSE(fd); virDomainObjEndAPI(&vm); - VIR_FREE(path); return ret; } =20 @@ -7316,7 +7300,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 qemuDomObjFromDomain(dom))) @@ -7338,7 +7322,6 @@ qemuDomainManagedSaveDefineXML(virDomainPtr dom, cons= t char *dxml, =20 cleanup: virDomainObjEndAPI(&vm); - VIR_FREE(path); return ret; } =20 @@ -7357,7 +7340,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 @@ -7414,7 +7397,6 @@ qemuDomainObjRestore(virConnectPtr conn, =20 cleanup: virQEMUSaveDataFree(data); - VIR_FREE(xmlout); virDomainDefFree(def); VIR_FORCE_CLOSE(fd); if (virFileWrapperFdClose(wrapperFd) < 0) @@ -7580,7 +7562,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; @@ -7598,7 +7580,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) { @@ -7606,7 +7588,7 @@ qemuDomainObjStart(virConnectPtr conn, virReportSystemError(errno, _("cannot remove managed save file %s= "), managed_save); - goto cleanup; + return ret; } vm->hasManagedSave =3D false; } else { @@ -7622,11 +7604,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; @@ -7653,8 +7635,6 @@ qemuDomainObjStart(virConnectPtr conn, } } =20 - cleanup: - VIR_FREE(managed_save); return ret; } =20 @@ -7803,7 +7783,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; @@ -7924,7 +7904,6 @@ qemuDomainUndefineFlags(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); =20 cleanup: - VIR_FREE(name); virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); return ret; @@ -9263,7 +9242,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 @@ -9327,8 +9307,6 @@ static int qemuDomainSetAutostart(virDomainPtr dom, ret =3D 0; =20 cleanup: - VIR_FREE(configFile); - VIR_FREE(autostartLink); virDomainObjEndAPI(&vm); return ret; } @@ -10108,7 +10086,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; @@ -10158,7 +10136,6 @@ qemuDomainSetNumaParamsLive(virDomainObjPtr vm, =20 ret =3D 0; cleanup: - VIR_FREE(nodeset_str); virCgroupFree(&cgroup_temp); =20 return ret; @@ -10301,7 +10278,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; @@ -10365,7 +10342,6 @@ qemuDomainGetNumaParameters(virDomainPtr dom, ret =3D 0; =20 cleanup: - VIR_FREE(nodeset); virDomainObjEndAPI(&vm); return ret; } @@ -11233,7 +11209,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 @@ -11305,7 +11281,6 @@ qemuDomainBlockResize(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); =20 cleanup: - VIR_FREE(device); virDomainObjEndAPI(&vm); return ret; } @@ -12014,7 +11989,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 @@ -12069,7 +12044,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 Mon Apr 29 06:38:12 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=1568818647; cv=none; d=zoho.com; s=zohoarc; b=kDK/i6MEp/7uzW4Jtruiliumne0fBH1d8yTR/vSo6KZ0DKlkJc23L0h0mWJwzmJjF6YRefssXtQTDQm5lhVcSqRhBlxKa1CKXxgCY000epiSYxY4/50hoU1zOseEqr5W/aEMJVJtXR/ah/zqId/bcT1RqeIalgVDu3nTce7y9HU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568818647; 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=WWyMt7OrYPmkr8jT3qLgZZtb5OE5gXKcUr+R/wwun58=; b=WJvmlGAMmyTJHH+S1Lrmr05n3jRzQLJd9s6SceZ/d/TvgCQfzOG7mSSMcgMaUAuyrwROz5EqRVgBo8MIrZGXn/ZjJk+4h4Aws5fRkMmyprKcmuixq5yJXwC1ZxIGjeKJGKix/RCo0okbZ+wWgJi7/pVLOKl9oEwowrCMsChl18Q= 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 1568818647978590.1741332731327; Wed, 18 Sep 2019 07:57:27 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2F34AC054C52; Wed, 18 Sep 2019 14:57:26 +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 0773419C7F; Wed, 18 Sep 2019 14:57:26 +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 BB1C74EDA5; Wed, 18 Sep 2019 14:57:25 +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 x8IEvPFJ004537 for ; Wed, 18 Sep 2019 10:57:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5939B196B2; Wed, 18 Sep 2019 14:57:25 +0000 (UTC) Received: from mx1.redhat.com (ext-mx12.extmail.prod.ext.phx2.redhat.com [10.5.110.41]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 516FB196AE for ; Wed, 18 Sep 2019 14:57:22 +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 63EB4308A98C for ; Wed, 18 Sep 2019 14:57:21 +0000 (UTC) Received: by mail-qt1-f196.google.com with SMTP id j31so97139qta.5 for ; Wed, 18 Sep 2019 07:57:21 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:df05:2a1f:6ce3:83c3:51c0]) by smtp.gmail.com with ESMTPSA id 1sm2924417qko.73.2019.09.18.07.57.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2019 07:57:19 -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=BS6B0czXbwEr920SCUkIT3rJgZKDgokRS+AIANHjvm4=; b=f34nyxvEXzD2TMW+rDARY1EDw73W1t1wlIJY3UucRIXsPmLUiSauToTuIpu/sqYu1U PGpMEUiHN9nYCU1LdP9VPLN6dBMKV6bN0o2UhOMLpd4enlif9aRBtHoBSqxoboxcHxTu 4flEThgLoDyKuXU0y+dY3p2MEO58F1mCS3vj1PyHuWNzykt/ZyPYGYJlTfvuEVXKMorS 3GJ84M6+qF8TPicMz8dBNHi98iMNJm8fGMaNjib2kLRPBwuecrYO1/hlRXy8aZ44fs2T ekLLEKB9JTKgP6WEggDHOOeECt2ZRE+yMxQloZHiotARvs9viVdE6/pCsABpFAOpgPNR om/w== 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=BS6B0czXbwEr920SCUkIT3rJgZKDgokRS+AIANHjvm4=; b=Ww6QfB9ttB7yYZ4yqwAqp9iqOQjbQZ3JFdCnQOqVuttyi2n39FYmMYv97JHF+AdrSC EXaK7Ce1hIcw2rnAzYEqBDRdNpacjCuzX1XDaliYlcBv0Cv+qOFvUBAnDFxn7we1Fhp2 XuN8Kmf1bMQpDmgsIrP74aUwsPEJhGLbpfdrrtN1mXCkNQfaYR2JGph8pk8mbO4grYTk Q8oz+H4mk5Abpby6hmlIVOl44pBG6jJ+yCkM3avmb8VqtUSxbUb+JSTTdFN/+Plm0Rp5 J0UHAb7enPYxkfeCuakCRh9+TlWMQcu0fr6lYqjPqGR0xCOwxClaeHCR0a0YU0pnz4uf 6TXA== X-Gm-Message-State: APjAAAXFjL2mEMBmQm47Rm1uSXBDjdFYePJvepE4sFTnS0Eonjh1MTuv YZbtYPEoIL6tJtBrvAWQlUnTgi2jt34= X-Google-Smtp-Source: APXvYqwd7EV06Ry97Lb8xsQkjSD8ORmDPZ1YWMVOfO8RpFXyqoUpot+8xiW+avyfdlqPxxgxWXmWUA== X-Received: by 2002:a0c:a241:: with SMTP id f59mr3690037qva.141.1568818640196; Wed, 18 Sep 2019 07:57:20 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Wed, 18 Sep 2019 11:56:58 -0300 Message-Id: <20190918145658.29895-7-danielhb413@gmail.com> In-Reply-To: <20190918145658.29895-1-danielhb413@gmail.com> References: <20190918145658.29895-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.41]); Wed, 18 Sep 2019 14:57:21 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Wed, 18 Sep 2019 14:57:21 +0000 (UTC) for IP:'209.85.160.196' DOMAIN:'mail-qt1-f196.google.com' HELO:'mail-qt1-f196.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.153 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS) 209.85.160.196 mail-qt1-f196.google.com 209.85.160.196 mail-qt1-f196.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.41 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH 6/6] qemu_driver: use VIR_AUTOFREE() with strings 3/3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 18 Sep 2019 14:57:26 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" VIR_AUTOFREE is a beautiful macro. Let's use it across the board inside qemu_driver.c to 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 | 119 ++++++++++++++--------------------------- 1 file changed, 41 insertions(+), 78 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 489698108d..bd05aa9e11 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12055,7 +12055,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; @@ -12127,7 +12127,6 @@ qemuDomainMemoryPeek(virDomainPtr dom, VIR_FORCE_CLOSE(fd); if (tmp) unlink(tmp); - VIR_FREE(tmp); virDomainObjEndAPI(&vm); return ret; } @@ -12293,7 +12292,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, @@ -12329,7 +12328,6 @@ qemuStorageLimitsRefresh(virQEMUDriverPtr driver, ret =3D 1; =20 cleanup: - VIR_FREE(buf); qemuDomainStorageCloseStat(src, &fd); return ret; } @@ -12550,7 +12548,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 @@ -12585,7 +12583,6 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, =20 cleanup: qemuMigrationParamsFree(migParams); - VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -12607,7 +12604,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 @@ -12652,7 +12649,6 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, =20 cleanup: qemuMigrationParamsFree(migParams); - VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -12853,7 +12849,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 @@ -12888,7 +12884,6 @@ qemuDomainMigratePrepare3(virConnectPtr dconn, =20 cleanup: qemuMigrationParamsFree(migParams); - VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -12914,7 +12909,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 @@ -12977,7 +12972,6 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, cleanup: qemuMigrationParamsFree(migParams); VIR_FREE(migrate_disks); - VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -12997,7 +12991,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 @@ -13026,7 +13020,6 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, =20 cleanup: qemuMigrationParamsFree(migParams); - VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -13046,7 +13039,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 @@ -13085,7 +13078,6 @@ qemuDomainMigratePrepareTunnel3Params(virConnectPtr= dconn, =20 cleanup: qemuMigrationParamsFree(migParams); - VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -13407,7 +13399,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 @@ -13457,7 +13449,6 @@ qemuNodeDeviceDetachFlags(virNodeDevicePtr dev, cleanup: virPCIDeviceFree(pci); virNodeDeviceDefFree(def); - VIR_FREE(xml); return ret; } =20 @@ -13475,7 +13466,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); @@ -13501,7 +13492,6 @@ qemuNodeDeviceReAttach(virNodeDevicePtr dev) virPCIDeviceFree(pci); cleanup: virNodeDeviceDefFree(def); - VIR_FREE(xml); return ret; } =20 @@ -13513,7 +13503,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); @@ -13539,7 +13529,6 @@ qemuNodeDeviceReset(virNodeDevicePtr dev) virPCIDeviceFree(pci); cleanup: virNodeDeviceDefFree(def); - VIR_FREE(xml); return ret; } =20 @@ -15229,7 +15218,6 @@ qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr d= river, qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - char *backingStoreStr; virDomainDiskDefPtr persistdisk; VIR_AUTOUNREF(virStorageSourcePtr) terminator =3D NULL; bool supportsCreate; @@ -15275,13 +15263,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 { @@ -15728,7 +15716,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; @@ -16025,7 +16013,6 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, =20 cleanup: virDomainObjEndAPI(&vm); - VIR_FREE(xml); virObjectUnref(caps); return snapshot; } @@ -17029,9 +17016,8 @@ qemuDomainCheckpointPrepare(virQEMUDriverPtr driver= , virCapsPtr caps, virDomainObjPtr vm, virDomainCheckpointDefPtr def) { - int ret =3D -1; size_t i; - char *xml =3D NULL; + VIR_AUTOFREE(char *) xml =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; =20 /* Easiest way to clone inactive portion of vm->def is via @@ -17043,10 +17029,10 @@ qemuDomainCheckpointPrepare(virQEMUDriverPtr driv= er, virCapsPtr caps, priv->qemuCaps, VIR_DOMAIN_DEF_PARSE_I= NACTIVE | VIR_DOMAIN_DEF_PARSE_S= KIP_VALIDATE))) - goto cleanup; + return -1; =20 if (virDomainCheckpointAlignDisks(def) < 0) - goto cleanup; + return -1; =20 for (i =3D 0; i < def->ndisks; i++) { virDomainCheckpointDiskDefPtr disk =3D &def->disks[i]; @@ -17061,15 +17047,11 @@ qemuDomainCheckpointPrepare(virQEMUDriverPtr driv= er, virCapsPtr caps, disk->name, virStorageFileFormatTypeToString( vm->def->disks[i]->src->format)); - goto cleanup; + return -1; } } =20 - ret =3D 0; - - cleanup: - VIR_FREE(xml); - return ret; + return 0; } =20 static int @@ -17139,7 +17121,7 @@ qemuDomainCheckpointCreateXML(virDomainPtr domain, { virQEMUDriverPtr driver =3D domain->conn->privateData; virDomainObjPtr vm =3D NULL; - char *xml =3D NULL; + VIR_AUTOFREE(char *) xml =3D NULL; virDomainMomentObjPtr chk =3D NULL; virDomainCheckpointPtr checkpoint =3D NULL; bool update_current =3D true; @@ -17286,7 +17268,6 @@ qemuDomainCheckpointCreateXML(virDomainPtr domain, cleanup: virJSONValueFree(actions); virDomainObjEndAPI(&vm); - VIR_FREE(xml); virObjectUnref(caps); return checkpoint; } @@ -18174,7 +18155,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); @@ -18219,7 +18200,6 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); =20 cleanup: - VIR_FREE(device); virDomainObjEndAPI(&vm); =20 return ret; @@ -19310,7 +19290,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; @@ -19637,7 +19617,6 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, =20 cleanup: VIR_FREE(info.group_name); - VIR_FREE(drivealias); virDomainObjEndAPI(&vm); if (eventNparams) virTypedParamsFree(eventParams, eventNparams); @@ -19658,7 +19637,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; @@ -19795,7 +19774,6 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, =20 cleanup: VIR_FREE(reply.group_name); - VIR_FREE(drivealias); virDomainObjEndAPI(&vm); return ret; } @@ -21593,12 +21571,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 @@ -21615,6 +21591,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; @@ -21623,7 +21601,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 @@ -21634,37 +21612,32 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDe= fPtr disk, =20 if (qemuDomainGetStatsBlockExportHeader(disk, n, *recordnr, records, nrecords) < 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, records, nrecords) <= 0) - goto cleanup; + return -1; } =20 if (qemuDomainGetStatsOneBlock(driver, cfg, dom, records, nrecords, backendalias, n, *recordnr, stats) < 0) - goto cleanup; + return -1; =20 if (qemuDomainGetStatsBlockExportBackendStorage(backendstoragealia= s, stats, *recordnr, records, nrecords)= < 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 @@ -22441,12 +22414,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 @@ -22506,7 +22479,7 @@ qemuDomainRenameCallback(virDomainObjPtr vm, if (virFileIsLink(old_dom_autostart_link) && unlink(old_dom_autostart_link) < 0) { virReportSystemError(errno, - _("Failed to delete symlink '%s'"), + _("Failed to delete symlink '%s'"), old_dom_autostart_link); goto rollback; } @@ -22518,12 +22491,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; @@ -22628,7 +22595,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 @@ -22657,7 +22624,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); @@ -22671,7 +22637,6 @@ qemuDomainGetGuestVcpusParams(virTypedParameterPtr = *params, ret =3D 0; =20 cleanup: - VIR_FREE(tmp); virBitmapFree(vcpus); virBitmapFree(online); virBitmapFree(offlinable); @@ -22899,7 +22864,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 @@ -22953,7 +22918,6 @@ qemuDomainSetBlockThreshold(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); =20 cleanup: - VIR_FREE(nodename); virDomainObjEndAPI(&vm); return ret; } @@ -23133,7 +23097,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); @@ -23158,7 +23122,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