External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-25 15:15:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuDomainGetHostdevPath: Use more g_autoptr()/g_autofree

Browse Source 
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>
This commit is contained in:
Michal Privoznik 2019-09-17 11:31:24 +02:00
parent 6f43c505d9
commit f976516542
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/qemu/qemu_domain.c
View File

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