[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 04/12] monitor: remove usage of generated marshal
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PATCH v2 04/12] monitor: remove usage of generated marshal functions |
Date: |
Thu, 21 Jul 2016 18:00:22 +0400 |
From: Marc-André Lureau <address@hidden>
Once the middle mode is removed, the generated marshal functions will no
longer be exported.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
monitor.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/monitor.c b/monitor.c
index c9191e5..3a28b43 100644
--- a/monitor.c
+++ b/monitor.c
@@ -3659,21 +3659,21 @@ static int monitor_can_read(void *opaque)
return (mon->suspend_cnt == 0) ? 1 : 0;
}
-static bool invalid_qmp_mode(const Monitor *mon, const mon_cmd_t *cmd,
+static bool invalid_qmp_mode(const Monitor *mon, const char *cmd,
Error **errp)
{
- bool is_cap = cmd->mhandler.cmd_new == qmp_marshal_qmp_capabilities;
+ bool is_cap = !g_strcmp0(cmd, "qmp_capabilities");
if (is_cap && mon->qmp.in_command_mode) {
error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,
"Capabilities negotiation is already complete, command "
- "'%s' ignored", cmd->name);
+ "'%s' ignored", cmd);
return true;
}
if (!is_cap && !mon->qmp.in_command_mode) {
error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,
"Expecting capabilities negotiation with "
- "'qmp_capabilities' before command '%s'", cmd->name);
+ "'qmp_capabilities' before command '%s'", cmd);
return true;
}
return false;
@@ -3964,7 +3964,7 @@ static void handle_qmp_command(JSONMessageParser *parser,
GQueue *tokens)
"The command %s has not been found", cmd_name);
goto err_out;
}
- if (invalid_qmp_mode(mon, cmd, &local_err)) {
+ if (invalid_qmp_mode(mon, cmd_name, &local_err)) {
goto err_out;
}
--
2.9.0
- [Qemu-devel] [PATCH v2 00/12] qapi: remove the 'middle' mode, marcandre . lureau, 2016/07/21
- [Qemu-devel] [PATCH v2 01/12] qapi-schema: use generated marshaller for 'qmp_capabilities', marcandre . lureau, 2016/07/21
- [Qemu-devel] [PATCH v2 02/12] qapi-schema: add 'device_add', marcandre . lureau, 2016/07/21
- [Qemu-devel] [PATCH v2 04/12] monitor: remove usage of generated marshal functions,
marcandre . lureau <=
- [Qemu-devel] [PATCH v2 03/12] monitor: register gen:false commands manually, marcandre . lureau, 2016/07/21
- [Qemu-devel] [PATCH v2 05/12] monitor: register the qapi generated commands, marcandre . lureau, 2016/07/21
- [Qemu-devel] [PATCH v2 07/12] monitor: implement 'qmp_query_commands' without qmp_cmds, marcandre . lureau, 2016/07/21
- [Qemu-devel] [PATCH v2 06/12] monitor: remove mhandler.cmd_new, marcandre . lureau, 2016/07/21
- [Qemu-devel] [PATCH v2 09/12] qapi: remove the "middle" mode, marcandre . lureau, 2016/07/21