From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3725AC47404 for ; Fri, 11 Oct 2019 17:42:28 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0922020640 for ; Fri, 11 Oct 2019 17:42:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0922020640 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIyvp-0007la-SL for qemu-devel@archiver.kernel.org; Fri, 11 Oct 2019 13:42:25 -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: 8bit 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 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( 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