From patchwork Tue Dec 8 12:11:37 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 40611 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 733C0B7B3E for ; Tue, 8 Dec 2009 23:23:48 +1100 (EST) Received: from localhost ([127.0.0.1]:40715 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NHz6X-0000zh-Ep for incoming@patchwork.ozlabs.org; Tue, 08 Dec 2009 07:23:45 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NHyvJ-0005f3-2C for qemu-devel@nongnu.org; Tue, 08 Dec 2009 07:12:09 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NHyvD-0005ca-4S for qemu-devel@nongnu.org; Tue, 08 Dec 2009 07:12:07 -0500 Received: from [199.232.76.173] (port=44192 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NHyvC-0005cM-K9 for qemu-devel@nongnu.org; Tue, 08 Dec 2009 07:12:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:15592) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NHyvC-00081y-5f for qemu-devel@nongnu.org; Tue, 08 Dec 2009 07:12:02 -0500 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nB8CC11H015513 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 8 Dec 2009 07:12:01 -0500 Received: from zweiblum.home.kraxel.org (vpn2-9-91.ams2.redhat.com [10.36.9.91]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nB8CBxpq031058; Tue, 8 Dec 2009 07:11:59 -0500 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id D4C707010B; Tue, 8 Dec 2009 13:11:57 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 8 Dec 2009 13:11:37 +0100 Message-Id: <1260274314-2906-6-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.17 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 05/22] Revert "monitor: Command-line flag to enable control mode" 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 This reverts commit adcb181afe5a951c521411c7a8e9d9b791aa6742. Conflicts: monitor.h Signed-off-by: Gerd Hoffmann --- monitor.c | 18 ------------------ monitor.h | 1 - qemu-options.hx | 5 ++--- vl.c | 11 ++++------- 4 files changed, 6 insertions(+), 29 deletions(-) diff --git a/monitor.c b/monitor.c index a38a103..8a1be39 100644 --- a/monitor.c +++ b/monitor.c @@ -4038,24 +4038,6 @@ static void monitor_event(void *opaque, int event) * End: */ -const char *monitor_cmdline_parse(const char *cmdline, int *flags) -{ - const char *dev; - - if (strstart(cmdline, "control,", &dev)) { - if (strstart(dev, "vc", NULL)) { - fprintf(stderr, "qemu: control mode is for low-level interaction "); - fprintf(stderr, "cannot be used with device 'vc'\n"); - exit(1); - } - *flags &= ~MONITOR_USE_READLINE; - *flags |= MONITOR_USE_CONTROL; - return dev; - } - - return cmdline; -} - void monitor_init(CharDriverState *chr, int flags) { static int is_first_init = 1; diff --git a/monitor.h b/monitor.h index 38cc223..6ed117a 100644 --- a/monitor.h +++ b/monitor.h @@ -24,7 +24,6 @@ typedef enum MonitorEvent { } MonitorEvent; void monitor_protocol_event(MonitorEvent event, QObject *data); -const char *monitor_cmdline_parse(const char *cmdline, int *flags); void monitor_init(CharDriverState *chr, int flags); int monitor_suspend(Monitor *mon); diff --git a/qemu-options.hx b/qemu-options.hx index b6f3075..420b7d8 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1580,14 +1580,13 @@ Use @code{-parallel none} to disable all parallel ports. ETEXI DEF("monitor", HAS_ARG, QEMU_OPTION_monitor, \ - "-monitor [control,]dev redirect the monitor to char device 'dev'\n") + "-monitor dev redirect the monitor to char device 'dev'\n") STEXI -@item -monitor [@var{control},]@var{dev} +@item -monitor @var{dev} Redirect the monitor to host device @var{dev} (same devices as the serial port). The default device is @code{vc} in graphical mode and @code{stdio} in non graphical mode. -The option @var{control} enables the QEMU Monitor Protocol. ETEXI DEF("pidfile", HAS_ARG, QEMU_OPTION_pidfile, \ diff --git a/vl.c b/vl.c index aa678ad..11eda45 100644 --- a/vl.c +++ b/vl.c @@ -4648,7 +4648,6 @@ int main(int argc, char **argv, char **envp) const char *r, *optarg; CharDriverState *monitor_hds[MAX_MONITOR_DEVICES]; const char *monitor_devices[MAX_MONITOR_DEVICES]; - int monitor_flags[MAX_MONITOR_DEVICES]; int monitor_device_index; const char *serial_devices[MAX_SERIAL_PORTS]; int serial_device_index; @@ -4751,10 +4750,8 @@ int main(int argc, char **argv, char **envp) #endif monitor_devices[0] = "vc:80Cx24C"; - monitor_flags[0] = MONITOR_IS_DEFAULT | MONITOR_USE_READLINE; for (i = 1; i < MAX_MONITOR_DEVICES; i++) { monitor_devices[i] = NULL; - monitor_flags[i] = MONITOR_USE_READLINE; } monitor_device_index = 0; @@ -5179,9 +5176,7 @@ int main(int argc, char **argv, char **envp) fprintf(stderr, "qemu: too many monitor devices\n"); exit(1); } - monitor_devices[monitor_device_index] = - monitor_cmdline_parse(optarg, - &monitor_flags[monitor_device_index]); + monitor_devices[monitor_device_index] = optarg; monitor_device_index++; break; case QEMU_OPTION_chardev: @@ -5891,7 +5886,9 @@ int main(int argc, char **argv, char **envp) for (i = 0; i < MAX_MONITOR_DEVICES; i++) { if (monitor_devices[i] && monitor_hds[i]) { - monitor_init(monitor_hds[i], monitor_flags[i]); + monitor_init(monitor_hds[i], + MONITOR_USE_READLINE | + ((i == 0) ? MONITOR_IS_DEFAULT : 0)); } }