From patchwork Tue Dec 8 12:11:52 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 40630 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 91A78B7BC0 for ; Wed, 9 Dec 2009 00:09:14 +1100 (EST) Received: from localhost ([127.0.0.1]:41227 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NHzoV-0004xP-T2 for incoming@patchwork.ozlabs.org; Tue, 08 Dec 2009 08:09:11 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NHyvb-0005pY-At for qemu-devel@nongnu.org; Tue, 08 Dec 2009 07:12:27 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NHyvV-0005lU-7i for qemu-devel@nongnu.org; Tue, 08 Dec 2009 07:12:25 -0500 Received: from [199.232.76.173] (port=44210 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NHyvU-0005kc-1R for qemu-devel@nongnu.org; Tue, 08 Dec 2009 07:12:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:14916) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NHyvT-00084b-KJ for qemu-devel@nongnu.org; Tue, 08 Dec 2009 07:12:19 -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 nB8CCIKj015546 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 8 Dec 2009 07:12:19 -0500 Received: from zweiblum.home.kraxel.org (vpn2-9-91.ams2.redhat.com [10.36.9.91]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nB8CCCmC017110; Tue, 8 Dec 2009 07:12:16 -0500 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 4CBFD7011B; Tue, 8 Dec 2009 13:11:58 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 8 Dec 2009 13:11:52 +0100 Message-Id: <1260274314-2906-21-git-send-email-kraxel@redhat.com> In-Reply-To: <1260274314-2906-1-git-send-email-kraxel@redhat.com> References: <1260274314-2906-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann , agraf@suse.de, lcapitulino@redhat.com Subject: [Qemu-devel] [FOR 0.12 PATCH v4 20/22] add -qmp convinience switch 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 Acts like -monitor but switched into qmp mode. Signed-off-by: Gerd Hoffmann --- qemu-options.hx | 2 ++ vl.c | 14 +++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 7234447..b8cc375 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1588,6 +1588,8 @@ serial port). The default device is @code{vc} in graphical mode and @code{stdio} in non graphical mode. ETEXI +DEF("qmp", HAS_ARG, QEMU_OPTION_qmp, \ + "-qmp dev like -monitor but opens in 'control' mode.\n") DEF("mon", HAS_ARG, QEMU_OPTION_mon, \ "-mon chardev=[name][,mode=readline|control][,default]\n") diff --git a/vl.c b/vl.c index d90975f..ab77c35 100644 --- a/vl.c +++ b/vl.c @@ -4660,7 +4660,7 @@ static int mon_init_func(QemuOpts *opts, void *opaque) return 0; } -static void monitor_parse(const char *optarg) +static void monitor_parse(const char *optarg, const char *mode) { static int monitor_device_index = 0; QemuOpts *opts; @@ -4690,7 +4690,7 @@ static void monitor_parse(const char *optarg) fprintf(stderr, "duplicate chardev: %s\n", label); exit(1); } - qemu_opt_set(opts, "mode", "readline"); + qemu_opt_set(opts, "mode", mode); qemu_opt_set(opts, "chardev", label); if (def) qemu_opt_set(opts, "default", "on"); @@ -5281,7 +5281,11 @@ int main(int argc, char **argv, char **envp) break; } case QEMU_OPTION_monitor: - monitor_parse(optarg); + monitor_parse(optarg, "readline"); + default_monitor = 0; + break; + case QEMU_OPTION_qmp: + monitor_parse(optarg, "control"); default_monitor = 0; break; case QEMU_OPTION_mon: @@ -5617,7 +5621,7 @@ int main(int argc, char **argv, char **envp) if (default_serial) add_device_config(DEV_SERIAL, "stdio"); if (default_monitor) - monitor_parse("stdio"); + monitor_parse("stdio", "readline"); } } else { if (default_serial) @@ -5625,7 +5629,7 @@ int main(int argc, char **argv, char **envp) if (default_parallel) add_device_config(DEV_PARALLEL, "vc:80Cx24C"); if (default_monitor) - monitor_parse("vc:80Cx24C"); + monitor_parse("vc:80Cx24C", "readline"); } if (default_vga) vga_interface_type = VGA_CIRRUS;