[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/6] hw/arm/sysbus-fdt: Fix assertion in copy_propert
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 2/6] hw/arm/sysbus-fdt: Fix assertion in copy_properties_from_host() |
Date: |
Mon, 30 Jul 2018 15:17:44 +0100 |
From: Geert Uytterhoeven <address@hidden>
When copy_properties_from_host() ignores the error for an optional
property, it frees the error, but fails to reset it.
Hence if two or more optional properties are missing, an assertion is
triggered:
util/error.c:57: error_setv: Assertion `*errp == NULL' failed.
Fis this by resetting err to NULL after ignoring the error.
Fixes: 9481cf2e5f2f2bb6 ("hw/arm/sysbus-fdt: helpers for clock node generation")
Signed-off-by: Geert Uytterhoeven <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
hw/arm/sysbus-fdt.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/arm/sysbus-fdt.c b/hw/arm/sysbus-fdt.c
index 0d4c75702c3..43d6a7bb48d 100644
--- a/hw/arm/sysbus-fdt.c
+++ b/hw/arm/sysbus-fdt.c
@@ -107,6 +107,7 @@ static void copy_properties_from_host(HostProperty *props,
int nb_props,
/* mandatory property not found: bail out */
exit(1);
}
+ err = NULL;
}
}
}
--
2.17.1
- [Qemu-devel] [PULL 0/6] target-arm queue, Peter Maydell, 2018/07/30
- [Qemu-devel] [PULL 5/6] hw/misc/tz-mpc: Zero the LUT on initialization, not just reset, Peter Maydell, 2018/07/30
- [Qemu-devel] [PULL 3/6] armv7m_nvic: Fix m-security subsection name, Peter Maydell, 2018/07/30
- [Qemu-devel] [PULL 6/6] target/arm: Remove duplicate 'host' entry in '-cpu ?' output, Peter Maydell, 2018/07/30
- [Qemu-devel] [PULL 4/6] hw/arm/iotkit: Fix IRQ number for timer1, Peter Maydell, 2018/07/30
- [Qemu-devel] [PULL 1/6] arm/smmuv3: Fix missing VMSD terminator, Peter Maydell, 2018/07/30
- [Qemu-devel] [PULL 2/6] hw/arm/sysbus-fdt: Fix assertion in copy_properties_from_host(),
Peter Maydell <=
- Re: [Qemu-devel] [PULL 0/6] target-arm queue, Peter Maydell, 2018/07/30