summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2009-12-08 13:11:38 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2009-12-12 08:17:29 -0600
commitf9800fe5a0a650d681b71e85645f8d08f6362f63 (patch)
tree656b287b642e6150f524420193f55e62626cc847
parentRevert "monitor: Command-line flag to enable control mode" (diff)
downloadqemu-kvm-f9800fe5a0a650d681b71e85645f8d08f6362f63.tar.gz
qemu-kvm-f9800fe5a0a650d681b71e85645f8d08f6362f63.tar.bz2
qemu-kvm-f9800fe5a0a650d681b71e85645f8d08f6362f63.zip
Revert "Set default console to virtio on S390x"
This reverts commit 93d434b4aec0702b87ebf52449a3cdf2c3596825. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 014100bb73d8512fb3d62f5cb123bfb2d04f3089)
-rw-r--r--vl.c26
1 files changed, 0 insertions, 26 deletions
diff --git a/vl.c b/vl.c
index 11eda45ea..172828afa 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) {