From patchwork Thu Jan 21 21:09:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 43452 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D223CB7D14 for ; Fri, 22 Jan 2010 08:14:15 +1100 (EST) Received: from localhost ([127.0.0.1]:43229 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NY4M0-0003rm-Vb for incoming@patchwork.ozlabs.org; Thu, 21 Jan 2010 16:14:13 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NY4I2-0000SX-6d for qemu-devel@nongnu.org; Thu, 21 Jan 2010 16:10:06 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NY4Hx-0000L2-J2 for qemu-devel@nongnu.org; Thu, 21 Jan 2010 16:10:05 -0500 Received: from [199.232.76.173] (port=43473 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NY4Hw-0000Ko-Pr for qemu-devel@nongnu.org; Thu, 21 Jan 2010 16:10:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38379) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NY4Hw-0002xs-CB for qemu-devel@nongnu.org; Thu, 21 Jan 2010 16:10:00 -0500 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o0LL9xO6004748 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 21 Jan 2010 16:09:59 -0500 Received: from localhost (vpn-9-176.rdu.redhat.com [10.11.9.176]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0LL9vDO032185; Thu, 21 Jan 2010 16:09:58 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org, armbru@redhat.com, aliguori@us.ibm.com, avi@redhat.com Date: Thu, 21 Jan 2010 19:09:31 -0200 Message-Id: <1264108180-3666-3-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1264108180-3666-1-git-send-email-lcapitulino@redhat.com> References: <1264108180-3666-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Subject: [Qemu-devel] [PATCH 02/11] QMP: Introduce 'query-qmp-mode' command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Only valid in QMP and allowed to run in both "handshake" and "operational" modes. Signed-off-by: Luiz Capitulino --- monitor.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/monitor.c b/monitor.c index 4b7067a..c475a38 100644 --- a/monitor.c +++ b/monitor.c @@ -586,6 +586,39 @@ static QObject *get_cmd_dict(const char *name) } /** + * do_info_qmp_mode(): Show current QMP mode + * + * Return a QDict with the following key: + * + * - "mode": either "handshake" or "operational" + * + * Example: + * + * { "mode": "handshake" } + */ +static void do_info_qmp_mode(Monitor *mon, QObject **ret_data) +{ + const char *mode; + + if (!monitor_ctrl_mode(mon)) { + return; + } + + switch (mon->mc->mode) { + case QMODE_HANDSHAKE: + mode = "handshake"; + break; + case QMODE_OPERATIONAL: + mode = "operational"; + break; + default: + abort(); + } + + *ret_data = qobject_from_jsonf("{ 'mode': %s }", mode); +} + +/** * do_info_commands(): List QMP available commands * * Each command is represented by a QDict, the returned QObject is a QList @@ -2619,6 +2652,15 @@ static const mon_cmd_t info_cmds[] = { .mhandler.info_new = do_info_migrate, }, { + .name = "qmp-mode", + .args_type = "", + .params = "", + .help = "show current mode", + .flags = HANDLER_HANDSHAKE, + .user_print = monitor_user_noop, + .mhandler.info_new = do_info_qmp_mode, + }, + { .name = "balloon", .args_type = "", .params = "",