Patchwork [FOR,0.12,v4,06/22] Revert "Set default console to virtio on S390x"

login
register
mail settings
Submitter Gerd Hoffmann
Date Dec. 8, 2009, 12:11 p.m.
Message ID <1260274314-2906-7-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/40614/
State New
Headers show

Comments

Gerd Hoffmann - Dec. 8, 2009, 12:11 p.m.
This reverts commit 93d434b4aec0702b87ebf52449a3cdf2c3596825.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 vl.c |   26 --------------------------
 1 files changed, 0 insertions(+), 26 deletions(-)
Markus Armbruster - Dec. 10, 2009, 8 a.m.
Gerd Hoffmann <kraxel@redhat.com> writes:

> This reverts commit 93d434b4aec0702b87ebf52449a3cdf2c3596825.

Same here: would be nice to state why it's reverted, and that it'll be
back in a few commits.

> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
[...]

Patch

diff --git a/vl.c b/vl.c
index 11eda45..172828a 100644
--- a/vl.c
+++ b/vl.c
@@ -4720,20 +4720,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;
@@ -4747,7 +4733,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++) {
@@ -5664,17 +5649,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) {