From patchwork Tue Nov 24 17:29:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 39217 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 0E4121007D3 for ; Wed, 25 Nov 2009 04:46:01 +1100 (EST) Received: from localhost ([127.0.0.1]:40352 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NCzSg-0005eZ-DR for incoming@patchwork.ozlabs.org; Tue, 24 Nov 2009 12:45:58 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NCzD8-0004Sk-R7 for qemu-devel@nongnu.org; Tue, 24 Nov 2009 12:29:54 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NCzD1-0004Kh-08 for qemu-devel@nongnu.org; Tue, 24 Nov 2009 12:29:51 -0500 Received: from [199.232.76.173] (port=46426 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NCzD0-0004KA-Ny for qemu-devel@nongnu.org; Tue, 24 Nov 2009 12:29:46 -0500 Received: from cantor2.suse.de ([195.135.220.15]:48965 helo=mx2.suse.de) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NCzCz-000226-Ry for qemu-devel@nongnu.org; Tue, 24 Nov 2009 12:29:46 -0500 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2]) by mx2.suse.de (Postfix) with ESMTP id 6645A8891E; Tue, 24 Nov 2009 18:29:42 +0100 (CET) From: Alexander Graf To: qemu-devel@nongnu.org Date: Tue, 24 Nov 2009 18:29:39 +0100 Message-Id: <1259083781-14642-12-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1259083781-14642-1-git-send-email-agraf@suse.de> References: <1259083781-14642-1-git-send-email-agraf@suse.de> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 Cc: Carsten Otte , Aurelien Jarno Subject: [Qemu-devel] [PATCH 11/13] Set default console to virtio on S390x 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 All "normal" system emulation targets in qemu I'm aware of display output on either VGA or serial output. Our S390x virtio machine doesn't have such kind of legacy hardware. So instead we need to default to a virtio console. I'm not particularly proud of this patch. It would be a lot better to have something in the machine description that tells us about the default terminal. Signed-off-by: Alexander Graf --- vl.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/vl.c b/vl.c index c3f3c8f..46d9e01 100644 --- a/vl.c +++ b/vl.c @@ -4663,6 +4663,20 @@ int main(int argc, char **argv, char **envp) cyls = heads = secs = 0; translation = BIOS_ATA_TRANSLATION_AUTO; +#ifdef TARGET_S390X + for(i = 0; i < MAX_SERIAL_PORTS; i++) + serial_devices[i] = NULL; + serial_device_index = 0; + + for(i = 0; i < MAX_PARALLEL_PORTS; i++) + parallel_devices[i] = NULL; + parallel_device_index = 0; + + virtio_consoles[0] = "mon:stdio"; + for(i = 1; i < MAX_VIRTIO_CONSOLES; i++) + virtio_consoles[i] = NULL; + virtio_console_index = 0; +#else serial_devices[0] = "vc:80Cx24C"; for(i = 1; i < MAX_SERIAL_PORTS; i++) serial_devices[i] = NULL; @@ -4676,6 +4690,7 @@ int main(int argc, char **argv, char **envp) for(i = 0; i < MAX_VIRTIO_CONSOLES; i++) virtio_consoles[i] = NULL; virtio_console_index = 0; +#endif monitor_devices[0] = "vc:80Cx24C"; for (i = 1; i < MAX_MONITOR_DEVICES; i++) { @@ -5587,6 +5602,17 @@ int main(int argc, char **argv, char **envp) break; } } + for (i = 0; i < MAX_VIRTIO_CONSOLES; i++) { + const char *devname = virtio_consoles[i]; + if (devname && !strcmp(devname,"mon:stdio")) { + monitor_devices[0] = NULL; + break; + } else if (devname && !strcmp(devname,"stdio")) { + monitor_devices[0] = NULL; + virtio_consoles[i] = "mon:stdio"; + break; + } + } } if (nb_numa_nodes > 0) {