From nobody Tue Feb 10 11:23:31 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 151810865921523.18686452869565; Thu, 8 Feb 2018 08:50:59 -0800 (PST) Received: from localhost ([::1]:52818 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejpPP-0000ic-6N for importer@patchew.org; Thu, 08 Feb 2018 11:50:51 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41760) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejpNG-0007ZX-4B for qemu-devel@nongnu.org; Thu, 08 Feb 2018 11:48:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ejpNF-0003Od-CY for qemu-devel@nongnu.org; Thu, 08 Feb 2018 11:48:38 -0500 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:46630) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ejpNF-0003Nk-7t for qemu-devel@nongnu.org; Thu, 08 Feb 2018 11:48:37 -0500 Received: by mail-qt0-x244.google.com with SMTP id u6so6553973qtg.13 for ; Thu, 08 Feb 2018 08:48:37 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id z66sm240905qkc.9.2018.02.08.08.48.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Feb 2018 08:48:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pxzWQFhwWBCzjvVrhx+sd+KGw0B9UoGBPtq/CdVw0Mk=; b=eaXSwYKMU4VUJgl+pZAKcbENwV8bqhqs1hb1PxxifOusuaYaeNBRSXsgwMDEj0Hu91 S/BoTfQk4neHFiZ+JHaC/gb8EQkTdGq74sxJCEeeuRPkkKP9UPPixqOFYO61Z4L2yDqs gSdHJ/0YjMxFOqijOK2GDYa0fMkCaFZ+dkVKUMolZCakmIUme3M0GnYB/GPF+Hp4Y+EC 9WpdqUP/OLYo4QxUQ9htLqsCWw7XxQimk1ypu3CQrawA2FRkZI+wstwIEUHwerhxz1Or a1y6OJenUQH51hpisCfeIM/ezxqE5TD/ibnH9TgyMvoPXKDe78s56nUJk3HTntXXEgSI F8ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=pxzWQFhwWBCzjvVrhx+sd+KGw0B9UoGBPtq/CdVw0Mk=; b=TQHxxaseAWE3fJnWSXseRUv+vFdWBN4aMyJt/+iGYdpk+8hC2TpHhXToFtDDH6avj4 34p4dM2EGvGT3ar//58IAL9vgUAWmyOWxWAtP7Wsvq+SVb1aHAeHPbcyDmUnGEf1280o 5ogwm2fJEiebvNw2iuFdmAudhEAZS1+jupg9Heej/YnbrQeuvjfX0Ao+Zo4gxzKQifi1 VkWFNeDHm1Hqsj+tTj7WNr18FW98AenFFItwhS2sxCMZZH21N/KnBIOG4eO5y3w7O86R dWAdr0YDFuYqvINZr1dvXH6U0uLtnTWdqx9AZ4styjuq9OpJunY/iLl3UsSO0ymPCbqs gETw== X-Gm-Message-State: APf1xPCCZfcGoPUiynkRSY4+htnZOgfeaus3Qk4l0TSzMUAl3GjAp598 WwPcxfxtbkq+4CunIdUmP90= X-Google-Smtp-Source: AH8x2269ttmV3/7LPYMUi0IL1k2CPo6GzSpTJgtfdyZI0Fe2dG9xuuXO7cS76yq6w1UAkOrCHREJwg== X-Received: by 10.237.57.38 with SMTP id l35mr1929245qte.320.1518108516675; Thu, 08 Feb 2018 08:48:36 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , Peter Maydell Date: Thu, 8 Feb 2018 13:47:49 -0300 Message-Id: <20180208164818.7961-2-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180208164818.7961-1-f4bug@amsat.org> References: <20180208164818.7961-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PATCH v11 01/30] sdhci: use error_propagate(local_err) in realize() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 avoid the "errp && *errp" pattern (not recommended in "qapi/error.h" commen= ts). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/sd/sdhci.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index fac7fa5c72..817c2525e6 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1300,10 +1300,12 @@ static Property sdhci_pci_properties[] =3D { static void sdhci_pci_realize(PCIDevice *dev, Error **errp) { SDHCIState *s =3D PCI_SDHCI(dev); + Error *local_err =3D NULL; =20 sdhci_initfn(s); sdhci_common_realize(s, errp); - if (errp && *errp) { + if (local_err) { + error_propagate(errp, local_err); return; } =20 @@ -1381,9 +1383,11 @@ static void sdhci_sysbus_realize(DeviceState *dev, E= rror ** errp) { SDHCIState *s =3D SYSBUS_SDHCI(dev); SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); + Error *local_err =3D NULL; =20 sdhci_common_realize(s, errp); - if (errp && *errp) { + if (local_err) { + error_propagate(errp, local_err); return; } =20 --=20 2.16.1