[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 07/12] monitor: implement 'qmp_query_commands' wi
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PATCH v2 07/12] monitor: implement 'qmp_query_commands' without qmp_cmds |
Date: |
Thu, 21 Jul 2016 18:00:25 +0400 |
From: Marc-André Lureau <address@hidden>
So we can get rid of the static qmp_cmds table.
Signed-off-by: Marc-André Lureau <address@hidden>
---
monitor.c | 32 ++++++++++++++------------------
1 file changed, 14 insertions(+), 18 deletions(-)
diff --git a/monitor.c b/monitor.c
index 642be2e..bd41b4b 100644
--- a/monitor.c
+++ b/monitor.c
@@ -229,8 +229,6 @@ static int mon_refcount;
static mon_cmd_t mon_cmds[];
static mon_cmd_t info_cmds[];
-static const mon_cmd_t qmp_cmds[];
-
Monitor *cur_mon;
static QEMUClockType event_clock_type = QEMU_CLOCK_REALTIME;
@@ -947,21 +945,24 @@ static void hmp_info_help(Monitor *mon, const QDict
*qdict)
help_cmd(mon, "info");
}
-CommandInfoList *qmp_query_commands(Error **errp)
+static void query_commands_cb(QmpCommand *cmd, void *opaque)
{
- CommandInfoList *info, *cmd_list = NULL;
- const mon_cmd_t *cmd;
+ CommandInfoList *info, **list = opaque;
- for (cmd = qmp_cmds; cmd->name != NULL; cmd++) {
- info = g_malloc0(sizeof(*info));
- info->value = g_malloc0(sizeof(*info->value));
- info->value->name = g_strdup(cmd->name);
+ info = g_malloc0(sizeof(*info));
+ info->value = g_malloc0(sizeof(*info->value));
+ info->value->name = g_strdup(cmd->name);
+ info->next = *list;
+ *list = info;
+}
- info->next = cmd_list;
- cmd_list = info;
- }
+CommandInfoList *qmp_query_commands(Error **errp)
+{
+ CommandInfoList *list = NULL;
- return cmd_list;
+ qmp_for_each_command(query_commands_cb, &list);
+
+ return list;
}
EventInfoList *qmp_query_events(Error **errp)
@@ -2166,11 +2167,6 @@ static mon_cmd_t mon_cmds[] = {
{ NULL, NULL, },
};
-static const mon_cmd_t qmp_cmds[] = {
-#include "qmp-commands-old.h"
- { /* NULL */ },
-};
-
/*******************************************************************/
static const char *pch;
--
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, 2016/07/21
- [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 <=
- [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
- [Qemu-devel] [PATCH v2 08/12] build-sys: remove qmp-commands-old.h, marcandre . lureau, 2016/07/21
- [Qemu-devel] [PATCH v2 10/12] monitor: use qmp_dispatch(), marcandre . lureau, 2016/07/21