qemu: Properly report guest agent errors on command passthrough

The code for arbitrary guest agent passthrough was horribly broken since
introduction. Fix it to correctly report errors.

(cherry picked from commit 6e5b36d5d2fbe3c207651ab653b552dcae6af888)

diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index 8c8c38bab03f006f3b21ca63bb3e5e464efe9d16..ad50479c7dff2629990e07cba602431d9fbaccfa 100644 (file)
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -1407,25 +1407,32 @@ qemuAgentArbitraryCommand(qemuAgentPtr mon,
                           int timeout)
 {
     int ret = -1;
-    virJSONValuePtr cmd;
+    virJSONValuePtr cmd = NULL;
     virJSONValuePtr reply = NULL;
 
     *result = NULL;
-    if (timeout < VIR_DOMAIN_QEMU_AGENT_COMMAND_MIN)
-        return ret;
+    if (timeout < VIR_DOMAIN_QEMU_AGENT_COMMAND_MIN) {
+        virReportError(VIR_ERR_INVALID_ARG,
+                       _("guest agent timeout '%d' is "
+                         "less than the minimum '%d'"),
+                       timeout, VIR_DOMAIN_QEMU_AGENT_COMMAND_MIN);
+        goto cleanup;
+    }
 
-    cmd = virJSONValueFromString(cmd_str);
-    if (!cmd)
-        return ret;
+    if (!(cmd = virJSONValueFromString(cmd_str)))
+        goto cleanup;
+
+    if ((ret = qemuAgentCommand(mon, cmd, &reply, timeout)) < 0)
+        goto cleanup;
 
-    ret = qemuAgentCommand(mon, cmd, &reply, timeout);
+    if ((ret = qemuAgentCheckError(cmd, reply)) < 0)
+        goto cleanup;
 
-    if (ret == 0) {
-        ret = qemuAgentCheckError(cmd, reply);
-        if (!(*result = virJSONValueToString(reply, false)))
-            ret = -1;
-    }
+    if (!(*result = virJSONValueToString(reply, false)))
+        ret = -1;
 
+
+cleanup:
     virJSONValueFree(cmd);
     virJSONValueFree(reply);
     return ret;

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index e9408f2b690f5e6fd622517df128b312089cea2a..270e1750737ec61a3636feab81beb1428a3459bd 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -14611,16 +14611,12 @@ qemuDomainQemuAgentCommand(virDomainPtr domain,
     qemuDomainObjEnterAgent(vm);
     ret = qemuAgentArbitraryCommand(priv->agent, cmd, &result, timeout);
     qemuDomainObjExitAgent(vm);
-    if (ret < 0) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("Failed to execute agent command"));
-        goto endjob;
-    }
+    if (ret < 0)
+        VIR_FREE(result);
 
 endjob:
-    if (qemuDomainObjEndJob(driver, vm) == 0) {
+    if (qemuDomainObjEndJob(driver, vm) == 0)
         vm = NULL;
-    }
 
 cleanup:
     if (vm)