From nobody Wed Feb 11 02:33: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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516673484256597.7158094994273; Mon, 22 Jan 2018 18:11:24 -0800 (PST) Received: from localhost ([::1]:55110 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edo3X-0006qV-A9 for importer@patchew.org; Mon, 22 Jan 2018 21:11:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48592) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edo0r-0005A1-GG for qemu-devel@nongnu.org; Mon, 22 Jan 2018 21:08:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edo0q-0002zF-FL for qemu-devel@nongnu.org; Mon, 22 Jan 2018 21:08:37 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:34033) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1edo0q-0002yk-9y for qemu-devel@nongnu.org; Mon, 22 Jan 2018 21:08:36 -0500 Received: by mail-qt0-x241.google.com with SMTP id a27so12958276qtd.1 for ; Mon, 22 Jan 2018 18:08:36 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id j19sm6514120qtc.1.2018.01.22.18.08.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jan 2018 18:08:35 -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=77+wsdkrTvN46UxYOvTKgOUImYRkUwELWpv/QxyOD0I=; b=OJjPoAoHd5SCsia1F64lGG0O9X28GLBxKxswRznEnyENliznEnRZx8DBU1PhO8aDGR Ej+hLUXX14UMTK56dJLt28qzfzs7Z1UHsE2MYDQz+Auk0ivaS6K2D8/4Xy0U9kh9FQ3l ccjY/K1djPYm/GpYI3rSG1xthoIB1uTb3TvTnEY5jtk2x+2BvwguJ5h5FLtFrh0pW5M6 zrgcXKccjJ2cpvNg9A14gCWTuB6Q2OUiFZK9TI+mRQefTdBo1KjuHVESeoIZqzvzzDJk n4HkY/Nsbmot7jh5F8bc8GLvpuRyvvHKmBDDG7H1hxdvoj2PK6kUjKQHgOwdfyYBfP7L eXsg== 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=77+wsdkrTvN46UxYOvTKgOUImYRkUwELWpv/QxyOD0I=; b=hh/Li9z6YkA+Cnk7ARBisvA4BdSwD5May/XB9nACza51XDtA/ZXQ6Ic5n3vyONjt1R VP0sMUU40DdecyO8r8RQ4q+AAmHDr1TNzD2UziuTAckWw/YHL1X5L98EwaNFvHjYTUIZ Bk9lOHCrFWrLVCgH+DncLIdIMxtwNLPcxxDYaN03cj1+I96eEKKPnv78HT8n643gnAoX lE7jwMdw3hR6WK3HjvN+Xjsb/yZVhMBeOQzKC6v0Gs/CjN1kv9XS/OBiPnEyXATXv1l1 eZjLg7ZlyE57O/iHxyrM70eBZM62tLrEN2CAwcso2JHov5yLJ4rd0uf/Dw3QM8Ih5b1U ZkmA== X-Gm-Message-State: AKwxytfcqxhQoztuwaFE2lLPS6v0RDClbQRH3a6UJZUWtzip4MbWvgen DqSreEhxZ4xiyOGrWEuYr5g= X-Google-Smtp-Source: AH8x225d536owqy3YAUeKChKmENn7HzU5VDk8tAnjsNif+UFXTVyrx59zgTj22ohdQFedTWvPQyExg== X-Received: by 10.200.20.13 with SMTP id k13mr1440936qtj.137.1516673315902; Mon, 22 Jan 2018 18:08:35 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , Alistair Francis , Peter Maydell , Stefan Hajnoczi Date: Mon, 22 Jan 2018 23:08:05 -0300 Message-Id: <20180123020820.1288-2-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180123020820.1288-1-f4bug@amsat.org> References: <20180123020820.1288-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::241 Subject: [Qemu-devel] [PATCH v9 01/16] 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" , Andrey Smirnov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Kevin O'Connor , Marcel Apfelbaum 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 f9264d3be5..8c9c0fbc2a 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.15.1