summaryrefslogtreecommitdiffstats
path: root/hw/arm/stm32f205_soc.c
diff options
context:
space:
mode:
authorMarkus Armbruster2020-06-30 11:03:47 +0200
committerMarkus Armbruster2020-07-02 11:54:47 +0200
commitb40181942e037f74cd12ae7afa140d6508a30639 (patch)
tree697bba3342923614bd5daed34480386a826e487e /hw/arm/stm32f205_soc.c
parentamd_iommu: Fix amdvi_realize() error API violation (diff)
downloadqemu-b40181942e037f74cd12ae7afa140d6508a30639.tar.gz
qemu-b40181942e037f74cd12ae7afa140d6508a30639.tar.xz
qemu-b40181942e037f74cd12ae7afa140d6508a30639.zip
arm/stm32f205 arm/stm32f405: Fix realize error API violation
The Error ** argument must be NULL, &error_abort, &error_fatal, or a pointer to a variable containing NULL. Passing an argument of the latter kind twice without clearing it in between is wrong: if the first call sets an error, it no longer points to NULL for the second call. stm32f205_soc_realize() and stm32f405_soc_realize() are wrong that way: they pass &err to object_property_set_int() without checking it, and then to qdev_realize(). Harmless, because the former can't actually fail here. Fix by passing &error_abort instead. Cc: Alistair Francis <alistair@alistair23.me> Cc: Peter Maydell <peter.maydell@linaro.org> Cc: qemu-arm@nongnu.org Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Message-Id: <20200630090351.1247703-23-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Diffstat (limited to 'hw/arm/stm32f205_soc.c')
-rw-r--r--hw/arm/stm32f205_soc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c
index 19487544f0..56aef686c9 100644
--- a/hw/arm/stm32f205_soc.c
+++ b/hw/arm/stm32f205_soc.c
@@ -154,7 +154,7 @@ static void stm32f205_soc_realize(DeviceState *dev_soc, Error **errp)
/* ADC 1 to 3 */
object_property_set_int(OBJECT(s->adc_irqs), STM_NUM_ADCS,
- "num-lines", &err);
+ "num-lines", &error_abort);
qdev_realize(DEVICE(s->adc_irqs), NULL, &err);
if (err != NULL) {
error_propagate(errp, err);