[Qemu-devel] [RFC PATCH v1 13/25] arm: allwinner: Update error API usages

[Peter Crosthwaite]

Collect all errors and remove constant checking for realize failures.
Prefix errors as appropriate and raise all errors at once at the end
of machine init.

Cc: Li Guang <lig.f...@cn.fujitsu.com>
Cc: Peter Maydell <peter.mayd...@linaro.org>
Signed-off-by: Peter Crosthwaite <crosthwaite.pe...@gmail.com>
---

 hw/arm/allwinner-a10.c | 18 ++----------------
 hw/arm/cubieboard.c    | 28 ++++++++++------------------
 2 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c
index ff249af..2da6cf9 100644
--- a/hw/arm/allwinner-a10.c
+++ b/hw/arm/allwinner-a10.c
@@ -50,18 +50,10 @@ static void aw_a10_realize(DeviceState *dev, Error **errp)
     Error *err = NULL;
 
     object_property_set_bool(OBJECT(&s->cpu), true, "realized", &err);
-    if (err != NULL) {
-        error_propagate(errp, err);
-        return;
-    }
     irq = qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_IRQ);
     fiq = qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_FIQ);
 
     object_property_set_bool(OBJECT(&s->intc), true, "realized", &err);
-    if (err != NULL) {
-        error_propagate(errp, err);
-        return;
-    }
     sysbusdev = SYS_BUS_DEVICE(&s->intc);
     sysbus_mmio_map(sysbusdev, 0, AW_A10_PIC_REG_BASE);
     sysbus_connect_irq(sysbusdev, 0, irq);
@@ -71,10 +63,6 @@ static void aw_a10_realize(DeviceState *dev, Error **errp)
     }
 
     object_property_set_bool(OBJECT(&s->timer), true, "realized", &err);
-    if (err != NULL) {
-        error_propagate(errp, err);
-        return;
-    }
     sysbusdev = SYS_BUS_DEVICE(&s->timer);
     sysbus_mmio_map(sysbusdev, 0, AW_A10_PIT_REG_BASE);
     sysbus_connect_irq(sysbusdev, 0, s->irq[22]);
@@ -85,10 +73,6 @@ static void aw_a10_realize(DeviceState *dev, Error **errp)
     sysbus_connect_irq(sysbusdev, 5, s->irq[68]);
 
     object_property_set_bool(OBJECT(&s->emac), true, "realized", &err);
-    if (err != NULL) {
-        error_propagate(errp, err);
-        return;
-    }
     sysbusdev = SYS_BUS_DEVICE(&s->emac);
     sysbus_mmio_map(sysbusdev, 0, AW_A10_EMAC_BASE);
     sysbus_connect_irq(sysbusdev, 0, s->irq[55]);
@@ -96,6 +80,8 @@ static void aw_a10_realize(DeviceState *dev, Error **errp)
     /* FIXME use a qdev chardev prop instead of serial_hds[] */
     serial_mm_init(get_system_memory(), AW_A10_UART0_REG_BASE, 2, s->irq[1],
                    115200, serial_hds[0], DEVICE_NATIVE_ENDIAN);
+
+    error_propagate(errp, err);
 }
 
 static void aw_a10_class_init(ObjectClass *oc, void *data)
diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c
index 1582250..91d9026 100644
--- a/hw/arm/cubieboard.c
+++ b/hw/arm/cubieboard.c
@@ -37,29 +37,21 @@ static void cubieboard_init(MachineState *machine)
 
     s->a10 = AW_A10(object_new(TYPE_AW_A10));
 
-    object_property_set_int(OBJECT(&s->a10->emac), 1, "phy-addr", &err);
-    if (err != NULL) {
-        error_report("Couldn't set phy address: %s", error_get_pretty(err));
-        exit(1);
-    }
+    object_property_set_int(OBJECT(&s->a10->emac), 1, "ph-addr", &err);
+    error_prefix(err, "Couldn't set phy address: ");
 
-    object_property_set_int(OBJECT(&s->a10->timer), 32768, "clk0-freq", &err);
-    if (err != NULL) {
-        error_report("Couldn't set clk0 frequency: %s", error_get_pretty(err));
-        exit(1);
-    }
+    object_property_set_int(OBJECT(&s->a10->timer), 32768, "ck0-freq", &err);
+    error_prefix(err, "Couldn't set clk0 frequency: ");
 
-    object_property_set_int(OBJECT(&s->a10->timer), 24000000, "clk1-freq",
+    object_property_set_int(OBJECT(&s->a10->timer), 24000000, "ck1-freq",
                             &err);
-    if (err != NULL) {
-        error_report("Couldn't set clk1 frequency: %s", error_get_pretty(err));
-        exit(1);
-    }
+    error_prefix(err, "Couldn't set clk1 frequency:");
 
     object_property_set_bool(OBJECT(s->a10), true, "realized", &err);
-    if (err != NULL) {
-        error_report("Couldn't realize Allwinner A10: %s",
-                     error_get_pretty(err));
+    error_prefix(err, "Couldn't realize Allwinner A10: ");
+
+    if (err) {
+        error_report_err(err);
         exit(1);
     }
 
-- 
1.9.1