]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
qemu: process: Avoid uninitialized use two vars when reconnecting to vm
authorPeter Krempa <pkrempa@redhat.com>
Thu, 4 Dec 2014 15:13:31 +0000 (16:13 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Thu, 4 Dec 2014 15:24:25 +0000 (16:24 +0100)
3ecebf07110ca8d3413072557f29137943e848e3 breaks the build as it adds a
way to jump to cleanup before the 'cfg' object is retrieved and 'priv'
is initialized.

src/qemu/qemu_process.c

index 310a08d6d68f2fe463816ed67232b793664fbba5..a14b6f7fe0aa3423741dc96517bce912288d3a25 100644 (file)
@@ -3571,16 +3571,16 @@ qemuProcessReconnect(void *opaque)
      * deleted if qemuConnectMonitor() failed */
     virObjectRef(obj);
 
+    cfg = virQEMUDriverGetConfig(driver);
+    priv = obj->privateData;
+
     if (qemuDomainObjBeginJob(driver, obj, QEMU_JOB_MODIFY) < 0)
         goto killvm;
 
     virNWFilterReadLockFilterUpdates();
 
-    cfg = virQEMUDriverGetConfig(driver);
     VIR_DEBUG("Reconnect monitor to %p '%s'", obj, obj->def->name);
 
-    priv = obj->privateData;
-
     /* XXX check PID liveliness & EXE path */
     if (qemuConnectMonitor(driver, obj, QEMU_ASYNC_JOB_NONE, -1) < 0)
         goto error;