From nobody Mon Feb 9 01:20:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1570815756; cv=none; d=zoho.com; s=zohoarc; b=QnZDAzRG2iRcw+ii7Ms87Dl4o/1l8gzPkJVLL2neRq86iTnSqp3Pu8ZQ1WYQ8iV9aqd5Lfvg81FXIZGOV4qKFiU2slEquSkFD4q3wk3yxRWXT2n2m1r6C4S/tAA81lqQzDsmzdpFasWAuD4V/VRgmUTie19M+PzkXiwcBNg4lzg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570815756; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=klxmWvTAAAwXm8UxMK240H+7eZKbNf1SAMO3sfS0cQ0=; b=el25Gk6i4naZI/anwLzUzPT8O5WDxiY+3RxTj+0IAEUGswTblJC4ksxeqEAMQtnoUVVW08zA8ULbKcxtbGSciI98YEEHg5Tzu3oSHN8qUxCtfnDsy+VMUQSkcjDpmY6kX0xZ5p+nOj8B7o0TtKMfit5587ZP79CnjdRZEKZJT9E= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570815756366687.5423244400888; Fri, 11 Oct 2019 10:42:36 -0700 (PDT) Received: from localhost ([::1]:54832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIyvv-0007la-QN for importer@patchew.org; Fri, 11 Oct 2019 13:42:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36599) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxR1-0006Pb-T1 for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIxR0-0004cy-D1 for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:31 -0400 Received: from relay.sw.ru ([185.231.240.75]:48240) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIxR0-0004Ln-5F for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:30 -0400 Received: from [10.94.3.0] (helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.2) (envelope-from ) id 1iIxQo-0003XG-HU; Fri, 11 Oct 2019 19:06:18 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [RFC v5 066/126] Audio: introduce ERRP_AUTO_PROPAGATE Date: Fri, 11 Oct 2019 19:04:52 +0300 Message-Id: <20191011160552.22907-67-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191011160552.22907-1-vsementsov@virtuozzo.com> References: <20191011160552.22907-1-vsementsov@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , vsementsov@virtuozzo.com, Gerd Hoffmann , armbru@redhat.com, Greg Kurz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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 =3D=3D &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 Reported-by: Greg Kurz Signed-off-by: Vladimir Sementsov-Ogievskiy --- 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( =20 static void audio_validate_opts(Audiodev *dev, Error **errp) { - Error *err =3D NULL; + ERRP_AUTO_PROPAGATE(); =20 audio_create_pdos(dev); =20 - 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; } =20 - 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; } =20 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) =20 static void intel_hda_realize(PCIDevice *pci, Error **errp) { + ERRP_AUTO_PROPAGATE(); IntelHDAState *d =3D INTEL_HDA(pci); uint8_t *conf =3D d->pci.config; - Error *err =3D NULL; int ret; =20 d->name =3D object_get_typename(OBJECT(d)); @@ -1109,20 +1109,19 @@ static void intel_hda_realize(PCIDevice *pci, Error= **errp) =20 if (d->msi !=3D ON_OFF_AUTO_OFF) { ret =3D 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 =3D=3D -ENOTSUP); if (ret && d->msi =3D=3D ON_OFF_AUTO_ON) { /* Can't satisfy user's explicit msi=3Don request, fail */ - error_append_hint(&err, "You have to use msi=3Dauto (default) = or " - "msi=3Doff with this machine type.\n"); - error_propagate(errp, err); + error_append_hint(errp, "You have to use msi=3Dauto (default) = or " + "msi=3Doff with this machine type.\n"); return; } - assert(!err || d->msi =3D=3D ON_OFF_AUTO_AUTO); + assert(!*errp || d->msi =3D=3D ON_OFF_AUTO_AUTO); /* With msi=3Dauto, we fall back to MSI off silently */ - error_free(err); + error_free_errp(errp); } =20 memory_region_init_io(&d->mmio, OBJECT(d), &intel_hda_mmio_ops, d, --=20 2.21.0