From nobody Sat Feb 7 20:47:51 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=1568836473; cv=none; d=zoho.com; s=zohoarc; b=IoBGaX0+tN5iqIBniDf3jVHa5bYYICQOSVALM+AeDPS/xpowh/kACSYzOELdRj+jvYKYrELvTP9f0hffjP2befS/o1iX3IRIZiHCO1TSgErmkZZeQeDQ0lphTNBLH1ri/ftRRudYz1xh/Rj6cKHHavYd99qY1iPLDjc3LZuvx7s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568836473; 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=UcLqQZg8tiGTFQWIoEDMcZOHfjnM9qstpbhs9lUarAI=; b=Z3CcR1xHijDhHGeoilYXNzfbaywd0sJt/nFg5vUKkBLw29pzYsDoYAO41+o6lUkEeCJFghxgowB82E5ysAu7akNSKiKPbqRQ8QqJOPpwGihPwVr15PrDo/IOQ6UWfBGIwcIogizmDY+bYQYxkKCeAWGL71fFf6KvtszcghxvfjA= 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 1568836473321507.2221944373905; Wed, 18 Sep 2019 12:54:33 -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 66D583DE31; Wed, 18 Sep 2019 19:54:30 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A390F19C5B; Wed, 18 Sep 2019 19:54:29 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 5D6F24E58A; Wed, 18 Sep 2019 19:54:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x8IJrRtY027101 for ; Wed, 18 Sep 2019 15:53:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 41BD65D9E1; Wed, 18 Sep 2019 19:53:27 +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 3C6765D9CC for ; Wed, 18 Sep 2019 19:53:27 +0000 (UTC) Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 07B6A3084025 for ; Wed, 18 Sep 2019 19:53:26 +0000 (UTC) Received: by mail-qt1-f193.google.com with SMTP id u40so1210691qth.11 for ; Wed, 18 Sep 2019 12:53:25 -0700 (PDT) Received: from localhost.localdomain ([2804:18:866:c944:d7b6:5cb4:9b19:2264]) by smtp.gmail.com with ESMTPSA id f27sm2764839qtv.85.2019.09.18.12.53.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2019 12:53:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JVsK1SY3Ny5t+GSICGGVvJBQvlpmWVi6PBcSHw/Sd+4=; b=pGHwXn/p8nNhDCLBpsZzuFYL13hosizn9ef7gPL+Osy7jprWKsyd8wcFVKZoLmF5Xm x0H47JJ0AGrBLkvzpH6OWE0F55Hijjer/yFKd8qla3hzozLrItk7hC/v5Q7rNm5DvUE/ UoDs+ayDwxgwqO4DSB1Sa2qpGnDfSXfTgHjIlXsibnJJz5QEOBEkYyrlq1zs0idWWJ90 7zby/iJAVj4bf65nKeZdDPkuSALLmjMLJWG8weJrmkEKsF5dEY+zRXIQJcxp+fNRIwWV VuRrx+Xov8PF3bmw2vzUCQHjFZaCNjRHFzQodRxM6DK3jXdQxSCD46N4Flf5dlqSDhGb /WVA== 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=JVsK1SY3Ny5t+GSICGGVvJBQvlpmWVi6PBcSHw/Sd+4=; b=cSBBowuFZXqROPhWZ+N57S+LP3W0vBDEwR0K9C/1Yw5dSQXd2dydg8E1GKDTROokyB 94dgdKU7Z6meDgQKRErLh+FMdFi4qQcz8j4crbyzmLIW1IgJy7LrXj6xIG0M7NNwDoOC xlHfZhJDfnBIL7Mgwfm2qCaQurskd31+THD2UdnKTxzxhbF3C/sHTvPS0EykxlNsn8GU G61S4D2ce1FH1L29nSfktTTGfyYgAzBg5c26uuWWugfPtSQQsk4stIQOYm+N038VhyFV CXjUl83AgZNQOs861UVKoEBjVLQsSCogO58aeUeb3J3tECW/s2oarKUV5Mjp35OMmiOV 0HRA== X-Gm-Message-State: APjAAAXhv3XJd9TkMQa0YQ5c5kRnOPg8GBnPjtMct8Q6GUc9Uq7/Uayo AUKxxcOznbgIzuiH1VtTbJxzsHz3rJs= X-Google-Smtp-Source: APXvYqzjW7R6ySAlcRIooK/OvMFvyZmhYkH/YacZ/RcoKwv5pCvIgwsJ0IgKHJAsBWMbZGT12gYaGQ== X-Received: by 2002:ac8:1194:: with SMTP id d20mr4067034qtj.294.1568836405118; Wed, 18 Sep 2019 12:53:25 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Wed, 18 Sep 2019 16:53:07 -0300 Message-Id: <20190918195308.3236-3-danielhb413@gmail.com> In-Reply-To: <20190918195308.3236-1-danielhb413@gmail.com> References: <20190918195308.3236-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 19:53:26 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Wed, 18 Sep 2019 19:53:26 +0000 (UTC) for IP:'209.85.160.193' DOMAIN:'mail-qt1-f193.google.com' HELO:'mail-qt1-f193.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.153 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS) 209.85.160.193 mail-qt1-f193.google.com 209.85.160.193 mail-qt1-f193.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.40 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH 2/3] qemu_hotplug.c: use VIR_AUTOFREE() in 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.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.29]); Wed, 18 Sep 2019 19:54:31 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Using VIR_AUTOFREE() spare us from calling VIR_VREE() and sometimes a whole 'cleanup' label can be erased as well. There are quite a few strings in qemu_hotplug.c to be auto-freed. This is the second part of this change. Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_hotplug.c | 87 ++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 57 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 5b1639b48d..787a4f01f5 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2340,8 +2340,8 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); unsigned long long oldmem =3D virDomainDefGetMemoryTotal(vm->def); unsigned long long newmem =3D oldmem + mem->size; - char *devstr =3D NULL; - char *objalias =3D NULL; + VIR_AUTOFREE(char *) devstr =3D NULL; + VIR_AUTOFREE(char *) objalias =3D NULL; bool objAdded =3D false; bool teardownlabel =3D false; bool teardowncgroup =3D false; @@ -2438,8 +2438,6 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, } =20 virJSONValueFree(props); - VIR_FREE(devstr); - VIR_FREE(objalias); virDomainMemoryDefFree(mem); return ret; =20 @@ -2478,7 +2476,7 @@ qemuDomainAttachHostUSBDevice(virQEMUDriverPtr driver, virDomainHostdevDefPtr hostdev) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - char *devstr =3D NULL; + VIR_AUTOFREE(char *) devstr =3D NULL; bool added =3D false; bool teardowncgroup =3D false; bool teardownlabel =3D false; @@ -2540,7 +2538,6 @@ qemuDomainAttachHostUSBDevice(virQEMUDriverPtr driver, qemuHostdevReAttachUSBDevices(driver, vm->def->name, &hostdev,= 1); virDomainUSBAddressRelease(priv->usbaddrs, hostdev->info); } - VIR_FREE(devstr); return ret; } =20 @@ -2554,10 +2551,10 @@ qemuDomainAttachHostSCSIDevice(virQEMUDriverPtr dri= ver, int ret =3D -1; qemuDomainObjPrivatePtr priv =3D vm->privateData; virErrorPtr orig_err; - char *devstr =3D NULL; - char *drvstr =3D NULL; - char *drivealias =3D NULL; - char *secobjAlias =3D NULL; + VIR_AUTOFREE(char *) devstr =3D NULL; + VIR_AUTOFREE(char *) drvstr =3D NULL; + VIR_AUTOFREE(char *) drivealias =3D NULL; + VIR_AUTOFREE(char *) secobjAlias =3D NULL; bool teardowncgroup =3D false; bool teardownlabel =3D false; bool teardowndevice =3D false; @@ -2659,10 +2656,6 @@ qemuDomainAttachHostSCSIDevice(virQEMUDriverPtr driv= er, } qemuDomainSecretHostdevDestroy(hostdev); virJSONValueFree(secobjProps); - VIR_FREE(secobjAlias); - VIR_FREE(drivealias); - VIR_FREE(drvstr); - VIR_FREE(devstr); return ret; =20 exit_monitor: @@ -2692,9 +2685,9 @@ qemuDomainAttachSCSIVHostDevice(virQEMUDriverPtr driv= er, virDomainDeviceDef dev =3D { VIR_DOMAIN_DEVICE_HOSTDEV, { .hostdev =3D hostdev } }; virDomainCCWAddressSetPtr ccwaddrs =3D NULL; - char *vhostfdName =3D NULL; + VIR_AUTOFREE(char *) vhostfdName =3D NULL; int vhostfd =3D -1; - char *devstr =3D NULL; + VIR_AUTOFREE(char *) devstr =3D NULL; bool teardowncgroup =3D false; bool teardownlabel =3D false; bool teardowndevice =3D false; @@ -2790,8 +2783,6 @@ qemuDomainAttachSCSIVHostDevice(virQEMUDriverPtr driv= er, virDomainCCWAddressSetFree(ccwaddrs); =20 VIR_FORCE_CLOSE(vhostfd); - VIR_FREE(vhostfdName); - VIR_FREE(devstr); return ret; } =20 @@ -2802,7 +2793,7 @@ qemuDomainAttachMediatedDevice(virQEMUDriverPtr drive= r, virDomainHostdevDefPtr hostdev) { int ret =3D -1; - char *devstr =3D NULL; + VIR_AUTOFREE(char *) devstr =3D NULL; bool added =3D false; bool teardowncgroup =3D false; bool teardownlabel =3D false; @@ -2887,7 +2878,6 @@ qemuDomainAttachMediatedDevice(virQEMUDriverPtr drive= r, 1); qemuDomainReleaseDeviceAddress(vm, hostdev->info); } - VIR_FREE(devstr); return ret; } =20 @@ -2952,9 +2942,9 @@ qemuDomainAttachShmemDevice(virQEMUDriverPtr driver, virDomainShmemDefPtr shmem) { int ret =3D -1; - char *shmstr =3D NULL; - char *charAlias =3D NULL; - char *memAlias =3D NULL; + VIR_AUTOFREE(char *) shmstr =3D NULL; + VIR_AUTOFREE(char *) charAlias =3D NULL; + VIR_AUTOFREE(char *) memAlias =3D NULL; bool release_backing =3D false; bool release_address =3D true; virErrorPtr orig_err =3D NULL; @@ -3043,9 +3033,6 @@ qemuDomainAttachShmemDevice(virQEMUDriverPtr driver, qemuDomainReleaseDeviceAddress(vm, &shmem->info); =20 virJSONValueFree(props); - VIR_FREE(memAlias); - VIR_FREE(charAlias); - VIR_FREE(shmstr); =20 return ret; =20 @@ -3077,7 +3064,7 @@ qemuDomainAttachWatchdog(virQEMUDriverPtr driver, virDomainDeviceDef dev =3D { VIR_DOMAIN_DEVICE_WATCHDOG, { .watchdog = =3D watchdog } }; virDomainWatchdogAction actualAction =3D watchdog->action; const char *actionStr =3D NULL; - char *watchdogstr =3D NULL; + VIR_AUTOFREE(char *) watchdogstr =3D NULL; bool releaseAddress =3D false; int rv; =20 @@ -3134,7 +3121,6 @@ qemuDomainAttachWatchdog(virQEMUDriverPtr driver, cleanup: if (releaseAddress) qemuDomainReleaseDeviceAddress(vm, &watchdog->info); - VIR_FREE(watchdogstr); return ret; } =20 @@ -3145,7 +3131,7 @@ qemuDomainAttachInputDevice(virQEMUDriverPtr driver, virDomainInputDefPtr input) { int ret =3D -1; - char *devstr =3D NULL; + VIR_AUTOFREE(char *) devstr =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; virDomainDeviceDef dev =3D { VIR_DOMAIN_DEVICE_INPUT, { .input =3D input } }; @@ -3229,7 +3215,6 @@ qemuDomainAttachInputDevice(virQEMUDriverPtr driver, virErrorRestore(&originalError); } =20 - VIR_FREE(devstr); return ret; =20 exit_monitor: @@ -3253,8 +3238,8 @@ qemuDomainAttachVsockDevice(virQEMUDriverPtr driver, virErrorPtr originalError =3D NULL; const char *fdprefix =3D "vsockfd"; bool releaseaddr =3D false; - char *fdname =3D NULL; - char *devstr =3D NULL; + VIR_AUTOFREE(char *) fdname =3D NULL; + VIR_AUTOFREE(char *) devstr =3D NULL; int ret =3D -1; =20 if (vm->def->vsock) { @@ -3305,8 +3290,6 @@ qemuDomainAttachVsockDevice(virQEMUDriverPtr driver, virErrorRestore(&originalError); } =20 - VIR_FREE(devstr); - VIR_FREE(fdname); return ret; =20 exit_monitor: @@ -3986,22 +3969,21 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr = driver, qemuDomainObjPrivatePtr priv =3D vm->privateData; time_t now =3D time(NULL); const char *expire; - char *validTo =3D NULL; + VIR_AUTOFREE(char *) validTo =3D NULL; const char *connected =3D NULL; const char *password; int ret =3D -1; =20 - if (!auth->passwd && !defaultPasswd) { - ret =3D 0; - goto cleanup; - } + if (!auth->passwd && !defaultPasswd) + return ret; + password =3D auth->passwd ? auth->passwd : defaultPasswd; =20 if (auth->connected) connected =3D virDomainGraphicsAuthConnectedTypeToString(auth->con= nected); =20 if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) - goto cleanup; + return ret; ret =3D qemuMonitorSetPassword(priv->mon, type, password, connected); =20 if (ret !=3D 0) @@ -4023,8 +4005,7 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr dr= iver, end_job: if (qemuDomainObjExitMonitor(driver, vm) < 0) ret =3D -1; - cleanup: - VIR_FREE(validTo); + return ret; } =20 @@ -4362,7 +4343,7 @@ qemuDomainRemoveMemoryDevice(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv =3D vm->privateData; unsigned long long oldmem =3D virDomainDefGetMemoryTotal(vm->def); unsigned long long newmem =3D oldmem - mem->size; - char *backendAlias =3D NULL; + VIR_AUTOFREE(char *) backendAlias =3D NULL; int rc; int idx; =20 @@ -4377,8 +4358,6 @@ qemuDomainRemoveMemoryDevice(virQEMUDriverPtr driver, if (qemuDomainObjExitMonitor(driver, vm) < 0) rc =3D -1; =20 - VIR_FREE(backendAlias); - virDomainAuditMemory(vm, oldmem, newmem, "update", rc =3D=3D 0); if (rc < 0) return -1; @@ -4462,10 +4441,9 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver, { virDomainNetDefPtr net =3D NULL; size_t i; - int ret =3D -1; qemuDomainObjPrivatePtr priv =3D vm->privateData; - char *drivealias =3D NULL; - char *objAlias =3D NULL; + VIR_AUTOFREE(char *) drivealias =3D NULL; + VIR_AUTOFREE(char *) objAlias =3D NULL; bool is_vfio =3D false; =20 VIR_DEBUG("Removing host device %s from domain %p %s", @@ -4481,7 +4459,7 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver, virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc =3D &scsisrc->u.iscsi; =20 if (!(drivealias =3D qemuAliasFromHostdev(hostdev))) - goto cleanup; + return -1; =20 /* Look for the markers that the iSCSI hostdev was added with a * secret object to manage the username/password. If present, let's @@ -4490,7 +4468,7 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver, virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_ISCSI_PASSWORD_SECRET= ) && qemuDomainStorageSourceHasAuth(iscsisrc->src)) { if (!(objAlias =3D qemuDomainGetSecretAESAlias(hostdev->info->= alias, false))) - goto cleanup; + return -1; } =20 qemuDomainObjEnterMonitor(driver, vm); @@ -4501,7 +4479,7 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver, ignore_value(qemuMonitorDelObject(priv->mon, objAlias)); =20 if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + return -1; } =20 if (hostdev->parentnet) { @@ -4572,12 +4550,7 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver, virDomainNetDefFree(net); } =20 - ret =3D 0; - - cleanup: - VIR_FREE(drivealias); - VIR_FREE(objAlias); - return ret; + return 0; } =20 =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list