External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 23:37:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuAgentCommand: Wire up suppressing of error reporting for unsupported commands

Browse Source 
In some cases we don't want to log errors if an agent command is
unsupported. Wire it up into qemuAgentCheckError via qemuAgentCommandFull
and provide a thin wrapper (qemuAgentCommand) to prevent having to fix
all callers.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2020-03-13 09:49:35 +01:00
parent f145df503e
commit 09aac3b6ff
1 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/qemu/qemu_agent.c
View File

@ -1051,7 +1051,8 @@ qemuAgentCommandName(virJSONValuePtr cmd)
static int static int
qemuAgentCheckError(virJSONValuePtr cmd, qemuAgentCheckError(virJSONValuePtr cmd,
virJSONValuePtr reply) virJSONValuePtr reply,
bool report_unsupported)
{ {
if (virJSONValueObjectHasKey(reply, "error")) { if (virJSONValueObjectHasKey(reply, "error")) {
virJSONValuePtr error = virJSONValueObjectGet(reply, "error"); virJSONValuePtr error = virJSONValueObjectGet(reply, "error");
@ -1063,15 +1064,25 @@ qemuAgentCheckError(virJSONValuePtr cmd,
NULLSTR(cmdstr), NULLSTR(replystr)); NULLSTR(cmdstr), NULLSTR(replystr));
/* Only send the user the command name + friendly error */ /* Only send the user the command name + friendly error */
if (!error) if (!error) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("unable to execute QEMU agent command '%s'"), _("unable to execute QEMU agent command '%s'"),
qemuAgentCommandName(cmd)); qemuAgentCommandName(cmd));
else return -1;
virReportError(VIR_ERR_INTERNAL_ERROR, }
_("unable to execute QEMU agent command '%s': %s"),
qemuAgentCommandName(cmd), if (!report_unsupported) {
qemuAgentStringifyError(error)); const char *klass = virJSONValueObjectGetString(error, "class");
if (STREQ_NULLABLE(klass, "CommandNotFound") ||
STREQ_NULLABLE(klass, "CommandDisabled"))
return -2;
}
virReportError(VIR_ERR_INTERNAL_ERROR,
_("unable to execute QEMU agent command '%s': %s"),
qemuAgentCommandName(cmd),
qemuAgentStringifyError(error));
return -1; return -1;
} else if (!virJSONValueObjectHasKey(reply, "return")) { } else if (!virJSONValueObjectHasKey(reply, "return")) {
@ -1089,10 +1100,11 @@ qemuAgentCheckError(virJSONValuePtr cmd,
} }
static int static int
qemuAgentCommand(qemuAgentPtr agent, qemuAgentCommandFull(qemuAgentPtr agent,
virJSONValuePtr cmd, virJSONValuePtr cmd,
virJSONValuePtr *reply, virJSONValuePtr *reply,
int seconds) int seconds,
bool report_unsupported)
{ {
int ret = -1; int ret = -1;
qemuAgentMessage msg; qemuAgentMessage msg;
@ -1143,7 +1155,7 @@ qemuAgentCommand(qemuAgentPtr agent,
} }
*reply = msg.rxObject; *reply = msg.rxObject;
ret = qemuAgentCheckError(cmd, *reply); ret = qemuAgentCheckError(cmd, *reply, report_unsupported);
cleanup: cleanup:
VIR_FREE(cmdstr); VIR_FREE(cmdstr);
@ -1153,6 +1165,15 @@ qemuAgentCommand(qemuAgentPtr agent,
return ret; return ret;
} }
static int
qemuAgentCommand(qemuAgentPtr agent,
virJSONValuePtr cmd,
virJSONValuePtr *reply,
int seconds)
{
return qemuAgentCommandFull(agent, cmd, reply, seconds, true);
}
static virJSONValuePtr G_GNUC_NULL_TERMINATED static virJSONValuePtr G_GNUC_NULL_TERMINATED
qemuAgentMakeCommand(const char *cmdname, qemuAgentMakeCommand(const char *cmdname,
...) ...)