From nobody Sun Feb 8 22:07:09 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=1570816404; cv=none; d=zoho.com; s=zohoarc; b=ZvDFHXeybS1AlKRl+8OOn0vLPVkN0nM5kbudEF5KtiV4q88+vP5iYYhptDE0GxRI8n0aFGJ5TvlMUUUsj9URmxFX1XcSq0HJGZxPYJx3oR1BFqVkMI7oWVuvodikP6w0LiykFQz+pqZSPwrOp3seAvDNin5zEIohflXcIdpuHYQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570816404; 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=qxKoXMl+2uUt8PL8gFFNgglgHkG9MCdOnfxqlgnA85c=; b=RvrVd/nNve2rYdsrgF0aPwlYZ+Ixj86DO6R/Q1WmoTA8sr8CmGNz9dpLhnNowXqpa2teilVjof7ElDrg/aa8vQ2ZmDj+3Tv6w7PwSwJ49mq4YUziNQi4qJmtN7y5+LitkqPXjwZdpBF19dwWNwsv/98Hi9h5rnol2Kw+Mqbgrhg= 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 1570816404208358.6610143661967; Fri, 11 Oct 2019 10:53:24 -0700 (PDT) Received: from localhost ([::1]:54966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIz6Q-00032r-H5 for importer@patchew.org; Fri, 11 Oct 2019 13:53:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36922) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxRA-0006fT-Pa for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIxR7-0004nB-RN for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:40 -0400 Received: from relay.sw.ru ([185.231.240.75]:48174) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIxR7-0004Ii-Jm; Fri, 11 Oct 2019 12:06:37 -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 1iIxQm-0003XG-4Q; Fri, 11 Oct 2019 19:06:16 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [RFC v5 060/126] megasas: introduce ERRP_AUTO_PROPAGATE Date: Fri, 11 Oct 2019 19:04:46 +0300 Message-Id: <20191011160552.22907-61-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 , Fam Zheng , Hannes Reinecke , vsementsov@virtuozzo.com, qemu-block@nongnu.org, armbru@redhat.com, Greg Kurz , Paolo Bonzini 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 --- hw/scsi/megasas.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index de9bd20887..007cfcff88 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -2311,11 +2311,11 @@ static const struct SCSIBusInfo megasas_scsi_info = =3D { =20 static void megasas_scsi_realize(PCIDevice *dev, Error **errp) { + ERRP_AUTO_PROPAGATE(); MegasasState *s =3D MEGASAS(dev); MegasasBaseClass *b =3D MEGASAS_DEVICE_GET_CLASS(s); uint8_t *pci_conf; int i, bar_type; - Error *err =3D NULL; int ret; =20 pci_conf =3D dev->config; @@ -2326,20 +2326,19 @@ static void megasas_scsi_realize(PCIDevice *dev, Er= ror **errp) pci_conf[PCI_INTERRUPT_PIN] =3D 0x01; =20 if (s->msi !=3D ON_OFF_AUTO_OFF) { - ret =3D msi_init(dev, 0x50, 1, true, false, &err); + ret =3D msi_init(dev, 0x50, 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 && s->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; } else if (ret) { /* With msi=3Dauto, we fall back to MSI off silently */ s->msi =3D ON_OFF_AUTO_OFF; - error_free(err); + error_free_errp(errp); } } =20 --=20 2.21.0