From nobody Wed May 1 14:14:19 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=1568836489; cv=none; d=zoho.com; s=zohoarc; b=C28q1JSLrcZYvFek+HfozfXsCnA8Gr8Ln/cH+1/Xs6IXgBZe1/cTxaC0KiFWdFV3CgkXn5UQi4zKLW8AuGKKaDM/HmwUYy6R1jBjfeGN40coUNrtLyUrKi2PlDiBIODQVjOQNUxVQDJtVDqxtg637ViB2GjDLTit9V2UFTKpm90= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568836489; 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=F63w7uqGvh6vv94TS0g6QDN4+uksd0f68XNhPnqaqIM=; b=W3F7h8VnEp/l3JIPQk0G86UrV5qH0W03xgzG2vF1k/wkDcpx8QtiP2qkBoI7nDCRjHLLH+WJGNPmOjREYB/VYYrfkNQwcRaUHn/JR8h7LvValeuG/8jt9i9MeDbEEHugrN0I2AQ/2ExkVc7Chx6mQXN2MbqkI5HOsaG+eRHMHQQ= 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 1568836489448158.9707614883897; Wed, 18 Sep 2019 12:54:49 -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 69224300BEA2; Wed, 18 Sep 2019 19:54:47 +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 3EC5A60C18; Wed, 18 Sep 2019 19:54:47 +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 010F918037CA; Wed, 18 Sep 2019 19:54:46 +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 x8IJrPcv027083 for ; Wed, 18 Sep 2019 15:53:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id 493AC5D9E5; Wed, 18 Sep 2019 19:53:25 +0000 (UTC) Received: from mx1.redhat.com (ext-mx21.extmail.prod.ext.phx2.redhat.com [10.5.110.62]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 42DF35D9CC for ; Wed, 18 Sep 2019 19:53:24 +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 DC65718C4278 for ; Wed, 18 Sep 2019 19:53:23 +0000 (UTC) Received: by mail-qt1-f194.google.com with SMTP id c3so1214951qtv.10 for ; Wed, 18 Sep 2019 12:53:23 -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.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2019 12:53:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=P68VtNaKev5IZHyARnJ9beN424T0y4X5Qr7hBATLkKw=; b=mXotmFJAg0ccydPVlrHw+BF2rVkwQl+XupO6CT9f4IdpW1N3nW5p8XM3ZYCKIroQgD 2EQf68Fh1AsJL0XJfMgpygkbOdVz93+EdY68HdSoIEPhwhbbTbqOHoAMQ3faKslsrLre CyGsfbmebsnuONqe35hiHO+n3xCxiUZeRRAUYhLfaj6MGcjR4lSgcecpjr8p0fi3fsR9 Ig3ZWCkaXNTavj/qNWMzkEjFhAZhSQHk1YHOAMCAfTlOGxlVwZyvr6el9Hm16agUfPSu VNC+iITrohIzfWtQNFumKv4Ygq+vu5SKP/Vb+QXDGki57gOhdKtsIEFCGLpqwNQqylcu GLTA== 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=P68VtNaKev5IZHyARnJ9beN424T0y4X5Qr7hBATLkKw=; b=XZXurRSFQCuVaA/e6ODftLaL0x0g63BAgvgiFMBsFJUh3By2gO5FLdlbp4tIpe3ThX rRmfcV44HBEK2x280S07q/9bwDo4sy31pVENINdAFG+5hOhpk5YIgI5VvuM5kXtbFi3m VhZGuLxC9enI7czybxnY2fQ9wVEFK83kUuTmk5NS1k9Sjfu7SD7yb/4A4t3mqMcyDLbd 7XR98rfwa2UqBER3+AsQzbGo5l9ocqCXpcdRuxaZK6bKtnaU7F4cxGGxcJRzRrWwNMzz Yunprxm0Xr+jmEcqMFE9eiszbVEdnRCJeAngsJ8AhtxJgI24e2jthmLEL1PybeC5SSv0 qCkQ== X-Gm-Message-State: APjAAAVfORSnsrD/fopUx5lOguKV8b9+xUunX6Q613jEiemK+HqZxOE6 N6DudVJifGNw3w9WUVwoHQ9MtQBP12o= X-Google-Smtp-Source: APXvYqzM1ZqmT69Xw7/Ija8UJ7+xOoC23/LTz59wnFyjETBig8i/P4y6i4VMgywyvtph0TzYsZUZfg== X-Received: by 2002:ac8:71ca:: with SMTP id i10mr6058620qtp.149.1568836402935; Wed, 18 Sep 2019 12:53:22 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Wed, 18 Sep 2019 16:53:06 -0300 Message-Id: <20190918195308.3236-2-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.6.2 (mx1.redhat.com [10.5.110.62]); Wed, 18 Sep 2019 19:53:24 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.62]); Wed, 18 Sep 2019 19:53:24 +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.62 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH 1/3] qemu_hotplug.c: use VIR_AUTOFREE() in 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Wed, 18 Sep 2019 19:54:47 +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 first part of this change. Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_hotplug.c | 106 +++++++++++++--------------------------- 1 file changed, 33 insertions(+), 73 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 62e505b779..5b1639b48d 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -136,20 +136,15 @@ static int qemuDomainAttachZPCIDevice(qemuMonitorPtr mon, virDomainDeviceInfoPtr info) { - char *devstr_zpci =3D NULL; - int ret =3D -1; + VIR_AUTOFREE(char *) devstr_zpci =3D NULL; =20 if (!(devstr_zpci =3D qemuBuildZPCIDevStr(info))) - goto cleanup; + return -1; =20 if (qemuMonitorAddDevice(mon, devstr_zpci) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - VIR_FREE(devstr_zpci); - return ret; + return 0; } =20 =20 @@ -157,20 +152,15 @@ static int qemuDomainDetachZPCIDevice(qemuMonitorPtr mon, virDomainDeviceInfoPtr info) { - char *zpciAlias =3D NULL; - int ret =3D -1; + VIR_AUTOFREE(char *) zpciAlias =3D NULL; =20 if (virAsprintf(&zpciAlias, "zpci%d", info->addr.pci.zpci.uid) < 0) - goto cleanup; + return -1; =20 if (qemuMonitorDelDevice(mon, zpciAlias) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - VIR_FREE(zpciAlias); - return ret; + return 0; } =20 =20 @@ -517,7 +507,7 @@ qemuDomainChangeMediaBlockdev(virQEMUDriverPtr driver, qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); VIR_AUTOPTR(qemuBlockStorageSourceChainData) newbackend =3D NULL; VIR_AUTOPTR(qemuBlockStorageSourceChainData) oldbackend =3D NULL; - char *nodename =3D NULL; + VIR_AUTOFREE(char *) nodename =3D NULL; int rc; int ret =3D -1; =20 @@ -572,7 +562,6 @@ qemuDomainChangeMediaBlockdev(virQEMUDriverPtr driver, ret =3D 0; =20 cleanup: - VIR_FREE(nodename); return ret; } =20 @@ -823,7 +812,7 @@ int qemuDomainAttachControllerDevice(virQEMUDriverPtr d= river, { int ret =3D -1; const char* type =3D virDomainControllerTypeToString(controller->type); - char *devstr =3D NULL; + VIR_AUTOFREE(char *) devstr =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; virDomainDeviceDef dev =3D { VIR_DOMAIN_DEVICE_CONTROLLER, { .controller =3D controller } }; @@ -890,7 +879,6 @@ int qemuDomainAttachControllerDevice(virQEMUDriverPtr d= river, if (ret !=3D 0 && releaseaddr) qemuDomainReleaseDeviceAddress(vm, &controller->info); =20 - VIR_FREE(devstr); return ret; } =20 @@ -1156,8 +1144,8 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, int *vhostfd =3D NULL; size_t vhostfdSize =3D 0; size_t queueSize =3D 0; - char *nicstr =3D NULL; - char *netstr =3D NULL; + VIR_AUTOFREE(char *) nicstr =3D NULL; + VIR_AUTOFREE(char *) netstr =3D NULL; int ret =3D -1; bool releaseaddr =3D false; bool iface_connected =3D false; @@ -1166,10 +1154,10 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); virDomainCCWAddressSetPtr ccwaddrs =3D NULL; size_t i; - char *charDevAlias =3D NULL; + VIR_AUTOFREE(char *) charDevAlias =3D NULL; bool charDevPlugged =3D false; bool netdevPlugged =3D false; - char *netdev_name; + VIR_AUTOFREE(char *) netdev_name =3D NULL; virConnectPtr conn =3D NULL; virErrorPtr save_err =3D NULL; =20 @@ -1499,8 +1487,6 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, virErrorRestore(&save_err); } =20 - VIR_FREE(nicstr); - VIR_FREE(netstr); for (i =3D 0; tapfd && i < tapfdSize; i++) { VIR_FORCE_CLOSE(tapfd[i]); if (tapfdName) @@ -1515,7 +1501,6 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, } VIR_FREE(vhostfd); VIR_FREE(vhostfdName); - VIR_FREE(charDevAlias); virObjectUnref(conn); virDomainCCWAddressSetFree(ccwaddrs); VIR_FORCE_CLOSE(slirpfd); @@ -1539,7 +1524,6 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, VIR_WARN("Failed to remove network backend for netdev %s", netdev_name); ignore_value(qemuDomainObjExitMonitor(driver, vm)); - VIR_FREE(netdev_name); } virErrorRestore(&originalError); goto cleanup; @@ -1556,7 +1540,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver, { .hostdev =3D hostdev } }; virDomainDeviceInfoPtr info =3D hostdev->info; int ret; - char *devstr =3D NULL; + VIR_AUTOFREE(char *) devstr =3D NULL; bool releaseaddr =3D false; bool teardowncgroup =3D false; bool teardownlabel =3D false; @@ -1658,8 +1642,6 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver, =20 vm->def->hostdevs[vm->def->nhostdevs++] =3D hostdev; =20 - VIR_FREE(devstr); - return 0; =20 error: @@ -1679,8 +1661,6 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver, =20 qemuHostdevReAttachPCIDevices(driver, vm->def->name, &hostdev, 1); =20 - VIR_FREE(devstr); - cleanup: return -1; } @@ -1726,7 +1706,7 @@ qemuDomainAddTLSObjects(virQEMUDriverPtr driver, { qemuDomainObjPrivatePtr priv =3D vm->privateData; virErrorPtr orig_err; - char *secAlias =3D NULL; + VIR_AUTOFREE(char *) secAlias =3D NULL; =20 if (!tlsProps && !secProps) return 0; @@ -1742,8 +1722,6 @@ qemuDomainAddTLSObjects(virQEMUDriverPtr driver, qemuMonitorAddObject(priv->mon, tlsProps, NULL) < 0) goto error; =20 - VIR_FREE(secAlias); - return qemuDomainObjExitMonitor(driver, vm); =20 error: @@ -1751,7 +1729,6 @@ qemuDomainAddTLSObjects(virQEMUDriverPtr driver, ignore_value(qemuDomainObjExitMonitor(driver, vm)); virErrorRestore(&orig_err); qemuDomainDelTLSObjects(driver, vm, asyncJob, secAlias, NULL); - VIR_FREE(secAlias); =20 return -1; } @@ -1850,20 +1827,18 @@ qemuDomainDelChardevTLSObjects(virQEMUDriverPtr dri= ver, virDomainChrSourceDefPtr dev, const char *inAlias) { - int ret =3D -1; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); qemuDomainObjPrivatePtr priv =3D vm->privateData; - char *tlsAlias =3D NULL; - char *secAlias =3D NULL; + VIR_AUTOFREE(char *) tlsAlias =3D NULL; + VIR_AUTOFREE(char *) secAlias =3D NULL; =20 if (dev->type !=3D VIR_DOMAIN_CHR_TYPE_TCP || dev->data.tcp.haveTLS !=3D VIR_TRISTATE_BOOL_YES) { - ret =3D 0; - goto cleanup; + return 0; } =20 if (!(tlsAlias =3D qemuAliasTLSObjFromSrcAlias(inAlias))) - goto cleanup; + return -1; =20 /* Best shot at this as the secinfo is destroyed after process launch * and this path does not recreate it. Thus, if the config has the @@ -1871,7 +1846,7 @@ qemuDomainDelChardevTLSObjects(virQEMUDriverPtr drive= r, * secAlias which we'll attempt to destroy. */ if (cfg->chardevTLSx509secretUUID && !(secAlias =3D qemuDomainGetSecretAESAlias(inAlias, false))) - goto cleanup; + return -1; =20 qemuDomainObjEnterMonitor(driver, vm); =20 @@ -1880,14 +1855,9 @@ qemuDomainDelChardevTLSObjects(virQEMUDriverPtr driv= er, ignore_value(qemuMonitorDelObject(priv->mon, secAlias)); =20 if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - VIR_FREE(tlsAlias); - VIR_FREE(secAlias); - return ret; + return 0; } =20 =20 @@ -1898,10 +1868,10 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr= driver, int ret =3D -1; qemuDomainObjPrivatePtr priv =3D vm->privateData; virDomainDefPtr def =3D vm->def; - char *charAlias =3D NULL; - char *devstr =3D NULL; + VIR_AUTOFREE(char *) charAlias =3D NULL; + VIR_AUTOFREE(char *) devstr =3D NULL; bool chardevAdded =3D false; - char *tlsAlias =3D NULL; + VIR_AUTOFREE(char *) tlsAlias =3D NULL; const char *secAlias =3D NULL; bool need_release =3D false; virErrorPtr orig_err; @@ -1948,9 +1918,6 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr d= river, cleanup: if (ret < 0 && need_release) qemuDomainReleaseDeviceAddress(vm, &redirdev->info); - VIR_FREE(tlsAlias); - VIR_FREE(charAlias); - VIR_FREE(devstr); return ret; =20 exit_monitor: @@ -2134,14 +2101,14 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driv= er, qemuDomainObjPrivatePtr priv =3D vm->privateData; virErrorPtr orig_err; virDomainDefPtr vmdef =3D vm->def; - char *devstr =3D NULL; + VIR_AUTOFREE(char *) devstr =3D NULL; virDomainChrSourceDefPtr dev =3D chr->source; - char *charAlias =3D NULL; + VIR_AUTOFREE(char *)charAlias =3D NULL; bool chardevAttached =3D false; bool teardowncgroup =3D false; bool teardowndevice =3D false; bool teardownlabel =3D false; - char *tlsAlias =3D NULL; + VIR_AUTOFREE(char *) tlsAlias =3D NULL; const char *secAlias =3D NULL; bool need_release =3D false; bool guestfwd =3D false; @@ -2222,9 +2189,6 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver, if (teardowndevice && qemuDomainNamespaceTeardownChardev(vm, chr) = < 0) VIR_WARN("Unable to remove chr device from /dev"); } - VIR_FREE(tlsAlias); - VIR_FREE(charAlias); - VIR_FREE(devstr); return ret; =20 exit_monitor: @@ -2249,10 +2213,10 @@ qemuDomainAttachRNGDevice(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv =3D vm->privateData; virDomainDeviceDef dev =3D { VIR_DOMAIN_DEVICE_RNG, { .rng =3D rng } }; virErrorPtr orig_err; - char *devstr =3D NULL; - char *charAlias =3D NULL; - char *objAlias =3D NULL; - char *tlsAlias =3D NULL; + VIR_AUTOFREE(char *) devstr =3D NULL; + VIR_AUTOFREE(char *) charAlias =3D NULL; + VIR_AUTOFREE(char *) objAlias =3D NULL; + VIR_AUTOFREE(char *) tlsAlias =3D NULL; const char *secAlias =3D NULL; bool releaseaddr =3D false; bool teardowncgroup =3D false; @@ -2338,10 +2302,6 @@ qemuDomainAttachRNGDevice(virQEMUDriverPtr driver, VIR_WARN("Unable to remove chr device from /dev"); } =20 - VIR_FREE(tlsAlias); - VIR_FREE(charAlias); - VIR_FREE(objAlias); - VIR_FREE(devstr); return ret; =20 exit_monitor: --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Wed May 1 14:14:19 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=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 From nobody Wed May 1 14:14:19 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=1568836494; cv=none; d=zoho.com; s=zohoarc; b=KpMT3qRHdE9LffKTqOj/78cxt66OQ5Efqji+oOhAyi+GW2rg8O4Dwo9YJm+16entAo1cnM76Lp8D2g1TSPi56BMOG8Hl94+OOp9/Bq79vxOuL2FzttrSknh2tHP7Qcp8mpJOiRHzsZ/uyi3B8aJfQzERkAKqTYPLJmP9HShsMxY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568836494; 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=p1R9+Fz2ksE75Btn0d1fnqgfZ5wHJ2tsHfpietxCeF4=; b=WCyWMVfo2w0Fq5YGZiKKvbh/KJByto9MpHpzRhwrX1KPtilzTWz5qJDVejiTEHHGf4G0ow4JJ1uJFVx+VOdBxTvQTrvbgQDvIcC4eAhn7Gu3MGtT87MlktFMqGMwJIsJQ4GAC7PwdXrbHQ0SV5d/5T0zn9QuXSCnrm68iFUnR5g= 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 1568836494644439.51152391312075; Wed, 18 Sep 2019 12:54:54 -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 0035281DE0; Wed, 18 Sep 2019 19:54:53 +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 D57045DA5B; Wed, 18 Sep 2019 19:54:52 +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 95E0A180BA99; Wed, 18 Sep 2019 19:54:52 +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 x8IJrVDn027117 for ; Wed, 18 Sep 2019 15:53:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2742A5C224; Wed, 18 Sep 2019 19:53:31 +0000 (UTC) Received: from mx1.redhat.com (ext-mx28.extmail.prod.ext.phx2.redhat.com [10.5.110.69]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 223E65C21A for ; Wed, 18 Sep 2019 19:53:28 +0000 (UTC) Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0193188383B for ; Wed, 18 Sep 2019 19:53:28 +0000 (UTC) Received: by mail-qk1-f195.google.com with SMTP id y189so780505qkc.3 for ; Wed, 18 Sep 2019 12:53:27 -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.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2019 12:53:26 -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=BVT/Q1xqtsR/PIkMVN44D/SlIIpJGRIAarNEYjDkd7Y=; b=L62DMoIJ5xy4U5ECjw3t+XqdooQ+uzmiP2Tm+Uesf88chkPkAv6Zir5qV/NoNO+dPM y67A9TpdEHkTEYKr5c9mA7FM7O9Va4SSjOw8dBAz6cWxUhst8CVvB7eD3hH6xViqYArc j28FYROqHDFXhyjNjdcFL6qIjmIJSFLQOXhYQ0HRrqZrBt8nGgaiP8EfiPYNqnZfLcg7 QGiaMx0MzPavyckvpdQ+ckS/nQJWzxdOiDzn/7/uRheAMlkq+LUZ2TED9Xa5VgORnZeK hCjNZizYilPCEy+/7rL5PveWQ0sRNfFqj5QCri5cWN7Wdj4geakjcR5N8Eof3NFWe5+D Q+3w== 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=BVT/Q1xqtsR/PIkMVN44D/SlIIpJGRIAarNEYjDkd7Y=; b=knMMEZ026aRF+NYancNmXEazLRfKriELXgRpNMNObxJrquT+qWMPiCSXrI0ejJzVbA BRoR1HBwhMRUoOx02ol9kMAjUJCKAnYK5ixvvJ0b4iGhAhnqV8lRNSXilXlv0QXN765v d7CPiwtiqG2UG83SbvhEPYq1DnoNkw6aoWg8JovYwb2VpFrqrtOnk2MnhmCXd1ykVYZm 5HaLJs55InRi8C/KKbSBtqlmVtYbPDf+Rl8Fkaq4C8iYl7jiQIDyHEQ3iiPf11pclLuw BVbXdCvbCFyGddrjMCjZipSRjVmM2apsb2WNzwjtrzAObvnMbyQkd7YM8kmIOXDE2sbD YJsw== X-Gm-Message-State: APjAAAW2bCt8IOVMrcvjop44esQyrIJMbyEX8ypSbp/wq+o3NO8TFE12 AFT9HqfmuW26fdVVvCrXEWZCjH0CiQ0= X-Google-Smtp-Source: APXvYqySndjEbefnKBzcM6vKpNokWQhGyVxNgcghBXq+ubJ7A7V9eOtxv3ufStf8F3RX4BzBF989xg== X-Received: by 2002:a37:f61e:: with SMTP id y30mr5996132qkj.208.1568836407131; Wed, 18 Sep 2019 12:53:27 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Wed, 18 Sep 2019 16:53:08 -0300 Message-Id: <20190918195308.3236-4-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.6.2 (mx1.redhat.com [10.5.110.69]); Wed, 18 Sep 2019 19:53:28 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.69]); Wed, 18 Sep 2019 19:53:28 +0000 (UTC) for IP:'209.85.222.195' DOMAIN:'mail-qk1-f195.google.com' HELO:'mail-qk1-f195.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.15 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS) 209.85.222.195 mail-qk1-f195.google.com 209.85.222.195 mail-qk1-f195.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.69 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/3] qemu_hotplug.c: use VIR_AUTOFREE() in 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 18 Sep 2019 19:54:53 +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 last part of this change. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Erik Skultety --- src/qemu/qemu_hotplug.c | 93 ++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 61 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 787a4f01f5..58921fc955 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4561,17 +4561,15 @@ qemuDomainRemoveNetDevice(virQEMUDriverPtr driver, { VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); qemuDomainObjPrivatePtr priv =3D vm->privateData; - char *hostnet_name =3D NULL; - char *charDevAlias =3D NULL; + VIR_AUTOFREE(char *) hostnet_name =3D NULL; + VIR_AUTOFREE(char *) charDevAlias =3D NULL; size_t i; - int ret =3D -1; int actualType =3D virDomainNetGetActualType(net); =20 if (actualType =3D=3D VIR_DOMAIN_NET_TYPE_HOSTDEV) { /* this function handles all hostdev and netdev cleanup */ - ret =3D qemuDomainRemoveHostDevice(driver, vm, - virDomainNetGetActualHostdev(net)= ); - goto cleanup; + return qemuDomainRemoveHostDevice(driver, vm, + virDomainNetGetActualHostdev(net= )); } =20 VIR_DEBUG("Removing network interface %s from domain %p %s", @@ -4579,7 +4577,7 @@ qemuDomainRemoveNetDevice(virQEMUDriverPtr driver, =20 if (virAsprintf(&hostnet_name, "host%s", net->info.alias) < 0 || !(charDevAlias =3D qemuAliasChardevFromDevAlias(net->info.alias))) - goto cleanup; + return -1; =20 if (virDomainNetGetActualBandwidth(net) && virNetDevSupportBandwidth(virDomainNetGetActualType(net)) && @@ -4596,9 +4594,9 @@ qemuDomainRemoveNetDevice(virQEMUDriverPtr driver, qemuDomainObjEnterMonitor(driver, vm); if (qemuMonitorRemoveNetdev(priv->mon, hostnet_name) < 0) { if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + return -1; virDomainAuditNet(vm, net, NULL, "detach", false); - goto cleanup; + return -1; } =20 if (actualType =3D=3D VIR_DOMAIN_NET_TYPE_VHOSTUSER) { @@ -4612,7 +4610,7 @@ qemuDomainRemoveNetDevice(virQEMUDriverPtr driver, } =20 if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + return -1; =20 if (QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp) qemuSlirpStop(QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp, vm, driver,= net, true); @@ -4656,12 +4654,7 @@ qemuDomainRemoveNetDevice(virQEMUDriverPtr driver, } } virDomainNetDefFree(net); - ret =3D 0; - - cleanup: - VIR_FREE(charDevAlias); - VIR_FREE(hostnet_name); - return ret; + return 0; } =20 =20 @@ -4672,32 +4665,31 @@ qemuDomainRemoveChrDevice(virQEMUDriverPtr driver, bool monitor) { virObjectEventPtr event; - char *charAlias =3D NULL; + VIR_AUTOFREE(char *) charAlias =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; - int ret =3D -1; int rc =3D 0; =20 VIR_DEBUG("Removing character device %s from domain %p %s", chr->info.alias, vm, vm->def->name); =20 if (!(charAlias =3D qemuAliasChardevFromDevAlias(chr->info.alias))) - goto cleanup; + return -1; =20 if (monitor) { qemuDomainObjEnterMonitor(driver, vm); rc =3D qemuMonitorDetachCharDev(priv->mon, charAlias); if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + return -1; } =20 if (rc =3D=3D 0 && qemuDomainDelChardevTLSObjects(driver, vm, chr->source, charAlias)= < 0) - goto cleanup; + return -1; =20 virDomainAuditChardev(vm, chr, NULL, "detach", rc =3D=3D 0); =20 if (rc < 0) - goto cleanup; + return -1; =20 if (qemuTeardownChardevCgroup(vm, chr) < 0) VIR_WARN("Failed to remove chr device cgroup ACL"); @@ -4719,11 +4711,7 @@ qemuDomainRemoveChrDevice(virQEMUDriverPtr driver, virObjectEventStateQueue(driver->domainEventState, event); =20 virDomainChrDefFree(chr); - ret =3D 0; - - cleanup: - VIR_FREE(charAlias); - return ret; + return 0; } =20 =20 @@ -4732,11 +4720,10 @@ qemuDomainRemoveRNGDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainRNGDefPtr rng) { - char *charAlias =3D NULL; - char *objAlias =3D NULL; + VIR_AUTOFREE(char *) charAlias =3D NULL; + VIR_AUTOFREE(char *) objAlias =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; ssize_t idx; - int ret =3D -1; int rc =3D 0; =20 VIR_DEBUG("Removing RNG device %s from domain %p %s", @@ -4744,10 +4731,10 @@ qemuDomainRemoveRNGDevice(virQEMUDriverPtr driver, =20 =20 if (virAsprintf(&objAlias, "obj%s", rng->info.alias) < 0) - goto cleanup; + return -1; =20 if (!(charAlias =3D qemuAliasChardevFromDevAlias(rng->info.alias))) - goto cleanup; + return -1; =20 qemuDomainObjEnterMonitor(driver, vm); =20 @@ -4761,7 +4748,7 @@ qemuDomainRemoveRNGDevice(virQEMUDriverPtr driver, rc =3D -1; =20 if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + return -1; =20 if (rng->backend =3D=3D VIR_DOMAIN_RNG_BACKEND_EGD && rc =3D=3D 0 && @@ -4772,7 +4759,7 @@ qemuDomainRemoveRNGDevice(virQEMUDriverPtr driver, virDomainAuditRNG(vm, rng, NULL, "detach", rc =3D=3D 0); =20 if (rc < 0) - goto cleanup; + return -1; =20 if (qemuTeardownRNGCgroup(vm, rng) < 0) VIR_WARN("Failed to remove RNG device cgroup ACL"); @@ -4784,12 +4771,7 @@ qemuDomainRemoveRNGDevice(virQEMUDriverPtr driver, virDomainRNGRemove(vm->def, idx); qemuDomainReleaseDeviceAddress(vm, &rng->info); virDomainRNGDefFree(rng); - ret =3D 0; - - cleanup: - VIR_FREE(charAlias); - VIR_FREE(objAlias); - return ret; + return 0; } =20 =20 @@ -4799,10 +4781,9 @@ qemuDomainRemoveShmemDevice(virQEMUDriverPtr driver, virDomainShmemDefPtr shmem) { int rc; - int ret =3D -1; ssize_t idx =3D -1; - char *charAlias =3D NULL; - char *memAlias =3D NULL; + VIR_AUTOFREE(char *) charAlias =3D NULL; + VIR_AUTOFREE(char *) memAlias =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; =20 VIR_DEBUG("Removing shmem device %s from domain %p %s", @@ -4824,24 +4805,19 @@ qemuDomainRemoveShmemDevice(virQEMUDriverPtr driver, rc =3D qemuMonitorDelObject(priv->mon, memAlias); =20 if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + return -1; =20 virDomainAuditShmem(vm, shmem, "detach", rc =3D=3D 0); =20 if (rc < 0) - goto cleanup; + return -1; =20 if ((idx =3D virDomainShmemDefFind(vm->def, shmem)) >=3D 0) virDomainShmemDefRemove(vm->def, idx); qemuDomainReleaseDeviceAddress(vm, &shmem->info); virDomainShmemDefFree(shmem); =20 - ret =3D 0; - cleanup: - VIR_FREE(charAlias); - VIR_FREE(memAlias); - - return ret; + return 0; } =20 =20 @@ -4908,15 +4884,14 @@ qemuDomainRemoveRedirdevDevice(virQEMUDriverPtr dri= ver, virDomainRedirdevDefPtr dev) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - char *charAlias =3D NULL; + VIR_AUTOFREE(char *) charAlias =3D NULL; ssize_t idx; - int ret =3D -1; =20 VIR_DEBUG("Removing redirdev device %s from domain %p %s", dev->info.alias, vm, vm->def->name); =20 if (!(charAlias =3D qemuAliasChardevFromDevAlias(dev->info.alias))) - goto cleanup; + return -1; =20 qemuDomainObjEnterMonitor(driver, vm); /* DeviceDel from Detach may remove chardev, @@ -4925,10 +4900,10 @@ qemuDomainRemoveRedirdevDevice(virQEMUDriverPtr dri= ver, ignore_value(qemuMonitorDetachCharDev(priv->mon, charAlias)); =20 if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + return -1; =20 if (qemuDomainDelChardevTLSObjects(driver, vm, dev->source, charAlias)= < 0) - goto cleanup; + return -1; =20 virDomainAuditRedirdev(vm, dev, "detach", true); =20 @@ -4937,11 +4912,7 @@ qemuDomainRemoveRedirdevDevice(virQEMUDriverPtr driv= er, qemuDomainReleaseDeviceAddress(vm, &dev->info); virDomainRedirdevDefFree(dev); =20 - ret =3D 0; - - cleanup: - VIR_FREE(charAlias); - 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