diff options
| author | Thomas Huth <thuth@redhat.com> | 2022-03-17 09:30:26 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2022-03-18 10:15:57 +0100 |
| commit | 9eb840a20998a97c0ad0f5ced6ebc7e6a88a4dc4 (patch) | |
| tree | 4bd21ef75bbd5dd63e4e8069684294bb10197935 /hw/display | |
| parent | 6832deb8ff0807e0b46a8a67f5d2abfa36ca3b47 (diff) | |
| download | focaccia-qemu-9eb840a20998a97c0ad0f5ced6ebc7e6a88a4dc4.tar.gz focaccia-qemu-9eb840a20998a97c0ad0f5ced6ebc7e6a88a4dc4.zip | |
hw/display/vga: Report a proper error when adding a 2nd ISA VGA
QEMU currently abort()s if the user tries to add a second ISA VGA device, for example: $ ./qemu-system-x86_64 -device isa-vga -device isa-vga RAMBlock "vga.vram" already registered, abort! Aborted (core dumped) $ ./qemu-system-x86_64 -device isa-cirrus-vga -device isa-cirrus-vga RAMBlock "vga.vram" already registered, abort! Aborted (core dumped) $ ./qemu-system-mips64el -M pica61 -device isa-vga RAMBlock "vga.vram" already registered, abort! Aborted (core dumped) Such a crash should never happen just because of giving bad parameters at the command line. Let's return a proper error message instead. (The idea is based on an original patch by Jose R. Ziviani for the isa-vga device, but this now fixes it for the isa-cirrus-vga device, too) Resolves: https://gitlab.com/qemu-project/qemu/-/issues/44 Signed-off-by: Thomas Huth <thuth@redhat.com> Message-Id: <20220317083027.16688-4-thuth@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/display')
| -rw-r--r-- | hw/display/vga.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/hw/display/vga.c b/hw/display/vga.c index ae96023596..a7a291fa20 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -2206,6 +2206,12 @@ bool vga_common_init(VGACommonState *s, Object *obj, Error **errp) s->vbe_size_mask = s->vbe_size - 1; s->is_vbe_vmstate = 1; + + if (s->global_vmstate && qemu_ram_block_by_name("vga.vram")) { + error_setg(errp, "Only one global VGA device can be used at a time"); + return false; + } + memory_region_init_ram_nomigrate(&s->vram, obj, "vga.vram", s->vram_size, &local_err); if (local_err) { |