From: Martin Kletzander <mkletzan@redhat.com>
Date: Wed, 6 Jun 2012 14:43:41 +0000 (+0200)
Subject: qemu: better detection of crashed domains
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bda2f17d7e673f4dd7fc1a03389ca7d8f4e1646e;p=libvirt.git

qemu: better detection of crashed domains

When libvirtd is started and there is an unusable/not-connectable
leftover from earlier started machine, it's more reasonable to say
that the machine "crashed" if we know it was started with
"-no-shutdown".
This patch fixes that and also changes the other result (when machine
was started without "-no-shutdown") to "unknown", because the previous
"failed" reason means (according to include/libvirt/libvirt.h.in:174),
that the machine failed to start.
---

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 58ba5bf897..33f57bebda 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3141,7 +3141,17 @@ error:
              * to remove danger of it ending up running twice if
              * user tries to start it again later
              */
-            qemuProcessStop(driver, obj, 0, VIR_DOMAIN_SHUTOFF_FAILED);
+            if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_NO_SHUTDOWN)) {
+                /* If we couldn't get the monitor and qemu supports
+                 * no-shutdown, we can safely say that the domain
+                 * crashed ... */
+                state = VIR_DOMAIN_SHUTOFF_CRASHED;
+            } else {
+                /* ... but if it doesn't we can't say what the state
+                 * really is and FAILED means "failed to start" */
+                state = VIR_DOMAIN_SHUTOFF_UNKNOWN;
+            }
+            qemuProcessStop(driver, obj, 0, state);
             if (!obj->persistent)
                 qemuDomainRemoveInactive(driver, obj);
             else