Skip to content

Commit

Permalink
hw/arm/armsse: Convert armsse_realize() to use ERRP_GUARD
Browse files Browse the repository at this point in the history
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
  • Loading branch information
pm215 committed May 25, 2021
1 parent 4eb1770 commit 3296210
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions hw/arm/armsse.c
Expand Up @@ -913,7 +913,6 @@ static void armsse_realize(DeviceState *dev, Error **errp)
const ARMSSEDeviceInfo *devinfo;
int i;
MemoryRegion *mr;
Error *err = NULL;
SysBusDevice *sbd_apb_ppc0;
SysBusDevice *sbd_secctl;
DeviceState *dev_apb_ppc0;
Expand All @@ -922,6 +921,8 @@ static void armsse_realize(DeviceState *dev, Error **errp)
DeviceState *dev_splitter;
uint32_t addr_width_max;

ERRP_GUARD();

if (!s->board_memory) {
error_setg(errp, "memory property was not set");
return;
Expand Down Expand Up @@ -1151,10 +1152,9 @@ static void armsse_realize(DeviceState *dev, Error **errp)
uint32_t sram_bank_size = 1 << s->sram_addr_width;

memory_region_init_ram(&s->sram[i], NULL, ramname,
sram_bank_size, &err);
sram_bank_size, errp);
g_free(ramname);
if (err) {
error_propagate(errp, err);
if (*errp) {
return;
}
object_property_set_link(OBJECT(&s->mpc[i]), "downstream",
Expand Down

0 comments on commit 3296210

Please sign in to comment.