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

virQEMUCapsInitGuest: Refactor cleanup and remove return value

Browse Source 
Use automatic pointer freeing, remove 'ret' variable and also remove
return value completely.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-03-17 14:38:20 +01:00
parent a4c03bdd59
commit 74998ed662
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/qemu/qemu_capabilities.c
View File

@ -984,15 +984,14 @@ virQEMUCapsGetDefaultEmulator(virArch hostarch,
}
static int
static void
virQEMUCapsInitGuest(virCaps *caps,
virFileCache *cache,
virArch hostarch,
virArch guestarch)
{
char *binary = NULL;
virQEMUCaps *qemuCaps = NULL;
int ret = -1;
g_autofree char *binary = NULL;
g_autoptr(virQEMUCaps) qemuCaps = NULL;
binary = virQEMUCapsGetDefaultEmulator(hostarch, guestarch);
@ -1000,17 +999,11 @@ virQEMUCapsInitGuest(virCaps *caps,
if (binary) {
if (!(qemuCaps = virQEMUCapsCacheLookup(cache, binary))) {
virResetLastError();
VIR_FREE(binary);
return;
}
}
virQEMUCapsInitGuestFromBinary(caps, binary, qemuCaps, guestarch);
ret = 0;
VIR_FREE(binary);
virObjectUnref(qemuCaps);
return ret;
}
@ -1194,10 +1187,7 @@ virQEMUCapsInit(virFileCache *cache)
* if a qemu-system-$ARCH binary can't be found
*/
for (i = 0; i < VIR_ARCH_LAST; i++)
if (virQEMUCapsInitGuest(caps, cache,
hostarch,
i) < 0)
return NULL;
virQEMUCapsInitGuest(caps, cache, hostarch, i);
return g_steal_pointer(&caps);
}