[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 8/9] Set default console to virtio on S390x
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PATCH 8/9] Set default console to virtio on S390x |
Date: |
Wed, 21 Oct 2009 21:17:00 +0200 |
All "normal" system emulation targets in qemu I'm aware of display output
on either VGA or serial output.
Our S390x virtio machine doesn't have such kind of legacy hardware. So
instead we need to default to a virtio console.
I'm not particularly proud of this patch. It would be a lot better to
have something in the machine description that tells us about the default
terminal.
Signed-off-by: Alexander Graf <address@hidden>
---
vl.c | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/vl.c b/vl.c
index eb2744e..e7f1504 100644
--- a/vl.c
+++ b/vl.c
@@ -4818,6 +4818,20 @@ 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;
@@ -4831,6 +4845,7 @@ 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++) {
@@ -5709,6 +5724,17 @@ 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.0.2
- [Qemu-devel] [PATCH 0/9] S390x KVM support v3, Alexander Graf, 2009/10/21
- [Qemu-devel] [PATCH 1/9] Add KVM support for S390x, Alexander Graf, 2009/10/21
- [Qemu-devel] [PATCH 2/9] Allocate physical memory in low virtual address space, Alexander Graf, 2009/10/21
- [Qemu-devel] [PATCH 3/9] Add support for S390x system emulation, Alexander Graf, 2009/10/21
- [Qemu-devel] [PATCH 4/9] Add S390x virtio machine bus, Alexander Graf, 2009/10/21
- [Qemu-devel] [PATCH 5/9] Add S390x virtio machine description, Alexander Graf, 2009/10/21
- [Qemu-devel] [PATCH 6/9] S390 GDB stub, Alexander Graf, 2009/10/21
- [Qemu-devel] [PATCH 7/9] Implement early printk in virtio-console, Alexander Graf, 2009/10/21
- [Qemu-devel] [PATCH 8/9] Set default console to virtio on S390x,
Alexander Graf <=
- [Qemu-devel] [PATCH 9/9] Move mp_state to CPU_COMMON, Alexander Graf, 2009/10/21
- Re: [Qemu-devel] [PATCH 9/9] Move mp_state to CPU_COMMON, Hollis Blanchard, 2009/10/29