From patchwork Wed Nov 12 00:25:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 40621 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f72.google.com (mail-ee0-f72.google.com [74.125.83.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 72515205DF for ; Wed, 12 Nov 2014 00:29:36 +0000 (UTC) Received: by mail-ee0-f72.google.com with SMTP id d17sf7453804eek.3 for ; Tue, 11 Nov 2014 16:29:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=xrpeliMw3A3lFmMIpSq4CBQCaV0hFeHZ97rEsV2zEaI=; b=VINwA85cbgUMA1nYEDuVzvokh9ftbA4C1tUDjDV3VHNkkokJ/6HKy2nKTCzmkE7J4V OcqDdu4Y2xf1Rls4+84NGmr4Z6i+Xq40eVkxHgSDDn26EhyEzFLMdXDfEmwJ+DKkOFNC zuHPZv0gycCuqhcSp6cLxqqDNi/x9Rj/vMDwxf6oYfWZZWK5+khJQx3qTwnp6HqgjT53 zyn1aTKaJImTZ5XioLSBqCQB6rlYdg0u0EjwWs+WnG90BD2DKUCw+iTkmdEwZXqSsp2m SgWN0WBoAEqFSA8AN4sDFRIfTg3pUoosGfL3HWpPvclZQdX+wjW8vqIV7jNi93wTrgMb GvNA== X-Gm-Message-State: ALoCoQl3Eud+hnxed7eD6rxSXAfmGL0vIeR0cC/SeOh4X15RbuxFbPY0O767gq4MRq10kTOy4lWM X-Received: by 10.152.30.66 with SMTP id q2mr7225763lah.2.1415752175550; Tue, 11 Nov 2014 16:29:35 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.161.203 with SMTP id xu11ls613870lab.90.gmail; Tue, 11 Nov 2014 16:29:35 -0800 (PST) X-Received: by 10.152.27.2 with SMTP id p2mr2131587lag.19.1415752175269; Tue, 11 Nov 2014 16:29:35 -0800 (PST) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com. [209.85.217.182]) by mx.google.com with ESMTPS id b4si33137803lbd.70.2014.11.11.16.29.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Nov 2014 16:29:34 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) client-ip=209.85.217.182; Received: by mail-lb0-f182.google.com with SMTP id f15so9408639lbj.13 for ; Tue, 11 Nov 2014 16:29:34 -0800 (PST) X-Received: by 10.112.182.1 with SMTP id ea1mr38557965lbc.16.1415752174828; Tue, 11 Nov 2014 16:29:34 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp347252lbc; Tue, 11 Nov 2014 16:29:34 -0800 (PST) X-Received: by 10.140.107.37 with SMTP id g34mr53824583qgf.38.1415752173515; Tue, 11 Nov 2014 16:29:33 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id t2si39323450qcj.8.2014.11.11.16.29.32 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 11 Nov 2014 16:29:33 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:51557 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoLoS-0006jZ-HQ for patch@linaro.org; Tue, 11 Nov 2014 19:29:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37989) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoLlW-00024K-5S for qemu-devel@nongnu.org; Tue, 11 Nov 2014 19:26:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XoLlK-0008SA-Kc for qemu-devel@nongnu.org; Tue, 11 Nov 2014 19:26:30 -0500 Received: from mail-oi0-f44.google.com ([209.85.218.44]:39612) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoLlK-0008S6-Eg for qemu-devel@nongnu.org; Tue, 11 Nov 2014 19:26:18 -0500 Received: by mail-oi0-f44.google.com with SMTP id h136so7897744oig.31 for ; Tue, 11 Nov 2014 16:26:17 -0800 (PST) X-Received: by 10.182.2.43 with SMTP id 11mr4999109obr.50.1415751977911; Tue, 11 Nov 2014 16:26:17 -0800 (PST) Received: from gbellows-linaro.bellowshome.net (99-179-1-128.lightspeed.austtx.sbcglobal.net. [99.179.1.128]) by mx.google.com with ESMTPSA id d3sm6239765obs.18.2014.11.11.16.26.17 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Nov 2014 16:26:17 -0800 (PST) From: Greg Bellows To: qemu-devel@nongnu.org, peter.maydell@linaro.org, christoffer.dall@linaro.org, alex.bennee@linaro.org Date: Tue, 11 Nov 2014 18:25:50 -0600 Message-Id: <1415751963-4081-3-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1415751963-4081-1-git-send-email-greg.bellows@linaro.org> References: <1415751963-4081-1-git-send-email-greg.bellows@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.218.44 Cc: Greg Bellows Subject: [Qemu-devel] [PATCH v1 02/15] android-console: Unify available commands output X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: greg.bellows@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Moved the "available commands" print output to the top level help command handler to avoid repitition across all commands with sub-commands. Adjusted the redir command handler to no longer print out available commands. Adjusted "OK" message to be shared by all cases to avoid duplicates. Signed-off-by: Greg Bellows --- android-console.c | 20 +++++--------------- monitor.c | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/android-console.c b/android-console.c index c2e41da..be573b5 100644 --- a/android-console.c +++ b/android-console.c @@ -242,8 +242,7 @@ void android_console_redir_remove(Monitor *mon, const QDict *qdict) static const char *redir_list_help = "list current port redirections. " - "use 'redir add' and 'redir del' to add and remove them\n" - "OK\n"; + "use 'redir add' and 'redir del' to add and remove them\n"; static const char *redir_add_help = "add a new port redirection, arguments must be:\n" @@ -258,15 +257,13 @@ static const char *redir_add_help = "\n" "as an example, 'redir tcp:5000:6000' will allow any packets sent to\n" "the host's TCP port 5000 to be routed to TCP port 6000 of the " - "emulated device\n" - "OK\n"; + "emulated device\n"; static const char *redir_del_help = "remove a port redirecion that was created with 'redir add', " - "arguments must be:\n\n" + "arguments must be:\n" " redir del :\n\n" - "see the 'help redir add' for the meaning of and \n" - "OK\n"; + "see the 'help redir add' for the meaning of and \n"; void android_console_redir(Monitor *mon, const QDict *qdict) { @@ -291,12 +288,5 @@ void android_console_redir(Monitor *mon, const QDict *qdict) "PORT redirection from the host to the device\n" "as an example, 'redir tcp:5000:6000' will route " "any packet sent to the host's TCP port 5000\n" - "to TCP port 6000 of the emulated device\n" - "\n" - "available sub-commands:\n" - " list list current redirections\n" - " add add new redirection\n" - " del remove existing redirection\n" - "\n%s\n", - helptext ? "OK" : "KO: missing sub-command"); + "to TCP port 6000 of the emulated device\n"); } diff --git a/monitor.c b/monitor.c index f071878..4222b7a 100644 --- a/monitor.c +++ b/monitor.c @@ -943,7 +943,7 @@ static void do_help_cmd(Monitor *mon, const QDict *qdict) static void android_console_help(Monitor *mon, const QDict *qdict) { const char *name = qdict_get_try_str(qdict, "helptext"); - const mon_cmd_t *cmd; + const mon_cmd_t *cmd, *subcmd; const mon_cmd_t *cmds = mon->cmd_table; char *args[MAX_ARGS]; int nb_args = 0; @@ -957,7 +957,7 @@ static void android_console_help(Monitor *mon, const QDict *qdict) monitor_printf(mon, " %-15s %s\n", cmd->name, cmd->help); } monitor_printf(mon, - "\ntry 'help ' for command-specific help\n"); + "\ntry 'help ' for command-specific help\nOK\n"); return; } @@ -1000,15 +1000,23 @@ static void android_console_help(Monitor *mon, const QDict *qdict) parent_cmd->mhandler.cmd(mon, qdict); } else if (cmd->sub_table) { cmd->mhandler.cmd(mon, qdict); + monitor_printf(mon, "\navailable sub-commands:\n"); + for (subcmd = cmd->sub_table; subcmd->name; subcmd++) { + monitor_printf(mon, " %-15s %s\n", + subcmd->name, subcmd->help); + } + monitor_printf(mon, "\n"); } else { - monitor_printf(mon, "%s\nOK\n", cmd->help); + monitor_printf(mon, "%s\n", cmd->help); } - return; + break; } parent_cmd = cmd; cmds = cmd->sub_table; } + + monitor_printf(mon, "OK\n"); } static void do_trace_event_set_state(Monitor *mon, const QDict *qdict)