]> git.ipfire.org Git - thirdparty/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)
committerCole Robinson <crobinso@redhat.com>
Wed, 17 Oct 2012 20:49:34 +0000 (16:49 -0400)
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>
(cherry picked from commit f1b4021b38f9485c50d386af6f682ecfc8025af5)

src/qemu/qemu_driver.c

index e963ed384ac7839c2218651d718067db76c474ab..c9aa8cb38dbac2a73e2b4f12d74588e576ae1432 100644 (file)
@@ -1955,7 +1955,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