From patchwork Tue Nov 24 08:58:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 39187 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 27CF8B6F15 for ; Tue, 24 Nov 2009 20:12:56 +1100 (EST) Received: from localhost ([127.0.0.1]:35608 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NCrS9-0004os-1C for incoming@patchwork.ozlabs.org; Tue, 24 Nov 2009 04:12:53 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NCrEk-0006ty-7r for qemu-devel@nongnu.org; Tue, 24 Nov 2009 03:59:02 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NCrEf-0006ov-I5 for qemu-devel@nongnu.org; Tue, 24 Nov 2009 03:59:01 -0500 Received: from [199.232.76.173] (port=51451 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NCrEe-0006oY-Tt for qemu-devel@nongnu.org; Tue, 24 Nov 2009 03:58:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49591) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NCrEe-0000tV-7Z for qemu-devel@nongnu.org; Tue, 24 Nov 2009 03:58:56 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAO8wtE1015334 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 24 Nov 2009 03:58:55 -0500 Received: from zweiblum.home.kraxel.org (vpn1-4-89.ams2.redhat.com [10.36.4.89]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id nAO8wpWV013916; Tue, 24 Nov 2009 03:58:52 -0500 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 3D7667010A; Tue, 24 Nov 2009 09:58:45 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 24 Nov 2009 09:58:39 +0100 Message-Id: <1259053124-10471-6-git-send-email-kraxel@redhat.com> In-Reply-To: <1259053124-10471-1-git-send-email-kraxel@redhat.com> References: <1259053124-10471-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 05/10] default devices: qemu monitor. 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 patch makes the monitor default device configuration work like the default serial and parallel port devices. It adds a variable default_monitor which says whenever a default monitor should be added. It is enabled by default. It is cleared when qemu finds '-monitor' on the command line. Signed-off-by: Gerd Hoffmann --- vl.c | 94 +++++++++++++++++++++++++++++++++++------------------------------- 1 files changed, 50 insertions(+), 44 deletions(-) diff --git a/vl.c b/vl.c index ca0af9d..15f2357 100644 --- a/vl.c +++ b/vl.c @@ -212,6 +212,7 @@ int no_quit = 0; CharDriverState *serial_hds[MAX_SERIAL_PORTS]; CharDriverState *parallel_hds[MAX_PARALLEL_PORTS]; CharDriverState *virtcon_hds[MAX_VIRTIO_CONSOLES]; +CharDriverState *monitor_hds[MAX_MONITOR_DEVICES]; #ifdef TARGET_I386 int win2k_install_hack = 0; int rtc_td_hack = 0; @@ -274,6 +275,7 @@ static void *boot_set_opaque; static int default_serial = 1; static int default_parallel = 1; +static int default_monitor = 1; static struct { const char *driver; @@ -4571,6 +4573,7 @@ struct device_config { DEV_BT, /* -bt */ DEV_SERIAL, /* -serial */ DEV_PARALLEL, /* -parallel */ + DEV_MONITOR, /* -monitor */ } type; const char *cmdline; QTAILQ_ENTRY(device_config) next; @@ -4602,22 +4605,27 @@ static int foreach_device_config(int type, int (*func)(const char *cmdline)) return 0; } -static void serial_monitor_mux(const char *monitor_devices[]) +static void serial_monitor_mux(void) { - struct device_config *serial; + struct device_config *mon0, *serial; const char *devname; - if (strcmp(monitor_devices[0],"stdio") != 0) - return; + 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")) { - monitor_devices[0] = NULL; + QTAILQ_REMOVE(&device_configs, mon0, next); break; } else if (devname && !strcmp(devname,"stdio")) { - monitor_devices[0] = NULL; + QTAILQ_REMOVE(&device_configs, mon0, next); serial->cmdline = "mon:stdio"; break; } @@ -4668,6 +4676,32 @@ static int parallel_parse(const char *devname) return 0; } +static int monitor_parse(const char *devname) +{ + static int index = 0; + char label[32]; + + if (strcmp(devname, "none") == 0) + return 0; + if (index == MAX_MONITOR_DEVICES) { + fprintf(stderr, "qemu: too many monitor devices\n"); + exit(1); + } + if (index == 0) { + snprintf(label, sizeof(label), "monitor"); + } else { + snprintf(label, sizeof(label), "monitor%d", index); + } + monitor_hds[index] = qemu_chr_open(label, devname, NULL); + if (!monitor_hds[index]) { + fprintf(stderr, "qemu: could not open monitor device '%s'\n", + devname); + return -1; + } + index++; + return 0; +} + int main(int argc, char **argv, char **envp) { const char *gdbstub_dev = NULL; @@ -4683,9 +4717,6 @@ int main(int argc, char **argv, char **envp) QemuOpts *hda_opts = NULL, *opts; int optind; const char *r, *optarg; - CharDriverState *monitor_hds[MAX_MONITOR_DEVICES]; - const char *monitor_devices[MAX_MONITOR_DEVICES]; - int monitor_device_index; const char *virtio_consoles[MAX_VIRTIO_CONSOLES]; int virtio_console_index; const char *loadvm = NULL; @@ -4757,12 +4788,6 @@ int main(int argc, char **argv, char **envp) virtio_consoles[i] = NULL; virtio_console_index = 0; - monitor_devices[0] = "vc:80Cx24C"; - for (i = 1; i < MAX_MONITOR_DEVICES; i++) { - monitor_devices[i] = NULL; - } - monitor_device_index = 0; - for (i = 0; i < MAX_NODES; i++) { node_mem[i] = 0; node_cpumask[i] = 0; @@ -5176,12 +5201,8 @@ int main(int argc, char **argv, char **envp) break; } case QEMU_OPTION_monitor: - if (monitor_device_index >= MAX_MONITOR_DEVICES) { - fprintf(stderr, "qemu: too many monitor devices\n"); - exit(1); - } - monitor_devices[monitor_device_index] = optarg; - monitor_device_index++; + add_device_config(DEV_MONITOR, optarg); + default_monitor = 0; break; case QEMU_OPTION_chardev: opts = qemu_opts_parse(&qemu_chardev_opts, optarg, "backend"); @@ -5499,14 +5520,15 @@ int main(int argc, char **argv, char **envp) add_device_config(DEV_SERIAL, "stdio"); if (default_parallel) add_device_config(DEV_PARALLEL, "null"); - if (strncmp(monitor_devices[0], "vc", 2) == 0) { - monitor_devices[0] = "stdio"; - } + if (default_monitor) + add_device_config(DEV_MONITOR, "stdio"); } else { if (default_serial) add_device_config(DEV_SERIAL, "vc:80Cx24C"); if (default_parallel) add_device_config(DEV_PARALLEL, "vc:80Cx24C"); + if (default_monitor) + add_device_config(DEV_MONITOR, "vc:80Cx24C"); } #ifndef _WIN32 @@ -5652,7 +5674,7 @@ int main(int argc, char **argv, char **envp) ram_load, NULL); /* Maintain compatibility with multiple stdio monitors */ - serial_monitor_mux(monitor_devices); + serial_monitor_mux(); if (nb_numa_nodes > 0) { int i; @@ -5696,24 +5718,8 @@ int main(int argc, char **argv, char **envp) } } - for (i = 0; i < MAX_MONITOR_DEVICES; i++) { - const char *devname = monitor_devices[i]; - if (devname && strcmp(devname, "none")) { - char label[32]; - if (i == 0) { - snprintf(label, sizeof(label), "monitor"); - } else { - snprintf(label, sizeof(label), "monitor%d", i); - } - monitor_hds[i] = qemu_chr_open(label, devname, NULL); - if (!monitor_hds[i]) { - fprintf(stderr, "qemu: could not open monitor device '%s'\n", - devname); - exit(1); - } - } - } - + if (foreach_device_config(DEV_MONITOR, monitor_parse) < 0) + exit(1); if (foreach_device_config(DEV_SERIAL, serial_parse) < 0) exit(1); if (foreach_device_config(DEV_PARALLEL, parallel_parse) < 0) @@ -5837,7 +5843,7 @@ int main(int argc, char **argv, char **envp) text_consoles_set_display(display_state); for (i = 0; i < MAX_MONITOR_DEVICES; i++) { - if (monitor_devices[i] && monitor_hds[i]) { + if (monitor_hds[i]) { monitor_init(monitor_hds[i], MONITOR_USE_READLINE | ((i == 0) ? MONITOR_IS_DEFAULT : 0));