[libvirt] [PATCH v3 02/30] 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(a)redhat.com>
---
src/qemu/qemu_domain.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 550ae848df..6daae24c3d 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -12891,14 +12891,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;
@@ -13025,12 +13025,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;
}
--
2.23.0