]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemuProcessStop: Set @def early
authorMichal Privoznik <mprivozn@redhat.com>
Mon, 18 Nov 2019 16:39:46 +0000 (17:39 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Tue, 19 Nov 2019 09:25:56 +0000 (10:25 +0100)
The @def variable holds pointer to the domain defintion, but is
set only somewhere in the middle of the function. This is
suboptimal.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
src/qemu/qemu_process.c

index 90ebdb43a056e52fd7f380ee8df0b994943e3ddb..209d07cfe8df885d38403fb3a0d3304c8997569d 100644 (file)
@@ -7331,7 +7331,7 @@ void qemuProcessStop(virQEMUDriverPtr driver,
     int retries = 0;
     qemuDomainObjPrivatePtr priv = vm->privateData;
     virErrorPtr orig_err;
-    virDomainDefPtr def;
+    virDomainDefPtr def = vm->def;
     virNetDevVPortProfilePtr vport = NULL;
     size_t i;
     char *timestamp;
@@ -7386,7 +7386,6 @@ void qemuProcessStop(virQEMUDriverPtr driver,
     virDomainConfVMNWFilterTeardown(vm);
 
     if (cfg->macFilter) {
-        def = vm->def;
         for (i = 0; i < def->nnets; i++) {
             virDomainNetDefPtr net = def->nets[i];
             if (net->ifname == NULL)
@@ -7483,7 +7482,6 @@ void qemuProcessStop(virQEMUDriverPtr driver,
 
     qemuHostdevReAttachDomainDevices(driver, vm->def);
 
-    def = vm->def;
     for (i = 0; i < def->nnets; i++) {
         virDomainNetDefPtr net = def->nets[i];
         vport = virDomainNetGetActualVirtPortProfile(net);