From patchwork Thu Jan 21 21:09:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 43451 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 4D2CAB7CF3 for ; Fri, 22 Jan 2010 08:14:02 +1100 (EST) Received: from localhost ([127.0.0.1]:42459 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NY4L2-0002ff-VR for incoming@patchwork.ozlabs.org; Thu, 21 Jan 2010 16:13:12 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NY4Hz-0000O4-4F for qemu-devel@nongnu.org; Thu, 21 Jan 2010 16:10:03 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NY4Ht-0000Gn-Ma for qemu-devel@nongnu.org; Thu, 21 Jan 2010 16:10:02 -0500 Received: from [199.232.76.173] (port=53526 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NY4Ht-0000GV-Em for qemu-devel@nongnu.org; Thu, 21 Jan 2010 16:09:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38644) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NY4Hs-0002xI-Mv for qemu-devel@nongnu.org; Thu, 21 Jan 2010 16:09:56 -0500 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o0LL9tj8010719 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 21 Jan 2010 16:09:55 -0500 Received: from localhost (vpn-9-176.rdu.redhat.com [10.11.9.176]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0LL9rcC008243; Thu, 21 Jan 2010 16:09:54 -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:30 -0200 Message-Id: <1264108180-3666-2-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.21 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Subject: [Qemu-devel] [PATCH 01/11] QMP: Initial mode-oriented bits 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 In order to support feature negotiation in QMP, the Monitor has to be modified to support different modes of operation. We need two modes: o Handshake: where features are negotiated. Only commands which deal with protocol configuration are allowed, async messages (as any other protocol capability) are disabled by default o Operational: regular Monitor operations. All handlers (except the protocol configuration ones) are allowed and async messages enabled in 'handshake' mode are delivered This commit adds the initial infrastructure to implement this design, basically it does: 1. Adds the QMPMode data type to MonitorControl and sets QMODE_HANDSHAKE as the default one 2. Grant permission to 'query-version' and 'query-commands' to run on handshake mode Note, however, that these changes are not visable yet and thus QMP's behavior is still the same. Signed-off-by: Luiz Capitulino --- monitor.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/monitor.c b/monitor.c index cadf422..4b7067a 100644 --- a/monitor.c +++ b/monitor.c @@ -76,11 +76,16 @@ * */ +/* Handler flags */ +#define HANDLER_HANDSHAKE 0x01 /* allowed to run on handshake mode */ +#define HANDLER_HANDSHAKE_ONLY 0x02 /* can ONLY run on handshake mode */ + typedef struct mon_cmd_t { const char *name; const char *args_type; const char *params; const char *help; + unsigned int flags; void (*user_print)(Monitor *mon, const QObject *data); union { void (*info)(Monitor *mon); @@ -98,8 +103,14 @@ struct mon_fd_t { QLIST_ENTRY(mon_fd_t) next; }; +typedef enum QMPMode { + QMODE_OPERATIONAL, + QMODE_HANDSHAKE, +} QMPMode; + typedef struct MonitorControl { QObject *id; + QMPMode mode; int print_enabled; JSONMessageParser parser; } MonitorControl; @@ -2364,6 +2375,7 @@ static const mon_cmd_t info_cmds[] = { .args_type = "", .params = "", .help = "show the version of QEMU", + .flags = HANDLER_HANDSHAKE, .user_print = do_info_version_print, .mhandler.info_new = do_info_version, }, @@ -2372,6 +2384,7 @@ static const mon_cmd_t info_cmds[] = { .args_type = "", .params = "", .help = "list QMP available commands", + .flags = HANDLER_HANDSHAKE, .user_print = monitor_user_noop, .mhandler.info_new = do_info_commands, }, @@ -4264,6 +4277,7 @@ void monitor_init(CharDriverState *chr, int flags) if (monitor_ctrl_mode(mon)) { mon->mc = qemu_mallocz(sizeof(MonitorControl)); + mon->mc->mode = QMODE_HANDSHAKE; /* Control mode requires special handlers */ qemu_chr_add_handlers(chr, monitor_can_read, monitor_control_read, monitor_control_event, mon);