If we want append hint to errp, we must use ERRP_FUNCTION_BEGIN macro. Otherwise hint will not be appended in case of errp == &fatal_err (program will exit before error_append_hint() call). Fix such cases.
This commit (together with its neighbors) was generated by git grep -l 'error_append_hint(errp' | while read f; do \ spatch --sp-file scripts/coccinelle/fix-error_append_hint-usage.cocci \ --in-place $f; done and then ./python/commit-per-subsystem.py MAINTAINERS "$(< auto-msg)" (auto-msg was a file with this commit message) Still, for backporting it may be more comfortable to use only the first command and then do one huge commit. Reported-by: Greg Kurz <gr...@kaod.org> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com> --- hw/arm/msf2-soc.c | 1 + hw/arm/virt.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/hw/arm/msf2-soc.c b/hw/arm/msf2-soc.c index 008fd9327a..21e4bdfb72 100644 --- a/hw/arm/msf2-soc.c +++ b/hw/arm/msf2-soc.c @@ -85,6 +85,7 @@ static void m2sxxx_soc_initfn(Object *obj) static void m2sxxx_soc_realize(DeviceState *dev_soc, Error **errp) { + ERRP_FUNCTION_BEGIN(); MSF2State *s = MSF2_SOC(dev_soc); DeviceState *dev, *armv7m; SysBusDevice *busdev; diff --git a/hw/arm/virt.c b/hw/arm/virt.c index d74538b021..e79a46b0b3 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1793,6 +1793,7 @@ static char *virt_get_gic_version(Object *obj, Error **errp) static void virt_set_gic_version(Object *obj, const char *value, Error **errp) { + ERRP_FUNCTION_BEGIN(); VirtMachineState *vms = VIRT_MACHINE(obj); if (!strcmp(value, "3")) { @@ -1825,6 +1826,7 @@ static char *virt_get_iommu(Object *obj, Error **errp) static void virt_set_iommu(Object *obj, const char *value, Error **errp) { + ERRP_FUNCTION_BEGIN(); VirtMachineState *vms = VIRT_MACHINE(obj); if (!strcmp(value, "smmuv3")) { -- 2.21.0