]> xenbits.xensource.com Git - libvirt.git/commitdiff
build: fix qemu build failure in previous patch
authorDaniel P. Berrange <berrange@redhat.com>
Mon, 18 Apr 2011 11:41:23 +0000 (12:41 +0100)
committerEric Blake <eblake@redhat.com>
Mon, 18 Apr 2011 15:27:13 +0000 (09:27 -0600)
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

src/qemu/qemu_process.c

index d405ddae4e93bcd3c51f37468cec9d0b8f0c211f..1dfd0052d2f5586e440e6747bfaaa1b0f564440b 100644 (file)
@@ -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);