From nobody Sun Feb 8 11:44:14 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1569865723; cv=none; d=zoho.com; s=zohoarc; b=NuxJovKkCqw928WNO0zvI4YndNhgJ3Lgq3R8pXoj7npD8C82J5AdDEbgpYJulauPFi+m8edE5jDk6cxv4T/qhlQ8kRzValFcMZ1jlZfv4Og4FI+5rFbsrXp87yL/j3i0nCV0q63gT7paLUMxyna7mCB5sVSc6oKwq7joNDBVJnk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569865723; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=3k8kpC83UASngp2Zce0eLHkca/sMqiIT/mM6xlqD1Ro=; b=Yc766CYDRWKaxqm3Q4u7E+oKW3q4ogPO/5ulfWzSnNzsch1o0Z1VfR7CbL/8EAMgGzEcjtsgDTiNH8AQYh6wNlj4zMiWk2w3FJHa2lr5lWxdEs6PG9bl2CgbI/SMoNHjr7u2K3uDjPDVaYgXCCFbKaY+HXFNRfIaYiwFknrGoGE= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1569865723858711.1955975315523; Mon, 30 Sep 2019 10:48:43 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6308B30860BF; Mon, 30 Sep 2019 17:48:42 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D78B260872; Mon, 30 Sep 2019 17:48:41 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9C5E74EE6E; Mon, 30 Sep 2019 17:48:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x8UHmSk6029253 for ; Mon, 30 Sep 2019 13:48:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6CB116012A; Mon, 30 Sep 2019 17:48:28 +0000 (UTC) Received: from mx1.redhat.com (ext-mx01.extmail.prod.ext.phx2.redhat.com [10.5.110.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 63EF560126; Mon, 30 Sep 2019 17:48:28 +0000 (UTC) Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4F9C485362; Mon, 30 Sep 2019 17:48:27 +0000 (UTC) Received: by mail-qt1-f195.google.com with SMTP id m15so18166852qtq.2; Mon, 30 Sep 2019 10:48:27 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:2a15:38ab:f72b:e1c1:67e7]) by smtp.gmail.com with ESMTPSA id v26sm10204538qta.88.2019.09.30.10.48.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2019 10:48:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pECBRouUCHxGBsnvNAHRoQ2wEy8hYaYJdcRYmHNTMM4=; b=UUiULOMRW5bHBXTB65dZ2XPmfWuPZZdlxAJcCmNKU4bic+LUTNmKQScG030qJ04TzD jNbBL5NTBfzmZA0uxnI1IF6n5FSXJXYmfGvIgRVZOWoWHUmGEdits+WbvJ/bwSDCP6mK 2rQ8laGV39NVt7n8C+yC7RdCaQ+YaT2NuCah24/HY8Ajx6fa6Vbp7h1PvRTBrUwqUDRc Q0L/dD4FwP/GTvkher5xSQ1fyXYBlYeGuIBu55eKgnKd8QOHdwWhoaQhDtp4ud/il6fC 7DxI7rIZSu1KYrTtO4o0HmbYrovzU5Ix0nJfmejQaw9yhFsWkIzHdlodTvZDZ/6sEflL 6zxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pECBRouUCHxGBsnvNAHRoQ2wEy8hYaYJdcRYmHNTMM4=; b=mSGXW0Dh35p5u60NcNdF+mlGFLLgSp6SgKJxdyFsP79wFEI2ei0qRjN1TQVBIT625J Op9iUH/+KSlbjt6QJ+dSWws1z7IoX5nlJmQFbSkAxwTRahaSp6nqpmze4rMITLgeop8j 8SIk0zNfO/7DuDpoF7uG/bSY0KTMG0omzsKrGhu104DJDsCrB0OThP2Ieb5e8oOVskCt rxvgkF3xbCxS8maQ2LZMA/SdrxUnhWRWgjwHbq3mmhN1gUewSwBkBhktt50v+UN2JV5B w8oHIRXnQkZAyUbe3sNHF2XT62uWaPHYY0iDd69lC/MTFCgXizjRtObBq+RztP9EfkQj hhDA== X-Gm-Message-State: APjAAAWRDcuwkilltXvf+VZFMHSLpOT9T5OopjUxciyP7XzhShKjeILw CEovWsk9rnTqESJIERqGpSzvmGf3p8U= X-Google-Smtp-Source: APXvYqzBfdKiDRtyNVMhEtxGAIR/2nv3Hp+PSJ1pYm58+4LCDe931LEB3LNiBSldDMKjXHGQqwz6Fw== X-Received: by 2002:ac8:2aaf:: with SMTP id b44mr26535109qta.359.1569865706176; Mon, 30 Sep 2019 10:48:26 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 30 Sep 2019 14:48:01 -0300 Message-Id: <20190930174802.22426-9-danielhb413@gmail.com> In-Reply-To: <20190930174802.22426-1-danielhb413@gmail.com> References: <20190930174802.22426-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 30 Sep 2019 17:48:27 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 30 Sep 2019 17:48:27 +0000 (UTC) for IP:'209.85.160.195' DOMAIN:'mail-qt1-f195.google.com' HELO:'mail-qt1-f195.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.15 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS) 209.85.160.195 mail-qt1-f195.google.com 209.85.160.195 mail-qt1-f195.google.com X-Scanned-By: MIMEDefang 2.83 on 10.5.110.25 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , eskultet@redhat.com Subject: [libvirt] [PATCH v2 8/9] qemu_driver: use VIR_AUTOFREE() with strings 3/3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Mon, 30 Sep 2019 17:48:42 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Using VIR_AUTOFREE() in all strings of qemu_driver.c make the code a bit tidier and smaller, sparing VIR_FREE() calls and sometimes a whole 'cleanup' label. This is the last part of this change. Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_driver.c | 99 +++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 65 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 05736fbd26..aac952363e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11943,7 +11943,7 @@ qemuDomainMemoryPeek(virDomainPtr dom, { virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainObjPtr vm; - char *tmp =3D NULL; + VIR_AUTOFREE(char *) tmp =3D NULL; int fd =3D -1, ret =3D -1; qemuDomainObjPrivatePtr priv; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; @@ -12015,7 +12015,6 @@ qemuDomainMemoryPeek(virDomainPtr dom, VIR_FORCE_CLOSE(fd); if (tmp) unlink(tmp); - VIR_FREE(tmp); virDomainObjEndAPI(&vm); return ret; } @@ -12181,7 +12180,7 @@ qemuStorageLimitsRefresh(virQEMUDriverPtr driver, int ret =3D -1; int fd =3D -1; struct stat sb; - char *buf =3D NULL; + VIR_AUTOFREE(char *) buf =3D NULL; ssize_t len; =20 if ((rc =3D qemuDomainStorageOpenStat(driver, cfg, vm, src, &fd, &sb, @@ -12217,7 +12216,6 @@ qemuStorageLimitsRefresh(virQEMUDriverPtr driver, ret =3D 1; =20 cleanup: - VIR_FREE(buf); qemuDomainStorageCloseStat(src, &fd); return ret; } @@ -12438,7 +12436,7 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, { virQEMUDriverPtr driver =3D dconn->privateData; virDomainDefPtr def =3D NULL; - char *origname =3D NULL; + VIR_AUTOFREE(char *) origname =3D NULL; qemuMigrationParamsPtr migParams =3D NULL; int ret =3D -1; =20 @@ -12473,7 +12471,6 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, =20 cleanup: qemuMigrationParamsFree(migParams); - VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -12495,7 +12492,7 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, { virQEMUDriverPtr driver =3D dconn->privateData; virDomainDefPtr def =3D NULL; - char *origname =3D NULL; + VIR_AUTOFREE(char *) origname =3D NULL; qemuMigrationParamsPtr migParams =3D NULL; int ret =3D -1; =20 @@ -12540,7 +12537,6 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, =20 cleanup: qemuMigrationParamsFree(migParams); - VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -12741,7 +12737,7 @@ qemuDomainMigratePrepare3(virConnectPtr dconn, { virQEMUDriverPtr driver =3D dconn->privateData; virDomainDefPtr def =3D NULL; - char *origname =3D NULL; + VIR_AUTOFREE(char *) origname =3D NULL; qemuMigrationParamsPtr migParams =3D NULL; int ret =3D -1; =20 @@ -12776,7 +12772,6 @@ qemuDomainMigratePrepare3(virConnectPtr dconn, =20 cleanup: qemuMigrationParamsFree(migParams); - VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -12802,7 +12797,7 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, int nbdPort =3D 0; int nmigrate_disks; const char **migrate_disks =3D NULL; - char *origname =3D NULL; + VIR_AUTOFREE(char *) origname =3D NULL; qemuMigrationParamsPtr migParams =3D NULL; int ret =3D -1; =20 @@ -12865,7 +12860,6 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, cleanup: qemuMigrationParamsFree(migParams); VIR_FREE(migrate_disks); - VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -12885,7 +12879,7 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, { virQEMUDriverPtr driver =3D dconn->privateData; virDomainDefPtr def =3D NULL; - char *origname =3D NULL; + VIR_AUTOFREE(char *) origname =3D NULL; qemuMigrationParamsPtr migParams =3D NULL; int ret =3D -1; =20 @@ -12914,7 +12908,6 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, =20 cleanup: qemuMigrationParamsFree(migParams); - VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -12934,7 +12927,7 @@ qemuDomainMigratePrepareTunnel3Params(virConnectPtr= dconn, virDomainDefPtr def =3D NULL; const char *dom_xml =3D NULL; const char *dname =3D NULL; - char *origname =3D NULL; + VIR_AUTOFREE(char *) origname =3D NULL; qemuMigrationParamsPtr migParams =3D NULL; int ret =3D -1; =20 @@ -12973,7 +12966,6 @@ qemuDomainMigratePrepareTunnel3Params(virConnectPtr= dconn, =20 cleanup: qemuMigrationParamsFree(migParams); - VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -13295,7 +13287,7 @@ qemuNodeDeviceDetachFlags(virNodeDevicePtr dev, unsigned domain =3D 0, bus =3D 0, slot =3D 0, function =3D 0; int ret =3D -1; virNodeDeviceDefPtr def =3D NULL; - char *xml =3D NULL; + VIR_AUTOFREE(char *) xml =3D NULL; bool vfio =3D qemuHostdevHostSupportsPassthroughVFIO(); virHostdevManagerPtr hostdev_mgr =3D driver->hostdevMgr; =20 @@ -13345,7 +13337,6 @@ qemuNodeDeviceDetachFlags(virNodeDevicePtr dev, cleanup: virPCIDeviceFree(pci); virNodeDeviceDefFree(def); - VIR_FREE(xml); return ret; } =20 @@ -13363,7 +13354,7 @@ qemuNodeDeviceReAttach(virNodeDevicePtr dev) unsigned domain =3D 0, bus =3D 0, slot =3D 0, function =3D 0; int ret =3D -1; virNodeDeviceDefPtr def =3D NULL; - char *xml =3D NULL; + VIR_AUTOFREE(char *) xml =3D NULL; virHostdevManagerPtr hostdev_mgr =3D driver->hostdevMgr; =20 xml =3D virNodeDeviceGetXMLDesc(dev, 0); @@ -13389,7 +13380,6 @@ qemuNodeDeviceReAttach(virNodeDevicePtr dev) virPCIDeviceFree(pci); cleanup: virNodeDeviceDefFree(def); - VIR_FREE(xml); return ret; } =20 @@ -13401,7 +13391,7 @@ qemuNodeDeviceReset(virNodeDevicePtr dev) unsigned domain =3D 0, bus =3D 0, slot =3D 0, function =3D 0; int ret =3D -1; virNodeDeviceDefPtr def =3D NULL; - char *xml =3D NULL; + VIR_AUTOFREE(char *) xml =3D NULL; virHostdevManagerPtr hostdev_mgr =3D driver->hostdevMgr; =20 xml =3D virNodeDeviceGetXMLDesc(dev, 0); @@ -13427,7 +13417,6 @@ qemuNodeDeviceReset(virNodeDevicePtr dev) virPCIDeviceFree(pci); cleanup: virNodeDeviceDefFree(def); - VIR_FREE(xml); return ret; } =20 @@ -15108,7 +15097,6 @@ qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr d= river, qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - char *backingStoreStr; virDomainDiskDefPtr persistdisk; VIR_AUTOUNREF(virStorageSourcePtr) terminator =3D NULL; bool supportsCreate; @@ -15154,13 +15142,13 @@ qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr= driver, * block commit still works */ if (reuse) { if (supportsBacking) { + VIR_AUTOFREE(char *) backingStoreStr =3D NULL; + if (virStorageFileGetBackingStoreStr(dd->src, &backingStor= eStr) < 0) return -1; if (backingStoreStr !=3D NULL) { if (virStorageIsRelative(backingStoreStr)) VIR_STEAL_PTR(dd->relPath, backingStoreStr); - else - VIR_FREE(backingStoreStr); } } } else { @@ -15607,7 +15595,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, { virQEMUDriverPtr driver =3D domain->conn->privateData; virDomainObjPtr vm =3D NULL; - char *xml =3D NULL; + VIR_AUTOFREE(char *) xml =3D NULL; virDomainMomentObjPtr snap =3D NULL; virDomainSnapshotPtr snapshot =3D NULL; virDomainMomentObjPtr current =3D NULL; @@ -15895,7 +15883,6 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, =20 cleanup: virDomainObjEndAPI(&vm); - VIR_FREE(xml); return snapshot; } =20 @@ -17694,7 +17681,7 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom, virDomainDiskDefPtr disk; int ret =3D -1; virDomainObjPtr vm; - char *device =3D NULL; + VIR_AUTOFREE(char *) device =3D NULL; unsigned long long speed =3D bandwidth; =20 virCheckFlags(VIR_DOMAIN_BLOCK_JOB_SPEED_BANDWIDTH_BYTES, -1); @@ -17739,7 +17726,6 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); =20 cleanup: - VIR_FREE(device); virDomainObjEndAPI(&vm); =20 return ret; @@ -18819,7 +18805,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, virDomainDefPtr def =3D NULL; virDomainDefPtr persistentDef =3D NULL; virDomainBlockIoTuneInfo info; - char *drivealias =3D NULL; + VIR_AUTOFREE(char *) drivealias =3D NULL; const char *qdevid =3D NULL; int ret =3D -1; size_t i; @@ -19146,7 +19132,6 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, =20 cleanup: VIR_FREE(info.group_name); - VIR_FREE(drivealias); virDomainObjEndAPI(&vm); if (eventNparams) virTypedParamsFree(eventParams, eventNparams); @@ -19167,7 +19152,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, virDomainDefPtr def =3D NULL; virDomainDefPtr persistentDef =3D NULL; virDomainBlockIoTuneInfo reply =3D {0}; - char *drivealias =3D NULL; + VIR_AUTOFREE(char *) drivealias =3D NULL; const char *qdevid =3D NULL; int ret =3D -1; int maxparams; @@ -19304,7 +19289,6 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, =20 cleanup: VIR_FREE(reply.group_name); - VIR_FREE(drivealias); virDomainObjEndAPI(&vm); return ret; } @@ -20928,12 +20912,10 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDe= fPtr disk, bool blockdev) =20 { - char *alias =3D NULL; virStorageSourcePtr n; const char *frontendalias; const char *backendalias; const char *backendstoragealias; - int ret =3D -1; =20 /* * This helps to keep logs clean from error messages on getting stats @@ -20950,6 +20932,8 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDefP= tr disk, } =20 for (n =3D disk->src; virStorageSourceIsBacking(n); n =3D n->backingSt= ore) { + VIR_AUTOFREE(char *) alias =3D NULL; + if (blockdev) { frontendalias =3D QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName; backendalias =3D n->nodeformat; @@ -20958,7 +20942,7 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDefP= tr disk, /* alias may be NULL if the VM is not running */ if (disk->info.alias && !(alias =3D qemuDomainStorageAlias(disk->info.alias, n->id= ))) - goto cleanup; + return -1; =20 qemuDomainGetStatsOneBlockRefreshNamed(n, alias, stats, nodest= ats); =20 @@ -20968,37 +20952,32 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDe= fPtr disk, } =20 if (qemuDomainGetStatsBlockExportHeader(disk, n, *recordnr, params= ) < 0) - goto cleanup; + return -1; =20 /* The following stats make sense only for the frontend device */ if (n =3D=3D disk->src) { if (qemuDomainGetStatsBlockExportFrontend(frontendalias, stats= , *recordnr, params) < 0) - goto cleanup; + return -1; } =20 if (qemuDomainGetStatsOneBlock(driver, cfg, dom, params, backendalias, n, *recordnr, stats) < 0) - goto cleanup; + return -1; =20 if (qemuDomainGetStatsBlockExportBackendStorage(backendstoragealia= s, stats, *recordnr, params) < 0) - goto cleanup; + return -1; =20 - VIR_FREE(alias); (*recordnr)++; =20 if (!visitBacking) break; } =20 - ret =3D 0; - - cleanup: - VIR_FREE(alias); - return ret; + return 0; } =20 =20 @@ -21714,12 +21693,12 @@ qemuDomainRenameCallback(virDomainObjPtr vm, virObjectEventPtr event_new =3D NULL; virObjectEventPtr event_old =3D NULL; int ret =3D -1; - char *new_dom_name =3D NULL; - char *old_dom_name =3D NULL; - char *new_dom_cfg_file =3D NULL; - char *old_dom_cfg_file =3D NULL; - char *new_dom_autostart_link =3D NULL; - char *old_dom_autostart_link =3D NULL; + VIR_AUTOFREE(char *) new_dom_name =3D NULL; + VIR_AUTOFREE(char *) old_dom_name =3D NULL; + VIR_AUTOFREE(char *) new_dom_cfg_file =3D NULL; + VIR_AUTOFREE(char *) old_dom_cfg_file =3D NULL; + VIR_AUTOFREE(char *) new_dom_autostart_link =3D NULL; + VIR_AUTOFREE(char *) old_dom_autostart_link =3D NULL; =20 virCheckFlags(0, ret); =20 @@ -21791,12 +21770,6 @@ qemuDomainRenameCallback(virDomainObjPtr vm, ret =3D 0; =20 cleanup: - VIR_FREE(old_dom_autostart_link); - VIR_FREE(new_dom_autostart_link); - VIR_FREE(old_dom_cfg_file); - VIR_FREE(new_dom_cfg_file); - VIR_FREE(old_dom_name); - VIR_FREE(new_dom_name); virObjectEventStateQueue(driver->domainEventState, event_old); virObjectEventStateQueue(driver->domainEventState, event_new); return ret; @@ -21901,7 +21874,7 @@ qemuDomainGetGuestVcpusParams(virTypedParameterPtr = *params, virBitmapPtr vcpus =3D NULL; virBitmapPtr online =3D NULL; virBitmapPtr offlinable =3D NULL; - char *tmp =3D NULL; + VIR_AUTOFREE(char *) tmp =3D NULL; size_t i; int ret =3D -1; =20 @@ -21930,7 +21903,6 @@ qemuDomainGetGuestVcpusParams(virTypedParameterPtr = *params, goto cleanup; \ if (virTypedParamsAddString(&par, &npar, &maxpar, #name, tmp) < 0) \ goto cleanup; \ - VIR_FREE(tmp) =20 ADD_BITMAP(vcpus); ADD_BITMAP(online); @@ -21944,7 +21916,6 @@ qemuDomainGetGuestVcpusParams(virTypedParameterPtr = *params, ret =3D 0; =20 cleanup: - VIR_FREE(tmp); virBitmapFree(vcpus); virBitmapFree(online); virBitmapFree(offlinable); @@ -22172,7 +22143,7 @@ qemuDomainSetBlockThreshold(virDomainPtr dom, qemuDomainObjPrivatePtr priv; virDomainObjPtr vm =3D NULL; virStorageSourcePtr src; - char *nodename =3D NULL; + VIR_AUTOFREE(char *) nodename =3D NULL; int rc; int ret =3D -1; =20 @@ -22226,7 +22197,6 @@ qemuDomainSetBlockThreshold(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); =20 cleanup: - VIR_FREE(nodename); virDomainObjEndAPI(&vm); return ret; } @@ -22400,7 +22370,7 @@ qemuDomainGetSEVMeasurement(virQEMUDriverPtr driver, unsigned int flags) { int ret =3D -1; - char *tmp =3D NULL; + VIR_AUTOFREE(char *) tmp =3D NULL; int maxpar =3D 0; =20 virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1); @@ -22425,7 +22395,6 @@ qemuDomainGetSEVMeasurement(virQEMUDriverPtr driver, ret =3D 0; =20 endjob: - VIR_FREE(tmp); qemuDomainObjEndJob(driver, vm); return ret; } --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list