diff options
| author |   Gerd Hoffmann <kraxel@redhat.com> | 2009-12-08 13:11:54 +0100 |
|---|---|---|
| committer |   Anthony Liguori <aliguori@us.ibm.com> | 2009-12-12 08:17:30 -0600 |
| commit | 828b2ff6769ff8e8d294e0c7b77472f985476a9f (patch) | |
| tree | db7c8d7978ca15148ec1d76eb7a7eae06a4e2718 /hw | |
| parent | default devices: virtio consoles. (diff) | |
| download | qemu-kvm-828b2ff6769ff8e8d294e0c7b77472f985476a9f.tar.gz qemu-kvm-828b2ff6769ff8e8d294e0c7b77472f985476a9f.tar.bz2 qemu-kvm-828b2ff6769ff8e8d294e0c7b77472f985476a9f.zip | |
Set default console to virtio on S390x
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.
Add flags to QEMUMachine to indicate which kind of default devices make
sense for the machine in question. Use it for S390x: enable virtcon,
disable serial, parallel and vga.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit 986c5f78543bdbd696664447ecdd08cf6d935370)
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/boards.h | 4 | ||||
| -rw-r--r-- | hw/s390-virtio.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/hw/boards.h b/hw/boards.h index 7a0f20f63..8fe0fbc8f 100644 --- a/hw/boards.h +++ b/hw/boards.h @@ -19,6 +19,10 @@ typedef struct QEMUMachine { QEMUMachineInitFunc *init; int use_scsi; int max_cpus; + int no_serial:1, + no_parallel:1, + use_virtcon:1, + no_vga:1; int is_default; GlobalProperty *compat_props; struct QEMUMachine *next; diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c index cc21ee6da..51c032adc 100644 --- a/hw/s390-virtio.c +++ b/hw/s390-virtio.c @@ -243,6 +243,10 @@ static QEMUMachine s390_machine = { .alias = "s390", .desc = "VirtIO based S390 machine", .init = s390_init, + .no_serial = 1, + .no_parallel = 1, + .use_virtcon = 1. + .no_vga = 1, .max_cpus = 255, .is_default = 1, }; |