[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 6/6] hw/display/vga: Report a proper error when adding a 2nd ISA V
From: |
Gerd Hoffmann |
Subject: |
[PULL 6/6] hw/display/vga: Report a proper error when adding a 2nd ISA VGA |
Date: |
Fri, 18 Mar 2022 14:56:34 +0100 |
From: Thomas Huth <thuth@redhat.com>
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>
---
hw/display/vga.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/hw/display/vga.c b/hw/display/vga.c
index ae960235963b..a7a291fa2089 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) {
--
2.35.1
- [PULL 0/6] Fixes 20220318 patches, Gerd Hoffmann, 2022/03/18
- [PULL 1/6] ui/gtk: Ignore 2- and 3-button press events, Gerd Hoffmann, 2022/03/18
- [PULL 2/6] ui: avoid unnecessary memory operations in vnc_refresh_server_surface(), Gerd Hoffmann, 2022/03/18
- [PULL 4/6] hw/display/cirrus_vga: Clean up indentation in pci_cirrus_vga_realize(), Gerd Hoffmann, 2022/03/18
- [PULL 6/6] hw/display/vga: Report a proper error when adding a 2nd ISA VGA,
Gerd Hoffmann <=
- [PULL 3/6] audio/mixeng: Do not declare unused variables, Gerd Hoffmann, 2022/03/18
- [PULL 5/6] hw/display: Allow vga_common_init() to return errors, Gerd Hoffmann, 2022/03/18
- Re: [PULL 0/6] Fixes 20220318 patches, Peter Maydell, 2022/03/19