From: Daniel P. Berrange <berrange@redhat.com>
Date: Mon, 18 Apr 2011 11:41:23 +0000 (+0100)
Subject: build: fix qemu build failure in previous patch
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ce3ae1b0848d6267b0cd00c00420443251acf324;p=libvirt.git

build: fix qemu build failure in previous patch

This last minute addition caused a build failure

cc1: warnings being treated as errors
qemu/qemu_process.c: In function 'qemuProcessHandleWatchdog':
qemu/qemu_process.c:436:34: error: ignoring return value of 'virDomainObjUnref', declared with attribute warn_unused_result [-Wunused-result]
make[3]: *** [libvirt_driver_qemu_la-qemu_process.lo] Error 1
---

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index d405ddae4e..1dfd0052d2 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -433,14 +433,17 @@ qemuProcessHandleWatchdog(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
              */
             virDomainObjRef(vm);
             if (virThreadPoolSendJob(driver->workerPool, wdEvent) < 0) {
-                virDomainObjUnref(vm);
+                if (virDomainObjUnref(vm) < 0)
+                    vm = NULL;
                 VIR_FREE(wdEvent);
             }
-        } else
+        } else {
             virReportOOMError();
+        }
     }
 
-    virDomainObjUnlock(vm);
+    if (vm)
+        virDomainObjUnlock(vm);
 
     if (watchdogEvent || lifecycleEvent) {
         qemuDriverLock(driver);