From nobody Mon Feb 9 17:58:54 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1518523864663941.2288953121713; Tue, 13 Feb 2018 04:11:04 -0800 (PST) Received: from localhost ([::1]:50512 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elZQN-00032S-OU for importer@patchew.org; Tue, 13 Feb 2018 07:11:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41748) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elZHT-0004AT-Ix for qemu-devel@nongnu.org; Tue, 13 Feb 2018 07:01:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1elZHR-0007cb-BD for qemu-devel@nongnu.org; Tue, 13 Feb 2018 07:01:51 -0500 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:54771) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1elZHR-0007cG-5C for qemu-devel@nongnu.org; Tue, 13 Feb 2018 07:01:49 -0500 Received: by mail-wm0-x242.google.com with SMTP id i186so15518777wmi.4 for ; Tue, 13 Feb 2018 04:01:48 -0800 (PST) Received: from 640k.lan ([82.84.102.245]) by smtp.gmail.com with ESMTPSA id f9sm6870298wmf.12.2018.02.13.04.01.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Feb 2018 04:01:47 -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=oBdzNpD9qT986c15sTiIWUDrd8jDXP50h5AYrluTibA=; b=W9KGR5sBbTpzyfLIZTmlgpvhnSUGqvidFABNPB5C51eGrCCgWg4aIaZ5pkU10U8hId i+xllT4VdJvTldjHP83SJXvNrW1eZ3p1a9qVbCSTJOD5QuxWxZclSWMiY8v0lzXhdbVa 5MOYURh5nMk8aquBGbb6BdCfYCa8c+PpC912pwMGMnwUuGyZdKLZHDqg152Q9LREYBVm RwuMBKHndfOot+a05rafQdSID/dRfqd/aPPPwmiq1VIh31F+dpakJjhQq1k5kc6tKx4g DCm3TfT64DCPBsQPXWSrbnS87HBk45EBnp82IC2lhtTrcFTrIRwllptpgYvpuajh07fQ 9YeA== 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=oBdzNpD9qT986c15sTiIWUDrd8jDXP50h5AYrluTibA=; b=IrDTaoYvwVWLldjlFA3aB7PpiwS0nfAUBRFh6yTKutmdkkN8kQokU75ddyUJHbqTLy AbNR1zi8fFsxpZSB+xC2cP8AAbxmX5OABb1115h8b4H3tt4PkmYO98K0zHRw8JTRmTFK 4MqzE0hB6KUfOpnxt0HKUA+AgjtZ1YmcH/NfR/OXFW7yPWhVbtgPb7kVw4yxtG5ENYky mchE0oP04R0hOEt44Wzr77jzyhhnGdHb2v2b7ghwPJFDiVXZdp/Zdurlo2EWNU9QFm1R BZyHOMyjlhJoWEX8bPea9Z4SXa9oPYpfx2dm4l+zZCq1alPiZUfMQpQFSd1P/Onw3klI x4EA== X-Gm-Message-State: APf1xPBuB8yhKOH4x3Xjdx0vzgOJWO93XEodXbVlMzAiBT3qaNSamAwC WFNa5FION3TJj6J6kjuktYfPKFGE X-Google-Smtp-Source: AH8x226fDOSCW905qYkxITkW3/rP7JybecoPTLJi3eJpr4DpmlNCp+Psj1EXg9FPjsZ2CmgxyAGpQw== X-Received: by 10.28.139.66 with SMTP id n63mr1108196wmd.101.1518523307784; Tue, 13 Feb 2018 04:01:47 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 13 Feb 2018 13:00:18 +0100 Message-Id: <1518523252-49106-15-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1518523252-49106-1-git-send-email-pbonzini@redhat.com> References: <1518523252-49106-1-git-send-email-pbonzini@redhat.com> 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: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PULL 14/48] 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 From: Philippe Mathieu-Daud=C3=A9 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 Message-Id: <20180208164818.7961-2-f4bug@amsat.org> --- 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 ee95e78..3602286 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1302,10 +1302,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 @@ -1383,9 +1385,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 1.8.3.1