From: Luiz Capitulino <lcapitulino@redhat.com>
To: qemu-devel@nongnu.org
Cc: aliguori@us.ibm.com, avi@redhat.com, armbru@redhat.com
Subject: [Qemu-devel] [PATCH 03/20] monitor: Introduce monitor_call_handler()
Date: Thu, 26 Nov 2009 22:58:53 -0200 [thread overview]
Message-ID: <1259283550-3597-4-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1259283550-3597-1-git-send-email-lcapitulino@redhat.com>
This commit moves the code which calls Monitor handlers to
its own function, as it will be used by QMP code as well.
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
monitor.c | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/monitor.c b/monitor.c
index 4d18699..e0cc941 100644
--- a/monitor.c
+++ b/monitor.c
@@ -3272,6 +3272,18 @@ static void monitor_print_error(Monitor *mon)
mon->error = NULL;
}
+static void monitor_call_handler(Monitor *mon, const mon_cmd_t *cmd,
+ const QDict *params)
+{
+ QObject *data = NULL;
+
+ cmd->mhandler.cmd_new(mon, params, &data);
+ if (data)
+ cmd->user_print(mon, data);
+
+ qobject_decref(data);
+}
+
static void monitor_handle_command(Monitor *mon, const char *cmdline)
{
QDict *qdict;
@@ -3286,13 +3298,7 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline)
qemu_errors_to_mon(mon);
if (monitor_handler_ported(cmd)) {
- QObject *data = NULL;
-
- cmd->mhandler.cmd_new(mon, qdict, &data);
- if (data)
- cmd->user_print(mon, data);
-
- qobject_decref(data);
+ monitor_call_handler(mon, cmd, qdict);
} else {
cmd->mhandler.cmd(mon, qdict);
}
--
1.6.6.rc0.50.gaf06e
next prev parent reply other threads:[~2009-11-27 0:59 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-27 0:58 [Qemu-devel] [PATCH v1 00/20] QEMU Monitor Protocol Luiz Capitulino
2009-11-27 0:58 ` [Qemu-devel] [PATCH 01/20] monitor: Introduce MONITOR_USE_CONTROL flag Luiz Capitulino
2009-11-27 0:58 ` [Qemu-devel] [PATCH 02/20] monitor: Command-line flag to enable control mode Luiz Capitulino
2009-11-27 0:58 ` Luiz Capitulino [this message]
2009-11-27 0:58 ` [Qemu-devel] [PATCH 04/20] monitor: Introduce monitor_find_command() Luiz Capitulino
2009-11-27 0:58 ` [Qemu-devel] [PATCH 05/20] monitor: Rename monitor_handle_command() Luiz Capitulino
2009-11-27 0:58 ` [Qemu-devel] [PATCH 06/20] monitor: Introduce 'info commands' Luiz Capitulino
2009-11-27 0:58 ` [Qemu-devel] [PATCH 07/20] QError: Add errors needed by QMP Luiz Capitulino
2009-11-27 0:58 ` [Qemu-devel] [PATCH 08/20] QMP: Initial support Luiz Capitulino
2009-11-27 0:58 ` [Qemu-devel] [PATCH 09/20] QMP: Output support Luiz Capitulino
2009-11-27 0:59 ` [Qemu-devel] [PATCH 10/20] QMP: do_info() checks Luiz Capitulino
2009-11-27 0:59 ` [Qemu-devel] [PATCH 11/20] QMP: Input support Luiz Capitulino
2009-11-27 0:59 ` [Qemu-devel] [PATCH 12/20] QMP: Allow 'query-' commands Luiz Capitulino
2009-11-27 0:59 ` [Qemu-devel] [PATCH 13/20] QMP: Asynchronous events infrastructure Luiz Capitulino
2009-11-27 0:59 ` [Qemu-devel] [PATCH 14/20] QMP: Introduce basic asynchronous events Luiz Capitulino
2009-11-27 0:59 ` [Qemu-devel] [PATCH 15/20] QMP: Disable monitor print functions Luiz Capitulino
2009-11-27 0:59 ` [Qemu-devel] [PATCH 16/20] QMP: Introduce README file Luiz Capitulino
2009-11-27 0:59 ` [Qemu-devel] [PATCH 17/20] QMP: Introduce specification Luiz Capitulino
2009-11-27 0:59 ` [Qemu-devel] [PATCH 18/20] QMP: Introduce qmp-events.txt Luiz Capitulino
2009-11-27 0:59 ` [Qemu-devel] [PATCH 19/20] QMP: Introduce qmp-shell Luiz Capitulino
2009-11-27 0:59 ` [Qemu-devel] [PATCH 20/20] QMP: Introduce vm-info Luiz Capitulino
2009-12-01 11:38 ` [Qemu-devel] [PATCH v1 00/20] QEMU Monitor Protocol Daniel P. Berrange
2009-12-01 12:53 ` Luiz Capitulino
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=1259283550-3597-4-git-send-email-lcapitulino@redhat.com \
--to=lcapitulino@redhat.com \
--cc=aliguori@us.ibm.com \
--cc=armbru@redhat.com \
--cc=avi@redhat.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).