From: Luiz Capitulino <lcapitulino@redhat.com>
To: aliguori@us.ibm.com
Cc: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 09/23] Monitor: Convert do_info() back to HMP
Date: Fri, 1 Oct 2010 15:19:13 -0300 [thread overview]
Message-ID: <1285957167-1228-10-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1285957167-1228-1-git-send-email-lcapitulino@redhat.com>
This is a HMP specific handler, it makes no sense to have it
under QMP.
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
monitor.c | 5 ++---
qemu-monitor.hx | 3 +--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/monitor.c b/monitor.c
index 7f2af49..f0854c4 100644
--- a/monitor.c
+++ b/monitor.c
@@ -636,7 +636,7 @@ static void user_async_info_handler(Monitor *mon, const mon_cmd_t *cmd)
}
}
-static int do_info(Monitor *mon, const QDict *qdict, QObject **ret_data)
+static void do_info(Monitor *mon, const QDict *qdict)
{
const mon_cmd_t *cmd;
const char *item = qdict_get_try_str(qdict, "item");
@@ -668,11 +668,10 @@ static int do_info(Monitor *mon, const QDict *qdict, QObject **ret_data)
cmd->mhandler.info(mon);
}
- return 0;
+ return;
help:
help_cmd(mon, "info");
- return 0;
}
static void do_info_version_print(Monitor *mon, const QObject *data)
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index 49bcd8d..57d28ac 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -1654,8 +1654,7 @@ EQMP
.args_type = "item:s?",
.params = "[subcommand]",
.help = "show various information about the system state",
- .user_print = monitor_user_noop,
- .mhandler.cmd_new = do_info,
+ .mhandler.cmd = do_info,
},
STEXI
--
1.7.3.1.50.g1e633
next prev parent reply other threads:[~2010-10-01 18:20 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-01 18:19 [Qemu-devel] [PULL 00/23]: Monitor queue Luiz Capitulino
2010-10-01 18:19 ` [Qemu-devel] [PATCH 01/23] Add support for JSON pretty printing Luiz Capitulino
2010-10-01 18:19 ` [Qemu-devel] [PATCH 02/23] Add option to turn on JSON pretty printing in monitor Luiz Capitulino
2010-10-01 18:19 ` [Qemu-devel] [PATCH 03/23] disable guest-provided stats on "info balloon" command Luiz Capitulino
2010-10-01 18:19 ` [Qemu-devel] [PATCH 04/23] Monitor: Introduce search_dispatch_table() Luiz Capitulino
2010-10-01 18:19 ` [Qemu-devel] [PATCH 05/23] QMP: handle_qmp_command(): Move 'cmd' sanity check Luiz Capitulino
2010-10-01 18:19 ` [Qemu-devel] [PATCH 06/23] QMP: Don't use do_info() Luiz Capitulino
2010-10-01 18:19 ` [Qemu-devel] [PATCH 07/23] Monitor: Drop QMP bits from do_info() Luiz Capitulino
2010-10-01 18:19 ` [Qemu-devel] [PATCH 08/23] Monitor: Drop is_async_return() Luiz Capitulino
2010-10-01 18:19 ` Luiz Capitulino [this message]
2010-10-01 18:19 ` [Qemu-devel] [PATCH 10/23] Monitor: Introduce the qmp-commands.hx file Luiz Capitulino
2010-10-01 18:19 ` [Qemu-devel] [PATCH 11/23] QMP: Introduce qmp_find_cmd() Luiz Capitulino
2010-10-01 18:19 ` [Qemu-devel] [PATCH 12/23] QMP: Introduce command dispatch table Luiz Capitulino
2010-10-01 18:19 ` [Qemu-devel] [PATCH 13/23] QMP: Introduce query commands " Luiz Capitulino
2010-10-01 18:19 ` [Qemu-devel] [PATCH 14/23] QMP: Simplify do_info_commands() Luiz Capitulino
2010-10-01 18:19 ` [Qemu-devel] [PATCH 15/23] QMP: Small cleanup in handle_qmp_command() Luiz Capitulino
2010-10-01 18:19 ` [Qemu-devel] [PATCH 16/23] Monitor: Drop QMP info from the qemu-monitor.hx file Luiz Capitulino
2010-10-01 18:19 ` [Qemu-devel] [PATCH 17/23] Monitor: Drop monitor_cmd_user_only() Luiz Capitulino
2010-10-01 18:19 ` [Qemu-devel] [PATCH 18/23] Monitor: Rename monitor_handler_ported() Luiz Capitulino
2010-10-01 18:19 ` [Qemu-devel] [PATCH 19/23] Monitor: Rename monitor_handler_is_async() Luiz Capitulino
2010-10-01 18:19 ` [Qemu-devel] [PATCH 20/23] Monitor: Directly call QObject handlers Luiz Capitulino
2010-10-01 18:19 ` [Qemu-devel] [PATCH 21/23] QMP: Introduce qmp_call_cmd() Luiz Capitulino
2010-10-01 18:19 ` [Qemu-devel] [PATCH 22/23] Monitor: Rename the qemu-monitor.hx file Luiz Capitulino
2010-10-01 18:19 ` [Qemu-devel] [PATCH 23/23] QMP/README: Update QMP homepage address Luiz Capitulino
2010-10-05 19:11 ` [Qemu-devel] [PULL 00/23]: Monitor queue Anthony Liguori
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1285957167-1228-10-git-send-email-lcapitulino@redhat.com \
--to=lcapitulino@redhat.com \
--cc=aliguori@us.ibm.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).