Skip to content

Commit ee29f6e

Browse files
author
Markus Armbruster
committed
bochs-display: Fix vgamem=SIZE error handling
bochs_display_realize() rejects out-of-range vgamem. The error handling is broken: $ qemu-system-x86_64 -S -display none -monitor stdio QEMU 4.2.93 monitor - type 'help' for more information (qemu) device_add bochs-display,vgamem=1 Error: bochs-display: video memory too small (qemu) device_add bochs-display,vgamem=1 RAMBlock "0000:00:04.0/bochs-display-vram" already registered, abort! Aborted (core dumped) Cause: bochs_display_realize() neglects to bail out after setting the error. Fix that. Fixes: 765c942 Cc: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20200422130719.28225-8-armbru@redhat.com> Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
1 parent 07a978e commit ee29f6e

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

hw/display/bochs-display.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,16 +267,18 @@ static void bochs_display_realize(PCIDevice *dev, Error **errp)
267267
Object *obj = OBJECT(dev);
268268
int ret;
269269

270-
s->con = graphic_console_init(DEVICE(dev), 0, &bochs_display_gfx_ops, s);
271-
272270
if (s->vgamem < 4 * MiB) {
273271
error_setg(errp, "bochs-display: video memory too small");
272+
return;
274273
}
275274
if (s->vgamem > 256 * MiB) {
276275
error_setg(errp, "bochs-display: video memory too big");
276+
return;
277277
}
278278
s->vgamem = pow2ceil(s->vgamem);
279279

280+
s->con = graphic_console_init(DEVICE(dev), 0, &bochs_display_gfx_ops, s);
281+
280282
memory_region_init_ram(&s->vram, obj, "bochs-display-vram", s->vgamem,
281283
&error_fatal);
282284
memory_region_init_io(&s->vbe, obj, &bochs_display_vbe_ops, s,

0 commit comments

Comments
 (0)