From patchwork Mon Dec 7 12:42:40 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 40481 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 C2E5CB6F09 for ; Tue, 8 Dec 2009 00:02:31 +1100 (EST) Received: from localhost ([127.0.0.1]:41834 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NHdET-00046u-9i for incoming@patchwork.ozlabs.org; Mon, 07 Dec 2009 08:02:29 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NHcwq-0005N6-Dm for qemu-devel@nongnu.org; Mon, 07 Dec 2009 07:44:16 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NHcwi-0005HA-Mm for qemu-devel@nongnu.org; Mon, 07 Dec 2009 07:44:13 -0500 Received: from [199.232.76.173] (port=58674 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NHcwi-0005Gr-8E for qemu-devel@nongnu.org; Mon, 07 Dec 2009 07:44:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:16036) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NHcwh-0000gD-QZ for qemu-devel@nongnu.org; Mon, 07 Dec 2009 07:44:08 -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 nB7Ci6Tb022743 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 7 Dec 2009 07:44:06 -0500 Received: from zweiblum.home.kraxel.org (vpn2-8-247.ams2.redhat.com [10.36.8.247]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nB7Ci4hS004305; Mon, 7 Dec 2009 07:44:04 -0500 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 9669F7010E; Mon, 7 Dec 2009 13:43:59 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 7 Dec 2009 13:42:40 +0100 Message-Id: <1260189773-20728-9-git-send-email-kraxel@redhat.com> In-Reply-To: <1260189773-20728-1-git-send-email-kraxel@redhat.com> References: <1260189773-20728-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 v3 08/21] zap serial_monitor_mux 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 The logic in this code obviously predates the multiple monitor capability of qemu and looks increasingly silly these days. I think the intention of this piece of code is to get a reasonable default for the -nographic case: have monitor and serial line muxed on stdio. With the new default_serial and default_monitor variables we have now doing just that became much easier ;) Signed-off-by: Gerd Hoffmann --- vl.c | 42 ++++++++---------------------------------- 1 files changed, 8 insertions(+), 34 deletions(-) diff --git a/vl.c b/vl.c index cb59c3c..d851f46 100644 --- a/vl.c +++ b/vl.c @@ -4652,33 +4652,6 @@ static int foreach_device_config(int type, int (*func)(const char *cmdline)) return 0; } -static void serial_monitor_mux(void) -{ - struct device_config *mon0, *serial; - const char *devname; - - QTAILQ_FOREACH(mon0, &device_configs, next) { - if (mon0->type != DEV_MONITOR) - continue; - if (strcmp(mon0->cmdline,"stdio") != 0) - return; - break; - } - QTAILQ_FOREACH(serial, &device_configs, next) { - if (serial->type != DEV_SERIAL) - continue; - devname = serial->cmdline; - if (devname && !strcmp(devname,"mon:stdio")) { - QTAILQ_REMOVE(&device_configs, mon0, next); - break; - } else if (devname && !strcmp(devname,"stdio")) { - QTAILQ_REMOVE(&device_configs, mon0, next); - serial->cmdline = "mon:stdio"; - break; - } - } -} - static int serial_parse(const char *devname) { static int index = 0; @@ -5563,12 +5536,16 @@ int main(int argc, char **argv, char **envp) qemu_opts_foreach(&qemu_device_opts, default_driver_check, NULL, 0); if (display_type == DT_NOGRAPHIC) { - if (default_serial) - add_device_config(DEV_SERIAL, "stdio"); if (default_parallel) add_device_config(DEV_PARALLEL, "null"); - if (default_monitor) - add_device_config(DEV_MONITOR, "stdio"); + if (default_serial && default_monitor) { + add_device_config(DEV_SERIAL, "mon:stdio"); + } else { + if (default_serial) + add_device_config(DEV_SERIAL, "stdio"); + if (default_monitor) + add_device_config(DEV_MONITOR, "stdio"); + } } else { if (default_serial) add_device_config(DEV_SERIAL, "vc:80Cx24C"); @@ -5723,9 +5700,6 @@ int main(int argc, char **argv, char **envp) register_savevm_live("ram", 0, 3, NULL, ram_save_live, NULL, ram_load, NULL); - /* Maintain compatibility with multiple stdio monitors */ - serial_monitor_mux(); - if (nb_numa_nodes > 0) { int i;