SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/arm/armsse: Convert armsse_realize() to use ERRP_GUARD

Browse Source 
Convert armsse_realize() to use ERRP_GUARD(), following
the rules in include/qapi/error.h.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210510190844.17799-5-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2021-05-10 20:08:42 +01:00
parent 4eb1770988
commit 3296210352
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/arm/armsse.c
View File

@ -913,7 +913,6 @@ static void armsse_realize(DeviceState *dev, Error **errp)
const ARMSSEDeviceInfo *devinfo; const ARMSSEDeviceInfo *devinfo;
int i; int i;
MemoryRegion *mr; MemoryRegion *mr;
Error *err = NULL;
SysBusDevice *sbd_apb_ppc0; SysBusDevice *sbd_apb_ppc0;
SysBusDevice *sbd_secctl; SysBusDevice *sbd_secctl;
DeviceState *dev_apb_ppc0; DeviceState *dev_apb_ppc0;
@ -922,6 +921,8 @@ static void armsse_realize(DeviceState *dev, Error **errp)
DeviceState *dev_splitter; DeviceState *dev_splitter;
uint32_t addr_width_max; uint32_t addr_width_max;
ERRP_GUARD();
if (!s->board_memory) { if (!s->board_memory) {
error_setg(errp, "memory property was not set"); error_setg(errp, "memory property was not set");
return; return;
@ -1151,10 +1152,9 @@ static void armsse_realize(DeviceState *dev, Error **errp)
uint32_t sram_bank_size = 1 << s->sram_addr_width; uint32_t sram_bank_size = 1 << s->sram_addr_width;
memory_region_init_ram(&s->sram[i], NULL, ramname, memory_region_init_ram(&s->sram[i], NULL, ramname,
sram_bank_size, &err); sram_bank_size, errp);
g_free(ramname); g_free(ramname);
if (err) { if (*errp) {
error_propagate(errp, err);
return; return;
} }
object_property_set_link(OBJECT(&s->mpc[i]), "downstream", object_property_set_link(OBJECT(&s->mpc[i]), "downstream",