]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
Don't ignore return value of qemuProcessKill
authorDaniel P. Berrange <berrange@redhat.com>
Thu, 27 Sep 2012 09:07:03 +0000 (10:07 +0100)
committerDaniel P. Berrange <berrange@redhat.com>
Thu, 27 Sep 2012 09:11:44 +0000 (10:11 +0100)
When calling qemuProcessKill from the virDomainDestroy impl
in QEMU, do not ignore the return value. This ensures that
if QEMU fails to respond to SIGKILL, the caller will know
about the failure.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
src/qemu/qemu_driver.c

index 7ac53aca4d1061659eef3e8557a327adb4ac0744..eb61a9642638ee49660099b33f03ff997c54a74d 100644 (file)
@@ -2012,7 +2012,11 @@ qemuDomainDestroyFlags(virDomainPtr dom,
             goto cleanup;
         }
     } else {
-        ignore_value(qemuProcessKill(driver, vm, VIR_QEMU_PROCESS_KILL_FORCE));
+        if (qemuProcessKill(driver, vm, VIR_QEMU_PROCESS_KILL_FORCE) < 0) {
+            virReportError(VIR_ERR_OPERATION_FAILED, "%s",
+                           _("failed to kill qemu process with SIGTERM"));
+            goto cleanup;
+        }
     }
 
     /* We need to prevent monitor EOF callback from doing our work (and sending