From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 28 Nov 2012 12:30:40 +0000 (+0100)
Subject: qemu: Fix error messages when dispatching guest agent commands
X-Git-Tag: CVE-2012-3411~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d3337028f50b386d2a032e77f4c0e0af671301a3;p=thirdparty%2Flibvirt.git

qemu: Fix error messages when dispatching guest agent commands

Error messages produced while dispatching guest agent commands didn't
have an apparent reference to the fact that they are dealing with guest
agent commands. This patch fixes up some of the messages to contain that
reference.
---

diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index 6f517c9d18..7062d53b72 100644
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -890,7 +890,8 @@ static int qemuAgentSend(qemuAgentPtr mon,
                 ret = -2;
             } else {
                 virReportSystemError(errno, "%s",
-                                     _("Unable to wait on monitor condition"));
+                                     _("Unable to wait on agent monitor "
+                                       "condition"));
             }
             goto cleanup;
         }
@@ -1124,17 +1125,17 @@ qemuAgentCheckError(virJSONValuePtr cmd,
         char *replystr = virJSONValueToString(reply, false);
 
         /* Log the full JSON formatted command & error */
-        VIR_DEBUG("unable to execute QEMU command %s: %s",
+        VIR_DEBUG("unable to execute QEMU agent command %s: %s",
                   cmdstr, replystr);
 
         /* Only send the user the command name + friendly error */
         if (!error)
             virReportError(VIR_ERR_INTERNAL_ERROR,
-                           _("unable to execute QEMU command '%s'"),
+                           _("unable to execute QEMU agent command '%s'"),
                            qemuAgentCommandName(cmd));
         else
             virReportError(VIR_ERR_INTERNAL_ERROR,
-                           _("unable to execute QEMU command '%s': %s"),
+                           _("unable to execute QEMU agent command '%s': %s"),
                            qemuAgentCommandName(cmd),
                            qemuAgentStringifyError(error));
 
@@ -1148,7 +1149,7 @@ qemuAgentCheckError(virJSONValuePtr cmd,
         VIR_DEBUG("Neither 'return' nor 'error' is set in the JSON reply %s: %s",
                   cmdstr, replystr);
         virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("unable to execute QEMU command '%s'"),
+                       _("unable to execute QEMU agent command '%s'"),
                        qemuAgentCommandName(cmd));
         VIR_FREE(cmdstr);
         VIR_FREE(replystr);