From: Luiz Capitulino <lcapitulino@redhat.com>
To: qemu-devel@nongnu.org, armbru@redhat.com, aliguori@us.ibm.com,
avi@redhat.com
Subject: [Qemu-devel] [PATCH 04/11] QMP: Introduce qmp_switch_mode command
Date: Thu, 21 Jan 2010 19:09:33 -0200 [thread overview]
Message-ID: <1264108180-3666-5-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1264108180-3666-1-git-send-email-lcapitulino@redhat.com>
It will be used to switch between "handshake" and "operational"
modes. Currently it doesn't have any practical effect, as
mode-oriented support is not enforced yet.
Usage example:
{ "execute": "qmp_switch_mode", "arguments": { "mode": "operational" } }
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
monitor.c | 21 +++++++++++++++++++++
qemu-monitor.hx | 15 +++++++++++++++
2 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/monitor.c b/monitor.c
index c475a38..fc6a1ed 100644
--- a/monitor.c
+++ b/monitor.c
@@ -618,6 +618,27 @@ static void do_info_qmp_mode(Monitor *mon, QObject **ret_data)
*ret_data = qobject_from_jsonf("{ 'mode': %s }", mode);
}
+static void do_qmp_switch_mode(Monitor *mon, const QDict *qdict,
+ QObject **ret_data)
+{
+ const char *mode;
+
+ if (!monitor_ctrl_mode(mon)) {
+ return;
+ }
+
+ mode = qdict_get_str(qdict, "mode");
+
+ if (mon->mc->mode != QMODE_HANDSHAKE || !strcmp(mode, "handshake")) {
+ /* only handshake -> operational is allowed */
+ qemu_error_new(QERR_QMP_INVALID_MODE_TRANSACTION);
+ } else if (!strcmp(mode, "operational")) {
+ mon->mc->mode = QMODE_OPERATIONAL;
+ } else {
+ qemu_error_new(QERR_QMP_INVALID_MODE_NAME, mode);
+ }
+}
+
/**
* do_info_commands(): List QMP available commands
*
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index 1aa7818..eebea09 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -1062,6 +1062,21 @@ STEXI
Set the encrypted device @var{device} password to @var{password}
ETEXI
+ {
+ .name = "qmp_switch_mode",
+ .args_type = "mode:s",
+ .params = "qmp_switch_mode name",
+ .help = "switch QMP mode",
+ .flags = HANDLER_HANDSHAKE_ONLY,
+ .user_print = monitor_user_noop,
+ .mhandler.cmd_new = do_qmp_switch_mode,
+ },
+
+STEXI
+@item qmp_switch_mode @var{mode}
+Switch QMP to @var{mode}
+ETEXI
+
STEXI
@end table
ETEXI
--
1.6.6
next prev parent reply other threads:[~2010-01-21 21:10 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-21 21:09 [Qemu-devel] [RFC 00/11]: QMP feature negotiation support Luiz Capitulino
2010-01-21 21:09 ` [Qemu-devel] [PATCH 01/11] QMP: Initial mode-oriented bits Luiz Capitulino
2010-01-21 21:09 ` [Qemu-devel] [PATCH 02/11] QMP: Introduce 'query-qmp-mode' command Luiz Capitulino
2010-01-21 21:09 ` [Qemu-devel] [PATCH 03/11] QError: Add QMP mode-oriented errors Luiz Capitulino
2010-01-21 21:09 ` Luiz Capitulino [this message]
2010-01-21 21:09 ` [Qemu-devel] [PATCH 05/11] QMP: advertise asynchronous messages Luiz Capitulino
2010-01-21 21:09 ` [Qemu-devel] [PATCH 06/11] QMP: Array-based async messages Luiz Capitulino
2010-01-21 21:09 ` [Qemu-devel] [PATCH 07/11] QError: New QERR_ASYNC_MSG_NOT_FOUND Luiz Capitulino
2010-01-21 21:09 ` [Qemu-devel] [PATCH 08/11] QMP: Asynchronous messages enable/disable support Luiz Capitulino
2010-01-22 18:05 ` Anthony Liguori
2010-01-22 20:09 ` Luiz Capitulino
2010-01-22 23:14 ` Anthony Liguori
2010-01-25 14:29 ` Markus Armbruster
2010-01-25 14:33 ` Avi Kivity
2010-01-25 15:11 ` Luiz Capitulino
2010-01-24 10:34 ` Avi Kivity
2010-01-24 11:07 ` Jamie Lokier
2010-01-24 15:35 ` Anthony Liguori
2010-01-24 18:35 ` Jamie Lokier
2010-01-25 11:49 ` Luiz Capitulino
2010-01-25 14:15 ` Markus Armbruster
2010-01-25 14:22 ` Luiz Capitulino
2010-01-24 14:04 ` Anthony Liguori
2010-01-24 14:17 ` Avi Kivity
2010-01-24 14:19 ` Anthony Liguori
2010-01-25 12:02 ` Luiz Capitulino
2010-01-24 10:36 ` [Qemu-devel] " Avi Kivity
2010-01-25 13:14 ` Luiz Capitulino
2010-01-21 21:09 ` [Qemu-devel] [PATCH 09/11] Monitor: Introduce find_info_cmd() Luiz Capitulino
2010-01-21 21:09 ` [Qemu-devel] [PATCH 10/11] QError: New QERR_QMP_INVALID_MODE_COMMAND Luiz Capitulino
2010-01-21 21:09 ` [Qemu-devel] [PATCH 11/11] QMP: Enable feature negotiation support Luiz Capitulino
2010-01-22 10:21 ` [Qemu-devel] [RFC 00/11]: QMP " Markus Armbruster
2010-01-22 12:09 ` Luiz Capitulino
2010-01-22 14:00 ` Markus Armbruster
2010-01-22 18:00 ` Anthony Liguori
2010-01-25 14:33 ` Markus Armbruster
2010-01-26 11:53 ` Luiz Capitulino
2010-01-26 12:57 ` Jamie Lokier
2010-01-26 13:45 ` Luiz Capitulino
2010-01-26 14:29 ` Daniel P. Berrange
2010-01-26 15:57 ` Jamie Lokier
2010-01-26 16:21 ` 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=1264108180-3666-5-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).