From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 4 Dec 2014 15:13:31 +0000 (+0100)
Subject: qemu: process: Avoid uninitialized use two vars when reconnecting to vm
X-Git-Tag: v1.2.11-rc1~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=38bde5776a056341a8de521057ef5b6dead2af10;p=thirdparty%2Flibvirt.git

qemu: process: Avoid uninitialized use two vars when reconnecting to vm

3ecebf07110ca8d3413072557f29137943e848e3 breaks the build as it adds a
way to jump to cleanup before the 'cfg' object is retrieved and 'priv'
is initialized.
---

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 310a08d6d6..a14b6f7fe0 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -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;