]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemuGetDHCPInterfaces: Move some variables inside the loop
authorMichal Privoznik <mprivozn@redhat.com>
Wed, 4 Dec 2019 08:55:52 +0000 (09:55 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Tue, 17 Dec 2019 15:58:42 +0000 (16:58 +0100)
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 <mprivozn@redhat.com>
Reviewed-by: Cole Robinson <crobinso@redhat.com>
src/qemu/qemu_driver.c

index c76e051224d25b806d1b64cca7e197c3c752a598..d72e0ccef4eeb7826a567019b86ef94886ba705d 100644 (file)
@@ -21722,26 +21722,27 @@ qemuGetDHCPInterfaces(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;
-    g_autoptr(virNetwork) 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)