From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 31 Jan 2012 15:59:02 +0000 (+0100)
Subject: qemu: Don't jump to endjob if no job was even started
X-Git-Tag: v0.9.10-rc1~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb311b3458a9982d7535a4b0316de2e8ba8d9c26;p=thirdparty%2Flibvirt.git

qemu: Don't jump to endjob if no job was even started

In qemuDomainShutdownFlags if we try to use guest agent,
which has error or is not configured, we jump go endjob
label even if we haven't started any job yet. This may
lead to the daemon crash:
1) virsh shutdown --mode agent on a domain without agent configured
2) wait until domain quits
3) virsh edit
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 1b147a9a35..7945c5dbd9 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -1546,12 +1546,12 @@ static int qemuDomainShutdownFlags(virDomainPtr dom, unsigned int flags) {
         if (priv->agentError) {
             qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                             _("QEMU guest agent is not available due to an error"));
-            goto endjob;
+            goto cleanup;
         }
         if (!priv->agent) {
             qemuReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
                             _("QEMU guest agent is not configured"));
-            goto endjob;
+            goto cleanup;
         }
     }