From patchwork Fri Feb 9 14:54:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 871416 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="R3333Z5i"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zdJ9Q4Qwdz9s1h for ; Sat, 10 Feb 2018 01:58:50 +1100 (AEDT) Received: from localhost ([::1]:60214 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ekA8W-0004NH-KQ for incoming@patchwork.ozlabs.org; Fri, 09 Feb 2018 09:58:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33575) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ekA4b-0001YO-7b for qemu-devel@nongnu.org; Fri, 09 Feb 2018 09:54:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ekA4Y-0004w0-EK for qemu-devel@nongnu.org; Fri, 09 Feb 2018 09:54:45 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:37028) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ekA4Y-0004vf-9o for qemu-devel@nongnu.org; Fri, 09 Feb 2018 09:54:42 -0500 Received: by mail-qt0-x242.google.com with SMTP id s27so10833132qts.4 for ; Fri, 09 Feb 2018 06:54:42 -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=cxvoLeLgOTAA8Ua2y+GoG/6l7qwUH6JgyGpjAlhAYM4=; b=R3333Z5is4GCGTwXOjs0rtMbC+L1rY6ZyXXefEkZK2/pMk2DHOM3BNaHSI2xN/KpvF RB8lYuBG/ZO6cxWZLSHwIob3s1+qnDw+Ag3gR3oZ9e+YGt4+bcAgutcOuhC+i6FJiDmN TmZ8Sxt3NEJiJ+tPOFNpSOTCbelGDF8sd6XyD+xDVDtLNGIXwHGA8LzpVCcfhwyj+Quf 4Au77SkYmE7oqZMyXpaMrQrXjo1jS5Diaa/ICH1V7q7oYg1FUJk1gik8q8TrDmiwv/EA 4rEL8BmT1qpiEhlLOfN8dn1NuymKaNW9g8MCfsG4lOlu5yyEsnrY7/f0cVOv2qNxcc1u KiEw== 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=cxvoLeLgOTAA8Ua2y+GoG/6l7qwUH6JgyGpjAlhAYM4=; b=iodc5iNCGUM2YELRzT/hoaggCNb2GH9D4qFvX1PI8xZMI32Yb48W1LCGWgiTQ2Z7OC LRaslJ58/Bkl511vnrEFW/4jmS0sIdDOR+6Lz2xvTBPdNWOMzUI0wzTNshipORR+p0Fw E3/h8KzWZNUzeatj5fUS2gcdcKOik/zINSjyuqBwYHJ98KSbCieBuBitdxzljTSdUi6R w6vzWcwh0vQYtKhhaWsKyBQ5THHB32EjGmVCmnR5luCnxFLryHIXK0v25X9uyYpxaq2i RzxPSpAv1P/fI/DzNKAYC4rs+iJv2A9wLDZuWW5ZMaxZSW6OF+vpt5CP+7IBXkBpnUU6 P4SA== X-Gm-Message-State: APf1xPCUih6i5ROiWMjR+TnB+1Zdltzi4DZ7COpKcqp6le1feKbUZ59f m7+Kez720FPQmG+bpWf0lcw= X-Google-Smtp-Source: AH8x226tFyA+VGdZ5w7/eZNGLRX3Lyrg6xV/uOZUt0IV1oQ/fQ5PWMGeyzJORMvIGl2PA7toLPmoIg== X-Received: by 10.237.48.2 with SMTP id 2mr4681591qte.232.1518188081725; Fri, 09 Feb 2018 06:54:41 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id b29sm747841qkb.28.2018.02.09.06.54.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Feb 2018 06:54:41 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Paolo Bonzini Date: Fri, 9 Feb 2018 11:54:01 -0300 Message-Id: <20180209145430.26007-2-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180209145430.26007-1-f4bug@amsat.org> References: <20180209145430.26007-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::242 Subject: [Qemu-devel] [PATCH v12 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" , Peter Maydell , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" avoid the "errp && *errp" pattern (not recommended in "qapi/error.h" comments). Signed-off-by: Philippe Mathieu-Daudé 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 b395ac577d..f20a58068b 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1303,10 +1303,12 @@ static Property sdhci_pci_properties[] = { static void sdhci_pci_realize(PCIDevice *dev, Error **errp) { SDHCIState *s = PCI_SDHCI(dev); + Error *local_err = NULL; sdhci_initfn(s); sdhci_common_realize(s, errp); - if (errp && *errp) { + if (local_err) { + error_propagate(errp, local_err); return; } @@ -1384,9 +1386,11 @@ static void sdhci_sysbus_realize(DeviceState *dev, Error ** errp) { SDHCIState *s = SYSBUS_SDHCI(dev); SysBusDevice *sbd = SYS_BUS_DEVICE(dev); + Error *local_err = NULL; sdhci_common_realize(s, errp); - if (errp && *errp) { + if (local_err) { + error_propagate(errp, local_err); return; }