From 66eafbc26feeb8c148b927aa03447581840a29df Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Wed, 4 Dec 2019 10:22:13 +0100 Subject: [PATCH] libxlGetDHCPInterfaces: Move some variables inside the loop Some variables are not used outside of the for() loop. Move their declaration to clean up the code a bit. Signed-off-by: Michal Privoznik Reviewed-by: Cole Robinson --- src/libxl/libxl_driver.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 2eea0bef63..b04b1c1bcf 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -6232,25 +6232,27 @@ libxlGetDHCPInterfaces(virDomainObjPtr vm, virDomainInterfacePtr **ifaces) { g_autoptr(virConnect) conn = NULL; + virDomainInterfacePtr *ifaces_ret = NULL; + size_t ifaces_count = 0; int rv = -1; int n_leases = 0; - size_t i, j; - size_t ifaces_count = 0; - virNetworkPtr network = NULL; - char macaddr[VIR_MAC_STRING_BUFLEN]; - virDomainInterfacePtr iface = NULL; virNetworkDHCPLeasePtr *leases = NULL; - virDomainInterfacePtr *ifaces_ret = NULL; + size_t i; if (!(conn = virGetConnectNetwork())) return -1; for (i = 0; i < vm->def->nnets; i++) { + g_autoptr(virNetwork) network = NULL; + char macaddr[VIR_MAC_STRING_BUFLEN]; + virDomainInterfacePtr iface = NULL; + size_t j; + if (vm->def->nets[i]->type != VIR_DOMAIN_NET_TYPE_NETWORK) continue; virMacAddrFormat(&(vm->def->nets[i]->mac), macaddr); - virObjectUnref(network); + network = virNetworkLookupByName(conn, vm->def->nets[i]->data.network.name); if (!network) @@ -6300,7 +6302,6 @@ libxlGetDHCPInterfaces(virDomainObjPtr vm, rv = ifaces_count; cleanup: - virObjectUnref(network); if (leases) { for (i = 0; i < n_leases; i++) virNetworkDHCPLeaseFree(leases[i]);