If we want to add some info to errp (by error_prepend() or error_append_hint()), we must use the ERRP_AUTO_PROPAGATE macro. Otherwise, this info will not be added when errp == &fatal_err (the program will exit prior to the error_append_hint() or error_prepend() call). Fix such cases.
If we want to check error after errp-function call, we need to introduce local_err and than propagate it to errp. Instead, use ERRP_AUTO_PROPAGATE macro, benefits are: 1. No need of explicit error_propagate call 2. No need of explicit local_err variable: use errp directly 3. ERRP_AUTO_PROPAGATE leaves errp as is if it's not NULL or &error_fatel, this means that we don't break error_abort (we'll abort on error_set, not on error_propagate) This commit (together with its neighbors) was generated by for f in $(git grep -l errp \*.[ch]); do \ spatch --sp-file scripts/coccinelle/auto-propagated-errp.cocci \ --macro-file scripts/cocci-macro-file.h --in-place --no-show-diff $f; \ done; then fix a bit of compilation problems: coccinelle for some reason leaves several f() { ... goto out; ... out: } patterns, with "out:" at function end. 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: Kevin Wolf <kw...@redhat.com> Reported-by: Greg Kurz <gr...@kaod.org> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com> --- audio/audio.c | 12 +++++------- hw/audio/intel-hda.c | 13 ++++++------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/audio/audio.c b/audio/audio.c index 7128ee98dc..774f47d418 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1936,19 +1936,17 @@ static void audio_validate_per_direction_opts( static void audio_validate_opts(Audiodev *dev, Error **errp) { - Error *err = NULL; + ERRP_AUTO_PROPAGATE(); audio_create_pdos(dev); - audio_validate_per_direction_opts(audio_get_pdo_in(dev), &err); - if (err) { - error_propagate(errp, err); + audio_validate_per_direction_opts(audio_get_pdo_in(dev), errp); + if (*errp) { return; } - audio_validate_per_direction_opts(audio_get_pdo_out(dev), &err); - if (err) { - error_propagate(errp, err); + audio_validate_per_direction_opts(audio_get_pdo_out(dev), errp); + if (*errp) { return; } diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c index 6ecd383540..d0b178a1e1 100644 --- a/hw/audio/intel-hda.c +++ b/hw/audio/intel-hda.c @@ -1095,9 +1095,9 @@ static void intel_hda_reset(DeviceState *dev) static void intel_hda_realize(PCIDevice *pci, Error **errp) { + ERRP_AUTO_PROPAGATE(); IntelHDAState *d = INTEL_HDA(pci); uint8_t *conf = d->pci.config; - Error *err = NULL; int ret; d->name = object_get_typename(OBJECT(d)); @@ -1109,20 +1109,19 @@ static void intel_hda_realize(PCIDevice *pci, Error **errp) if (d->msi != ON_OFF_AUTO_OFF) { ret = msi_init(&d->pci, d->old_msi_addr ? 0x50 : 0x60, - 1, true, false, &err); + 1, true, false, errp); /* Any error other than -ENOTSUP(board's MSI support is broken) * is a programming error */ assert(!ret || ret == -ENOTSUP); if (ret && d->msi == ON_OFF_AUTO_ON) { /* Can't satisfy user's explicit msi=on request, fail */ - error_append_hint(&err, "You have to use msi=auto (default) or " - "msi=off with this machine type.\n"); - error_propagate(errp, err); + error_append_hint(errp, "You have to use msi=auto (default) or " + "msi=off with this machine type.\n"); return; } - assert(!err || d->msi == ON_OFF_AUTO_AUTO); + assert(!*errp || d->msi == ON_OFF_AUTO_AUTO); /* With msi=auto, we fall back to MSI off silently */ - error_free(err); + error_free_errp(errp); } memory_region_init_io(&d->mmio, OBJECT(d), &intel_hda_mmio_ops, d, -- 2.21.0