From patchwork Mon Dec 7 12:42:38 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 40486 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 22347B6F0C for ; Tue, 8 Dec 2009 00:10:50 +1100 (EST) Received: from localhost ([127.0.0.1]:57752 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NHdMV-0007nU-9F for incoming@patchwork.ozlabs.org; Mon, 07 Dec 2009 08:10:47 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NHcww-0005R2-ON for qemu-devel@nongnu.org; Mon, 07 Dec 2009 07:44:23 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NHcwm-0005Jd-0A for qemu-devel@nongnu.org; Mon, 07 Dec 2009 07:44:18 -0500 Received: from [199.232.76.173] (port=58680 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NHcwk-0005It-Kn for qemu-devel@nongnu.org; Mon, 07 Dec 2009 07:44:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44343) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NHcwk-0000gf-7O for qemu-devel@nongnu.org; Mon, 07 Dec 2009 07:44:10 -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 nB7Ci87u003767 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 7 Dec 2009 07:44:09 -0500 Received: from zweiblum.home.kraxel.org (vpn2-8-247.ams2.redhat.com [10.36.8.247]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nB7Ci4vg031584; Mon, 7 Dec 2009 07:44:04 -0500 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 8D5397010C; Mon, 7 Dec 2009 13:43:59 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 7 Dec 2009 13:42:38 +0100 Message-Id: <1260189773-20728-7-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.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 v3 06/21] default devices: parallel port. 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 Qemu creates a default parallel port for you in case you didn't specify one on the command line. Right now this is tied to the '-parallel ' command line switch, which in turn causes trouble if you are creating your parallel port via '-device isa-parallel,'. This patch adds a variable default_parallel which says whenever a default parallel port should be added. It is enabled by default. It is cleared when qemu finds '-parallel' or '-device isa-parallel' on the command line. Signed-off-by: Gerd Hoffmann --- vl.c | 64 ++++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 34 insertions(+), 30 deletions(-) diff --git a/vl.c b/vl.c index eca4eee..50e4558 100644 --- a/vl.c +++ b/vl.c @@ -272,12 +272,14 @@ static QEMUBootSetHandler *boot_set_handler; static void *boot_set_opaque; static int default_serial = 1; +static int default_parallel = 1; static struct { const char *driver; int *flag; } default_list[] = { - { .driver = "isa-serial", .flag = &default_serial }, + { .driver = "isa-serial", .flag = &default_serial }, + { .driver = "isa-parallel", .flag = &default_parallel }, }; static int default_driver_check(QemuOpts *opts, void *opaque) @@ -4615,6 +4617,7 @@ struct device_config { DEV_USB, /* -usbdevice */ DEV_BT, /* -bt */ DEV_SERIAL, /* -serial */ + DEV_PARALLEL, /* -parallel */ } type; const char *cmdline; QTAILQ_ENTRY(device_config) next; @@ -4690,6 +4693,28 @@ static int serial_parse(const char *devname) return 0; } +static int parallel_parse(const char *devname) +{ + static int index = 0; + char label[32]; + + if (strcmp(devname, "none") == 0) + return 0; + if (index == MAX_PARALLEL_PORTS) { + fprintf(stderr, "qemu: too many parallel ports\n"); + exit(1); + } + snprintf(label, sizeof(label), "parallel%d", index); + parallel_hds[index] = qemu_chr_open(label, devname, NULL); + if (!parallel_hds[index]) { + fprintf(stderr, "qemu: could not open parallel device '%s': %s\n", + devname, strerror(errno)); + return -1; + } + index++; + return 0; +} + int main(int argc, char **argv, char **envp) { const char *gdbstub_dev = NULL; @@ -4708,8 +4733,6 @@ int main(int argc, char **argv, char **envp) CharDriverState *monitor_hds[MAX_MONITOR_DEVICES]; const char *monitor_devices[MAX_MONITOR_DEVICES]; int monitor_device_index; - const char *parallel_devices[MAX_PARALLEL_PORTS]; - int parallel_device_index; const char *virtio_consoles[MAX_VIRTIO_CONSOLES]; int virtio_console_index; const char *loadvm = NULL; @@ -4777,11 +4800,6 @@ int main(int argc, char **argv, char **envp) cyls = heads = secs = 0; translation = BIOS_ATA_TRANSLATION_AUTO; - parallel_devices[0] = "vc:80Cx24C"; - for(i = 1; i < MAX_PARALLEL_PORTS; i++) - parallel_devices[i] = NULL; - parallel_device_index = 0; - for(i = 0; i < MAX_VIRTIO_CONSOLES; i++) virtio_consoles[i] = NULL; virtio_console_index = 0; @@ -5249,12 +5267,8 @@ int main(int argc, char **argv, char **envp) virtio_console_index++; break; case QEMU_OPTION_parallel: - if (parallel_device_index >= MAX_PARALLEL_PORTS) { - fprintf(stderr, "qemu: too many parallel ports\n"); - exit(1); - } - parallel_devices[parallel_device_index] = optarg; - parallel_device_index++; + add_device_config(DEV_PARALLEL, optarg); + default_parallel = 0; break; case QEMU_OPTION_loadvm: loadvm = optarg; @@ -5530,14 +5544,16 @@ int main(int argc, char **argv, char **envp) if (display_type == DT_NOGRAPHIC) { if (default_serial) add_device_config(DEV_SERIAL, "stdio"); - if (parallel_device_index == 0) - parallel_devices[0] = "null"; + if (default_parallel) + add_device_config(DEV_PARALLEL, "null"); if (strncmp(monitor_devices[0], "vc", 2) == 0) { monitor_devices[0] = "stdio"; } } else { if (default_serial) add_device_config(DEV_SERIAL, "vc:80Cx24C"); + if (default_parallel) + add_device_config(DEV_PARALLEL, "vc:80Cx24C"); } #ifndef _WIN32 @@ -5750,20 +5766,8 @@ int main(int argc, char **argv, char **envp) if (foreach_device_config(DEV_SERIAL, serial_parse) < 0) exit(1); - - for(i = 0; i < MAX_PARALLEL_PORTS; i++) { - const char *devname = parallel_devices[i]; - if (devname && strcmp(devname, "none")) { - char label[32]; - snprintf(label, sizeof(label), "parallel%d", i); - parallel_hds[i] = qemu_chr_open(label, devname, NULL); - if (!parallel_hds[i]) { - fprintf(stderr, "qemu: could not open parallel device '%s': %s\n", - devname, strerror(errno)); - exit(1); - } - } - } + if (foreach_device_config(DEV_PARALLEL, parallel_parse) < 0) + exit(1); for(i = 0; i < MAX_VIRTIO_CONSOLES; i++) { const char *devname = virtio_consoles[i];