提交 d3337028 编写于 作者: P Peter Krempa

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.
上级 86727836
......@@ -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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册