diff --git a/vl.c b/vl.c
index 11eda45ea75cf7c03e9e6dfd9cd62bae6d50bd2f..172828afada14896b67da7c6151638d948f7ff4a 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) {