From: Kirill Shchetiniuk <kshcheti@redhat.com>
Moved variables to closer scope to enable suto memory management
Signed-off-by: Kirill Shchetiniuk <kshcheti@redhat.com>
---
src/qemu/qemu_driver.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 6ee54f95a4..369f3da69f 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -16354,10 +16354,7 @@ static int
qemuDomainGetHostnameLease(virDomainObj *vm,
char **hostname)
{
- char macaddr[VIR_MAC_STRING_BUFLEN];
g_autoptr(virConnect) conn = NULL;
- virNetworkDHCPLeasePtr *leases = NULL;
- int n_leases;
size_t i, j;
int ret = -1;
@@ -16373,6 +16370,9 @@ qemuDomainGetHostnameLease(virDomainObj *vm,
for (i = 0; i < vm->def->nnets; i++) {
g_autoptr(virNetwork) network = NULL;
virDomainNetDef *net = vm->def->nets[i];
+ char macaddr[VIR_MAC_STRING_BUFLEN];
+ g_autofree virNetworkDHCPLeasePtr *leases = NULL;
+ int n_leases;
if (net->type != VIR_DOMAIN_NET_TYPE_NETWORK)
continue;
@@ -16388,15 +16388,11 @@ qemuDomainGetHostnameLease(virDomainObj *vm,
goto endjob;
for (j = 0; j < n_leases; j++) {
- virNetworkDHCPLeasePtr lease = leases[j];
+ g_autoptr(virNetworkDHCPLease) lease = leases[j];
if (lease->hostname && !*hostname)
*hostname = g_strdup(lease->hostname);
-
- virNetworkDHCPLeaseFree(lease);
}
- VIR_FREE(leases);
-
if (*hostname)
goto endjob;
}
--
2.49.0