From patchwork Sun May 23 10:59:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 53311 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 E66D0B7D45 for ; Sun, 23 May 2010 21:10:24 +1000 (EST) Received: from localhost ([127.0.0.1]:45655 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OG8ya-0006zP-FW for incoming@patchwork.ozlabs.org; Sun, 23 May 2010 07:04:12 -0400 Received: from [140.186.70.92] (port=48646 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OG8uO-0004H1-If for qemu-devel@nongnu.org; Sun, 23 May 2010 07:00:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OG8uD-0004Qq-2q for qemu-devel@nongnu.org; Sun, 23 May 2010 06:59:52 -0400 Received: from fmmailgate01.web.de ([217.72.192.221]:34409) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OG8uC-0004QT-CD for qemu-devel@nongnu.org; Sun, 23 May 2010 06:59:40 -0400 Received: from smtp01.web.de ( [172.20.0.243]) by fmmailgate01.web.de (Postfix) with ESMTP id AE52E15B16D1C; Sun, 23 May 2010 12:59:39 +0200 (CEST) Received: from [88.65.39.229] (helo=localhost.localdomain) by smtp01.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #4) id 1OG8u9-0003cZ-02; Sun, 23 May 2010 12:59:38 +0200 From: Jan Kiszka To: qemu-devel@nongnu.org, Anthony Liguori Date: Sun, 23 May 2010 12:59:26 +0200 Message-Id: <5d0139dc62706a1efcbb6a63d5936484ad279916.1274612367.git.jan.kiszka@web.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: References: In-Reply-To: References: X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX1/PnpoRS1L6QE+DkmUl7RnL3ShKeZmTzjJW9lRA jhz4fz9hBV/vg4DjMOJxDK5U+fhqwLhAFuvdXlvAbruqwV3FkE IdHIVNzO4= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: Juan Quintela , Jan Kiszka , Markus Armbruster , Luiz Capitulino , Blue Swirl , Avi Kivity Subject: [Qemu-devel] [PATCH v3 13/17] monitor: Allow to exclude commands from QMP 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 From: Jan Kiszka Ported commands that are marked 'user_only' will not be considered for QMP monitor sessions. This allows to implement new commands that do not (yet) provide a sufficiently stable interface for QMP use (e.g. device_show). Signed-off-by: Jan Kiszka --- monitor.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index 6766e49..5768c6e 100644 --- a/monitor.c +++ b/monitor.c @@ -114,6 +114,7 @@ typedef struct mon_cmd_t { MonitorCompletion *cb, void *opaque); } mhandler; int async; + bool user_only; } mon_cmd_t; /* file descriptors passed via SCM_RIGHTS */ @@ -635,6 +636,11 @@ static int do_info(Monitor *mon, const QDict *qdict, QObject **ret_data) goto help; } + if (monitor_ctrl_mode(mon) && cmd->user_only) { + qerror_report(QERR_COMMAND_NOT_FOUND, item); + return -1; + } + if (monitor_handler_is_async(cmd)) { if (monitor_ctrl_mode(mon)) { qmp_async_info_handler(mon, cmd); @@ -732,13 +738,14 @@ static void do_info_commands(Monitor *mon, QObject **ret_data) cmd_list = qlist_new(); for (cmd = mon_cmds; cmd->name != NULL; cmd++) { - if (monitor_handler_ported(cmd) && !compare_cmd(cmd->name, "info")) { + if (monitor_handler_ported(cmd) && !cmd->user_only && + !compare_cmd(cmd->name, "info")) { qlist_append_obj(cmd_list, get_cmd_dict(cmd->name)); } } for (cmd = info_cmds; cmd->name != NULL; cmd++) { - if (monitor_handler_ported(cmd)) { + if (monitor_handler_ported(cmd) && !cmd->user_only) { char buf[128]; snprintf(buf, sizeof(buf), "query-%s", cmd->name); qlist_append_obj(cmd_list, get_cmd_dict(buf)); @@ -4416,7 +4423,7 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens) qobject_from_jsonf("{ 'item': %s }", info_item)); } else { cmd = monitor_find_command(cmd_name); - if (!cmd || !monitor_handler_ported(cmd)) { + if (!cmd || !monitor_handler_ported(cmd) || cmd->user_only) { qerror_report(QERR_COMMAND_NOT_FOUND, cmd_name); goto err_input; }