[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/7] arm: Improve error propagation in nRF51 SOC
From: |
Steffen Görtz |
Subject: |
[Qemu-devel] [PATCH 5/7] arm: Improve error propagation in nRF51 SOC |
Date: |
Sat, 11 Aug 2018 11:08:34 +0200 |
This patch takes care that errors that occur during
instantiation of the cortex-m0 cpu are properly propagated.
Signed-off-by: Steffen Görtz <address@hidden>
---
hw/arm/nrf51_soc.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/hw/arm/nrf51_soc.c b/hw/arm/nrf51_soc.c
index 2265d30352..88a848de8b 100644
--- a/hw/arm/nrf51_soc.c
+++ b/hw/arm/nrf51_soc.c
@@ -66,8 +66,17 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error
**errp)
}
object_property_set_link(OBJECT(&s->cpu), OBJECT(&s->container), "memory",
- &err);
- object_property_set_bool(OBJECT(&s->cpu), true, "realized", &err);
+ &err);
+ if (err) {
+ error_propagate(errp, err);
+ return;
+ }
+ object_property_set_bool(OBJECT(&s->cpu), true, "realized",
+ &err);
+ if (err) {
+ error_propagate(errp, err);
+ return;
+ }
memory_region_add_subregion_overlap(&s->container, 0, s->board_memory, -1);
--
2.18.0