david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Set default console to virtio on S390x"

Browse Source 
This reverts commit 93d434b4aec0702b87ebf52449a3cdf2c3596825.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Gerd Hoffmann 2009-12-08 13:11:38 +01:00 committed by Anthony Liguori
parent 4e307fc883
commit 014100bb73
1 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
vl.c
View File

@ -4720,20 +4720,6 @@ int main(int argc, char **argv, char **envp)
cyls = heads = secs = 0; cyls = heads = secs = 0;
translation = BIOS_ATA_TRANSLATION_AUTO; 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"; serial_devices[0] = "vc:80Cx24C";
for(i = 1; i < MAX_SERIAL_PORTS; i++) for(i = 1; i < MAX_SERIAL_PORTS; i++)
serial_devices[i] = NULL; serial_devices[i] = NULL;
@ -4747,7 +4733,6 @@ int main(int argc, char **argv, char **envp)
for(i = 0; i < MAX_VIRTIO_CONSOLES; i++) for(i = 0; i < MAX_VIRTIO_CONSOLES; i++)
virtio_consoles[i] = NULL; virtio_consoles[i] = NULL;
virtio_console_index = 0; virtio_console_index = 0;
#endif
monitor_devices[0] = "vc:80Cx24C"; monitor_devices[0] = "vc:80Cx24C";
for (i = 1; i < MAX_MONITOR_DEVICES; i++) { for (i = 1; i < MAX_MONITOR_DEVICES; i++) {
@ -5664,17 +5649,6 @@ int main(int argc, char **argv, char **envp)
break; 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) { if (nb_numa_nodes > 0) {