From: Eric Blake <eblake@redhat.com>
Date: Wed, 22 Feb 2012 18:41:17 +0000 (-0700)
Subject: qemu: nicer error message on failed graceful destroy
X-Git-Tag: v0.9.11-rc1~231
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2dc5057fd124e115d4a5de3df98911603fbe501;p=thirdparty%2Flibvirt.git

qemu: nicer error message on failed graceful destroy

https://bugzilla.redhat.com/show_bug.cgi?id=795656 mentions
that a graceful destroy request can time out, meaning that the
error message is user-visible and should be more appropriate
than just internal error.

* src/qemu/qemu_driver.c (qemuDomainDestroyFlags): Swap error type.
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 63a070311c..d3cf9ac5f6 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -1792,7 +1792,7 @@ qemuDomainDestroyFlags(virDomainPtr dom,
      */
     if (flags & VIR_DOMAIN_DESTROY_GRACEFUL) {
         if (qemuProcessKill(driver, vm, 0) < 0) {
-            qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+            qemuReportError(VIR_ERR_OPERATION_FAILED, "%s",
                             _("failed to kill qemu process with SIGTERM"));
             goto cleanup;
         }