diff mbox series

[4/6] hw/arm/armsse: Convert armsse_realize() to use ERRP_GUARD

Message ID 20210510190844.17799-5-peter.maydell@linaro.org
State Superseded
Headers show
Series hw/arm: Fix modelling of SSE-300 TCMs and SRAM | expand

Commit Message

Peter Maydell May 10, 2021, 7:08 p.m. UTC 
Convert armsse_realize() to use ERRP_GUARD(), following
the rules in include/qapi/error.h.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

---
We'll be adding a new error check in the next patch, so
do this first to avoid adding more uses of legacy
error_propagate().
---
 hw/arm/armsse.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

-- 
2.20.1

Comments

Richard Henderson May 24, 2021, 1:55 p.m. UTC | #1 
On 5/10/21 12:08 PM, Peter Maydell wrote:
> Convert armsse_realize() to use ERRP_GUARD(), following

> the rules in include/qapi/error.h.

> 

> Signed-off-by: Peter Maydell<peter.maydell@linaro.org>

> ---

> We'll be adding a new error check in the next patch, so

> do this first to avoid adding more uses of legacy

> error_propagate().

> ---

>   hw/arm/armsse.c | 8 ++++----

>   1 file changed, 4 insertions(+), 4 deletions(-)


Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


r~
diff mbox series

Patch

diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c
index 1729f09c7cb..be5aa1f113a 100644
--- a/hw/arm/armsse.c
+++ b/hw/arm/armsse.c
@@ -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;
@@ -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;
@@ -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",