From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 17 Sep 2019 09:31:24 +0000 (+0200)
Subject: qemuDomainGetHostdevPath: Use more g_autoptr()/g_autofree
X-Git-Tag: v6.0.0-rc1~262
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9765165429b9008cd9acf88f55c373c26605d84;p=thirdparty%2Flibvirt.git

qemuDomainGetHostdevPath: Use more g_autoptr()/g_autofree

There are several variables which could be automatically freed
upon return from the function. I'm not changing @tmpPaths (which
is a string list) because it is going to be removed in next
commit.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Cole Robinson <crobinso@redhat.com>
---

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 88509ce9ae..5d2758bc19 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -13852,14 +13852,14 @@ qemuDomainGetHostdevPath(virDomainDefPtr def,
     virDomainHostdevSubsysSCSIPtr scsisrc = &dev->source.subsys.u.scsi;
     virDomainHostdevSubsysSCSIVHostPtr hostsrc = &dev->source.subsys.u.scsi_host;
     virDomainHostdevSubsysMediatedDevPtr mdevsrc = &dev->source.subsys.u.mdev;
-    virPCIDevicePtr pci = NULL;
-    virUSBDevicePtr usb = NULL;
-    virSCSIDevicePtr scsi = NULL;
-    virSCSIVHostDevicePtr host = NULL;
-    char *tmpPath = NULL;
+    g_autoptr(virPCIDevice) pci = NULL;
+    g_autoptr(virUSBDevice) usb = NULL;
+    g_autoptr(virSCSIDevice) scsi = NULL;
+    g_autoptr(virSCSIVHostDevice) host = NULL;
+    g_autofree char *tmpPath = NULL;
     bool includeVFIO = false;
     char **tmpPaths = NULL;
-    int *tmpPerms = NULL;
+    g_autofree int *tmpPerms = NULL;
     size_t tmpNpaths = 0;
     int perm = 0;
 
@@ -13986,12 +13986,6 @@ qemuDomainGetHostdevPath(virDomainDefPtr def,
     ret = 0;
  cleanup:
     virStringListFreeCount(tmpPaths, tmpNpaths);
-    VIR_FREE(tmpPerms);
-    virPCIDeviceFree(pci);
-    virUSBDeviceFree(usb);
-    virSCSIDeviceFree(scsi);
-    virSCSIVHostDeviceFree(host);
-    VIR_FREE(tmpPath);
     return ret;
 }