From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NaUef-0000LO-1U for qemu-devel@nongnu.org; Thu, 28 Jan 2010 08:43:29 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NaUeZ-0000I2-9k for qemu-devel@nongnu.org; Thu, 28 Jan 2010 08:43:28 -0500 Received: from [199.232.76.173] (port=57168 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NaUeZ-0000Hr-1G for qemu-devel@nongnu.org; Thu, 28 Jan 2010 08:43:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:13247) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NaUeX-0003xJ-Tp for qemu-devel@nongnu.org; Thu, 28 Jan 2010 08:43:22 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o0SDhKhh028853 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 28 Jan 2010 08:43:21 -0500 Received: from localhost (vpn-10-249.rdu.redhat.com [10.11.10.249]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0SDhJbc029415 for ; Thu, 28 Jan 2010 08:43:20 -0500 From: Luiz Capitulino Date: Thu, 28 Jan 2010 11:42:56 -0200 Message-Id: <1264686180-29845-5-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1264686180-29845-1-git-send-email-lcapitulino@redhat.com> References: <1264686180-29845-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 4/8] QMP: Introduce qmp_switch_mode command List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 --- monitor.c | 26 ++++++++++++++++++++++++++ qemu-monitor.hx | 15 +++++++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/monitor.c b/monitor.c index 3ced51d..f6dd64d 100644 --- a/monitor.c +++ b/monitor.c @@ -704,6 +704,32 @@ 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"); + + /* + * Check is simple, as this function can only run in + * handshake mode. + */ + + if (!strcmp(mode, "operational")) { + mon->mc->mode = QMODE_OPERATIONAL; + } else if (!strcmp(mode, "handshake")) { + /* only handshake -> operational is allowed */ + qemu_error_new(QERR_QMP_INVALID_MODE_TRANSITION); + } 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 b51bb47..29155ce 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -1064,6 +1064,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 mode", + .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