[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 5/9] qmp: Simplify recognition of capability negotiat
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 5/9] qmp: Simplify recognition of capability negotiation command |
Date: |
Thu, 5 Feb 2015 08:36:19 +0100 |
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
monitor.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/monitor.c b/monitor.c
index 8323de3..2ac40c9 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4783,9 +4783,9 @@ static int monitor_can_read(void *opaque)
return (mon->suspend_cnt == 0) ? 1 : 0;
}
-static int invalid_qmp_mode(const Monitor *mon, const char *cmd_name)
+static int invalid_qmp_mode(const Monitor *mon, const mon_cmd_t *cmd)
{
- int is_cap = compare_cmd(cmd_name, "qmp_capabilities");
+ int is_cap = cmd->mhandler.cmd_new == do_qmp_capabilities;
return (qmp_cmd_mode(mon) ? is_cap : !is_cap);
}
@@ -5079,13 +5079,8 @@ static void handle_qmp_command(JSONMessageParser
*parser, QList *tokens)
cmd_name = qdict_get_str(input, "execute");
trace_handle_qmp_command(mon, cmd_name);
- if (invalid_qmp_mode(mon, cmd_name)) {
- qerror_report(QERR_COMMAND_NOT_FOUND, cmd_name);
- goto err_out;
- }
-
cmd = qmp_find_cmd(cmd_name);
- if (!cmd) {
+ if (!cmd || invalid_qmp_mode(mon, cmd)) {
qerror_report(QERR_COMMAND_NOT_FOUND, cmd_name);
goto err_out;
}
--
1.9.3
- [Qemu-devel] [PULL 0/9] qmp hmp balloon: Cleanups around error reporting, Markus Armbruster, 2015/02/05
- [Qemu-devel] [PULL 3/9] hmp: Compile hmp_info_spice() only with CONFIG_SPICE, Markus Armbruster, 2015/02/05
- [Qemu-devel] [PULL 2/9] qmp hmp: Improve error messages when SPICE is not in use, Markus Armbruster, 2015/02/05
- [Qemu-devel] [PULL 1/9] qmp hmp: Factor out common "using spice" test, Markus Armbruster, 2015/02/05
- [Qemu-devel] [PULL 9/9] balloon: Eliminate silly QERR_ macros, Markus Armbruster, 2015/02/05
- [Qemu-devel] [PULL 7/9] balloon: Inline qemu_balloon(), qemu_balloon_status(), Markus Armbruster, 2015/02/05
- [Qemu-devel] [PULL 6/9] qmp: Eliminate silly QERR_COMMAND_NOT_FOUND macro, Markus Armbruster, 2015/02/05
- [Qemu-devel] [PULL 5/9] qmp: Simplify recognition of capability negotiation command,
Markus Armbruster <=
- [Qemu-devel] [PULL 8/9] balloon: Factor out common "is balloon active" test, Markus Armbruster, 2015/02/05
- [Qemu-devel] [PULL 4/9] qmp: Clean up qmp_query_spice() #ifndef !CONFIG_SPICE dummy, Markus Armbruster, 2015/02/05
- Re: [Qemu-devel] [PULL 0/9] qmp hmp balloon: Cleanups around error reporting, Peter Maydell, 2015/02/05