[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 18/19] Monitor: do_info(): Drop QMP command handling
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 18/19] Monitor: do_info(): Drop QMP command handling code |
Date: |
Mon, 24 Oct 2011 11:27:11 -0200 |
Previous commits converted all existing QMP commands to the QAPI,
now each info command does its own QMP call.
Let's then drop all QMP command handling code from do_info().
Signed-off-by: Luiz Capitulino <address@hidden>
---
monitor.c | 32 +-------------------------------
1 files changed, 1 insertions(+), 31 deletions(-)
diff --git a/monitor.c b/monitor.c
index 1e09b91..e3c7d0d 100644
--- a/monitor.c
+++ b/monitor.c
@@ -123,8 +123,6 @@ typedef struct mon_cmd_t {
void (*user_print)(Monitor *mon, const QObject *data);
union {
void (*info)(Monitor *mon);
- void (*info_new)(Monitor *mon, QObject **ret_data);
- int (*info_async)(Monitor *mon, MonitorCompletion *cb, void *opaque);
void (*cmd)(Monitor *mon, const QDict *qdict);
int (*cmd_new)(Monitor *mon, const QDict *params, QObject **ret_data);
int (*cmd_async)(Monitor *mon, const QDict *params,
@@ -679,21 +677,6 @@ static void user_async_cmd_handler(Monitor *mon, const
mon_cmd_t *cmd,
}
}
-static void user_async_info_handler(Monitor *mon, const mon_cmd_t *cmd)
-{
- int ret;
-
- MonitorCompletionData *cb_data = g_malloc(sizeof(*cb_data));
- cb_data->mon = mon;
- cb_data->user_print = cmd->user_print;
- monitor_suspend(mon);
- ret = cmd->mhandler.info_async(mon, user_monitor_complete, cb_data);
- if (ret < 0) {
- monitor_resume(mon);
- g_free(cb_data);
- }
-}
-
static void do_info(Monitor *mon, const QDict *qdict)
{
const mon_cmd_t *cmd;
@@ -712,20 +695,7 @@ static void do_info(Monitor *mon, const QDict *qdict)
goto help;
}
- if (handler_is_async(cmd)) {
- user_async_info_handler(mon, cmd);
- } else if (handler_is_qobject(cmd)) {
- QObject *info_data = NULL;
-
- cmd->mhandler.info_new(mon, &info_data);
- if (info_data) {
- cmd->user_print(mon, info_data);
- qobject_decref(info_data);
- }
- } else {
- cmd->mhandler.info(mon);
- }
-
+ cmd->mhandler.info(mon);
return;
help:
--
1.7.7.1.431.g10b2a
- [Qemu-devel] [PATCH 07/19] qapi: Convert query-cpus, (continued)
- [Qemu-devel] [PATCH 07/19] qapi: Convert query-cpus, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 05/19] Monitor: Introduce monitor_get_cpu_index(), Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 09/19] block: Rename the BlockIOStatus enum values, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 06/19] qapi: Convert the cpu command, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 13/19] qapi: Convert query-vnc, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 10/19] qapi: Convert query-block, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 11/19] qapi: Convert query-blockstats, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 19/19] Drop qemu-objects.h from modules that don't require it, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 15/19] qapi: Convert query-balloon, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 12/19] qerror: Add a user string for QERR_FEATURE_DISABLED, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 18/19] Monitor: do_info(): Drop QMP command handling code,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 17/19] QMP: Drop the query commands dispatch table, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 08/19] block: iostatus: Drop BDRV_IOS_INVAL, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 14/19] qapi: Convert query-spice, Luiz Capitulino, 2011/10/24
- [Qemu-devel] [PATCH 16/19] qapi: Convert query-pci, Luiz Capitulino, 2011/10/24