From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NHcwh-0005Gc-K4 for qemu-devel@nongnu.org; Mon, 07 Dec 2009 07:44:07 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NHcwd-0005EZ-P6 for qemu-devel@nongnu.org; Mon, 07 Dec 2009 07:44:07 -0500 Received: from [199.232.76.173] (port=58666 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NHcwd-0005EB-Ek for qemu-devel@nongnu.org; Mon, 07 Dec 2009 07:44:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39970) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NHcwc-0000ff-Pq for qemu-devel@nongnu.org; Mon, 07 Dec 2009 07:44:03 -0500 From: Gerd Hoffmann Date: Mon, 7 Dec 2009 13:42:34 +0100 Message-Id: <1260189773-20728-3-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> Subject: [Qemu-devel] [FOR 0.12 PATCH v3 02/21] Revert "Set default console to virtio on S390x" List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , agraf@suse.de, lcapitulino@redhat.com This reverts commit 93d434b4aec0702b87ebf52449a3cdf2c3596825. Signed-off-by: Gerd Hoffmann --- vl.c | 26 -------------------------- 1 files changed, 0 insertions(+), 26 deletions(-) diff --git a/vl.c b/vl.c index 86171d0..74b608f 100644 --- a/vl.c +++ b/vl.c @@ -4710,20 +4710,6 @@ 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; @@ -4737,7 +4723,6 @@ 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++) { @@ -5650,17 +5635,6 @@ 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) { -- 1.6.5.2