From e37286dadf1b5f6dac8bcc50faa44e072540951c Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Thu, 27 Sep 2012 10:07:03 +0100 Subject: [PATCH] Don't ignore return value of qemuProcessKill 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 (cherry picked from commit f1b4021b38f9485c50d386af6f682ecfc8025af5) --- src/qemu/qemu_driver.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e963ed384a..c9aa8cb38d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -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