[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/13] macfb: update macfb.c to use the Error API best practices
From: |
Laurent Vivier |
Subject: |
[PULL 02/13] macfb: update macfb.c to use the Error API best practices |
Date: |
Fri, 8 Oct 2021 13:45:07 +0200 |
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
As per the current Error API best practices, change macfb_commom_realize() to
return
a boolean indicating success to reduce errp boiler-plate handling code. Note
that
memory_region_init_ram_nomigrate() is also updated to use &error_abort to
indicate
a non-recoverable error, matching the behaviour recommended after similar
discussions on memory API failures for the recent nubus changes.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20211007221253.29024-3-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/display/macfb.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/hw/display/macfb.c b/hw/display/macfb.c
index 2b747a8de8a1..2ec25c5d6f7a 100644
--- a/hw/display/macfb.c
+++ b/hw/display/macfb.c
@@ -343,14 +343,14 @@ static const GraphicHwOps macfb_ops = {
.gfx_update = macfb_update_display,
};
-static void macfb_common_realize(DeviceState *dev, MacfbState *s, Error **errp)
+static bool macfb_common_realize(DeviceState *dev, MacfbState *s, Error **errp)
{
DisplaySurface *surface;
if (s->depth != 1 && s->depth != 2 && s->depth != 4 && s->depth != 8 &&
s->depth != 16 && s->depth != 24) {
error_setg(errp, "unknown guest depth %d", s->depth);
- return;
+ return false;
}
s->con = graphic_console_init(dev, 0, &macfb_ops, s);
@@ -359,18 +359,20 @@ static void macfb_common_realize(DeviceState *dev,
MacfbState *s, Error **errp)
if (surface_bits_per_pixel(surface) != 32) {
error_setg(errp, "unknown host depth %d",
surface_bits_per_pixel(surface));
- return;
+ return false;
}
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",
- MACFB_VRAM_SIZE, errp);
+ MACFB_VRAM_SIZE, &error_abort);
s->vram = memory_region_get_ram_ptr(&s->mem_vram);
s->vram_bit_mask = MACFB_VRAM_SIZE - 1;
vmstate_register_ram(&s->mem_vram, dev);
memory_region_set_coalescing(&s->mem_vram);
+
+ return true;
}
static void macfb_sysbus_realize(DeviceState *dev, Error **errp)
@@ -378,8 +380,7 @@ static void macfb_sysbus_realize(DeviceState *dev, Error
**errp)
MacfbSysBusState *s = MACFB(dev);
MacfbState *ms = &s->macfb;
- macfb_common_realize(dev, ms, errp);
- if (*errp) {
+ if (!macfb_common_realize(dev, ms, errp)) {
return;
}
@@ -399,8 +400,7 @@ static void macfb_nubus_realize(DeviceState *dev, Error
**errp)
return;
}
- macfb_common_realize(dev, ms, errp);
- if (*errp) {
+ if (!macfb_common_realize(dev, ms, errp)) {
return;
}
--
2.31.1
- [PULL 00/13] M68k next patches, Laurent Vivier, 2021/10/08
- [PULL 01/13] macfb: handle errors that occur during realize, Laurent Vivier, 2021/10/08
- [PULL 04/13] macfb: fix overflow of color_palette array, Laurent Vivier, 2021/10/08
- [PULL 02/13] macfb: update macfb.c to use the Error API best practices,
Laurent Vivier <=
- [PULL 09/13] macfb: add common monitor modes supported by the MacOS toolbox ROM, Laurent Vivier, 2021/10/08
- [PULL 10/13] macfb: fix up 1-bit pixel encoding, Laurent Vivier, 2021/10/08
- [PULL 12/13] macfb: add vertical blank interrupt, Laurent Vivier, 2021/10/08
- [PULL 06/13] macfb: add trace events for reading and writing the control registers, Laurent Vivier, 2021/10/08
- [PULL 11/13] macfb: fix 24-bit RGB pixel encoding, Laurent Vivier, 2021/10/08
- [PULL 13/13] q800: wire macfb IRQ to separate video interrupt on VIA2, Laurent Vivier, 2021/10/08
- [PULL 05/13] macfb: use memory_region_init_ram() in macfb_common_realize() for the framebuffer, Laurent Vivier, 2021/10/08
- [PULL 08/13] macfb: add qdev property to specify display type, Laurent Vivier, 2021/10/08
- [PULL 03/13] macfb: fix invalid object reference in macfb_common_realize(), Laurent Vivier, 2021/10/08
- [PULL 07/13] macfb: implement mode sense to allow display type to be detected, Laurent Vivier, 2021/10/08