Re: [libvirt] [PATCH 3/3] qemu_hotplug.c: use VIR_AUTOFREE() in strings 3/3

[Erik Skultety]

On Wed, Sep 18, 2019 at 04:53:08PM -0300, Daniel Henrique Barboza wrote:
> 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 
> ---

I think that since all 3 patches are touching the same module, all of them can
be squashed into 1 (for review purposes the split was good though).

I'll fix the nits I raised in 1 and 2, squash, adjust the commit message and
push.

Reviewed-by: Erik Skultety 

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH 3/3] qemu_hotplug.c: use VIR_AUTOFREE() in strings 3/3

[Daniel Henrique Barboza]

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 
---
 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 = virQEMUDriverGetConfig(driver);
 qemuDomainObjPrivatePtr priv = vm->privateData;
-char *hostnet_name = NULL;
-char *charDevAlias = NULL;
+VIR_AUTOFREE(char *) hostnet_name = NULL;
+VIR_AUTOFREE(char *) charDevAlias = NULL;
 size_t i;
-int ret = -1;
 int actualType = virDomainNetGetActualType(net);
 
 if (actualType == VIR_DOMAIN_NET_TYPE_HOSTDEV) {
 /* this function handles all hostdev and netdev cleanup */
-ret = qemuDomainRemoveHostDevice(driver, vm,
- virDomainNetGetActualHostdev(net));
-goto cleanup;
+return qemuDomainRemoveHostDevice(driver, vm,
+  virDomainNetGetActualHostdev(net));
 }
 
 VIR_DEBUG("Removing network interface %s from domain %p %s",
@@ -4579,7 +4577,7 @@ qemuDomainRemoveNetDevice(virQEMUDriverPtr driver,
 
 if (virAsprintf(_name, "host%s", net->info.alias) < 0 ||
 !(charDevAlias = qemuAliasChardevFromDevAlias(net->info.alias)))
-goto cleanup;
+return -1;
 
 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;
 }
 
 if (actualType == VIR_DOMAIN_NET_TYPE_VHOSTUSER) {
@@ -4612,7 +4610,7 @@ qemuDomainRemoveNetDevice(virQEMUDriverPtr driver,
 }
 
 if (qemuDomainObjExitMonitor(driver, vm) < 0)
-goto cleanup;
+return -1;
 
 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 = 0;
-
- cleanup:
-VIR_FREE(charDevAlias);
-VIR_FREE(hostnet_name);
-return ret;
+return 0;
 }
 
 
@@ -4672,32 +4665,31 @@ qemuDomainRemoveChrDevice(virQEMUDriverPtr driver,
   bool monitor)
 {
 virObjectEventPtr event;
-char *charAlias = NULL;
+VIR_AUTOFREE(char *) charAlias = NULL;
 qemuDomainObjPrivatePtr priv = vm->privateData;
-int ret = -1;
 int rc = 0;
 
 VIR_DEBUG("Removing character device %s from domain %p %s",
   chr->info.alias, vm, vm->def->name);
 
 if (!(charAlias = qemuAliasChardevFromDevAlias(chr->info.alias)))
-goto cleanup;
+return -1;
 
 if (monitor) {
 qemuDomainObjEnterMonitor(driver, vm);
 rc = qemuMonitorDetachCharDev(priv->mon, charAlias);
 if (qemuDomainObjExitMonitor(driver, vm) < 0)
-goto cleanup;
+return -1;
 }
 
 if (rc == 0 &&
 qemuDomainDelChardevTLSObjects(driver, vm, chr->source, charAlias) < 0)
-goto cleanup;
+return -1;
 
 virDomainAuditChardev(vm, chr, NULL, "detach", rc == 0);
 
 if (rc < 0)
-goto cleanup;
+return -1;
 
 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);
 
 virDomainChrDefFree(chr);
-ret = 0;
-
- cleanup:
-VIR_FREE(charAlias);
-return ret;
+return 0;
 }
 
 
@@ -4732,11 +4720,10 @@ qemuDomainRemoveRNGDevice(virQEMUDriverPtr driver,
   virDomainObjPtr vm,
   virDomainRNGDefPtr rng)
 {
-char *charAlias = NULL;
-char *objAlias = NULL;
+VIR_AUTOFREE(char *) charAlias = NULL;
+VIR_AUTOFREE(char *) objAlias = NULL;
 qemuDomainObjPrivatePtr priv = vm->privateData;
 ssize_t idx;
-int ret = -1;
 int rc = 0;
 
 VIR_DEBUG("Removing RNG device %s from domain %p %s",
@@ -4744,10 +4731,10 @@ qemuDomainRemoveRNGDevice(virQEMUDriverPtr driver,
 
 
 if (virAsprintf(, "obj%s", rng->info.alias) < 0)
-goto cleanup;
+return -1;