[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 03/13] macfb: fix invalid object reference in macfb_common_rea
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v4 03/13] macfb: fix invalid object reference in macfb_common_realize() |
Date: |
Thu, 7 Oct 2021 23:12:43 +0100 |
During realize memory_region_init_ram_nomigrate() is used to initialise the RAM
memory region used for the framebuffer but the owner object reference is
incorrect since MacFbState is a typedef and not a QOM type.
Change the memory region owner to be the corresponding DeviceState to fix the
issue and prevent random crashes during macfb_common_realize().
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Fixes: 8ac919a0654 ("hw/m68k: add Nubus macfb video card")
Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
---
hw/display/macfb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/display/macfb.c b/hw/display/macfb.c
index 2ec25c5d6f..b363bab889 100644
--- a/hw/display/macfb.c
+++ b/hw/display/macfb.c
@@ -365,7 +365,7 @@ static bool macfb_common_realize(DeviceState *dev,
MacfbState *s, Error **errp)
memory_region_init_io(&s->mem_ctrl, OBJECT(dev), &macfb_ctrl_ops, s,
"macfb-ctrl", 0x1000);
- memory_region_init_ram_nomigrate(&s->mem_vram, OBJECT(s), "macfb-vram",
+ memory_region_init_ram_nomigrate(&s->mem_vram, OBJECT(dev), "macfb-vram",
MACFB_VRAM_SIZE, &error_abort);
s->vram = memory_region_get_ram_ptr(&s->mem_vram);
s->vram_bit_mask = MACFB_VRAM_SIZE - 1;
--
2.20.1
- [PATCH v4 00/13] macfb: fixes for booting MacOS, Mark Cave-Ayland, 2021/10/07
- [PATCH v4 01/13] macfb: handle errors that occur during realize, Mark Cave-Ayland, 2021/10/07
- [PATCH v4 02/13] macfb: update macfb.c to use the Error API best practices, Mark Cave-Ayland, 2021/10/07
- [PATCH v4 03/13] macfb: fix invalid object reference in macfb_common_realize(),
Mark Cave-Ayland <=
- [PATCH v4 04/13] macfb: fix overflow of color_palette array, Mark Cave-Ayland, 2021/10/07
- [PATCH v4 05/13] macfb: use memory_region_init_ram() in macfb_common_realize() for the framebuffer, Mark Cave-Ayland, 2021/10/07
- [PATCH v4 06/13] macfb: add trace events for reading and writing the control registers, Mark Cave-Ayland, 2021/10/07
- [PATCH v4 09/13] macfb: add common monitor modes supported by the MacOS toolbox ROM, Mark Cave-Ayland, 2021/10/07
- [PATCH v4 07/13] macfb: implement mode sense to allow display type to be detected, Mark Cave-Ayland, 2021/10/07
- [PATCH v4 08/13] macfb: add qdev property to specify display type, Mark Cave-Ayland, 2021/10/07
- [PATCH v4 10/13] macfb: fix up 1-bit pixel encoding, Mark Cave-Ayland, 2021/10/07
- [PATCH v4 11/13] macfb: fix 24-bit RGB pixel encoding, Mark Cave-Ayland, 2021/10/07
- [PATCH v4 12/13] macfb: add vertical blank interrupt, Mark Cave-Ayland, 2021/10/07
- [PATCH v4 13/13] q800: wire macfb IRQ to separate video interrupt on VIA2, Mark Cave-Ayland, 2021/10/07