From nobody Tue Feb 10 05:45:44 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1586196708; cv=none; d=zohomail.com; s=zohoarc; b=UEIxi3dUkAtaq3mSMPP0Ckju/iEogGBqdO2K4la2rh0f40XVCwWhJYO9Xs3tGiPZhLR7x4TmN8FlASg2OzBXUXR2uvdUWHPUasNwkDOujtGMoLE4MRBHdjU+afq/qB+4cgnrZxthCCW+ckf28Mva2/rrqPgajdbm6tX25TDgASA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586196708; h=Content-Type: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=LZt0wKgOcXbd9J2Y1x7+Xq5w37mnJzb6ovGxsczGG64=; b=j2Y/6W3cZXXXcPIAYCzv+ypM9Ai14xBMY+hIwdahivA0zzjNvrhcMRWPfp7Vp5QUs0hrLrcsBhrs+hCDJdFxrJOjliagwH75Id/kvUDbFpp8z8uvFOa4/+s/n4y2Lq2Yamnpfsr4XET8RMQ9KyHxoy+ucHGgDjaTqUTJ3CiIZKc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 158619670869075.77586611187814; Mon, 6 Apr 2020 11:11:48 -0700 (PDT) Received: from localhost ([::1]:36322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLWDr-0002DS-By for importer@patchew.org; Mon, 06 Apr 2020 14:11:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36367) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLVrF-0002HM-4g for qemu-devel@nongnu.org; Mon, 06 Apr 2020 13:48:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jLVrD-0003FG-PW for qemu-devel@nongnu.org; Mon, 06 Apr 2020 13:48:25 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:37124) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jLVrD-000384-Ij; Mon, 06 Apr 2020 13:48:23 -0400 Received: by mail-wm1-x329.google.com with SMTP id j19so224074wmi.2; Mon, 06 Apr 2020 10:48:22 -0700 (PDT) Received: from x1w.redhat.com (116.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.116]) by smtp.gmail.com with ESMTPSA id a67sm364880wmc.30.2020.04.06.10.48.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2020 10:48:20 -0700 (PDT) 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=LZt0wKgOcXbd9J2Y1x7+Xq5w37mnJzb6ovGxsczGG64=; b=b22dpc9P0WfFSNzqmIIOCXA5j3SBgFlX8kq3DgEjbyVRZ8ab+WAskuZKaX2KGJrDLi 1ExUViGINuZ8wSAaG3bsdI4Qf2xLPYPAYtKbx2Ck8bI55nvlbpZFHWxggyqaEsc/B6Tx Az0ZZtZkK5shftM30BXtxoW3XJNu3kDjtdBv9uE0NZTpHwLXWM7hXbROSp1jTv1sFmY7 Z+mQGb197/FlpeQAhw53ngaherhWtKlj6P1Q4JZij8cptwHc25grvofEODCHBALPRy74 oiUSsvpP1JR2INFgYeHkNXldxDy8uwJftZN1sV5q42oQvzzAPAfzKndPrLkGSDp4lFLU bIZg== 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=LZt0wKgOcXbd9J2Y1x7+Xq5w37mnJzb6ovGxsczGG64=; b=bw1LJ4z8TrGtW2cYShyN9C9NT+XoT2MnJ7NnBJeSH4tqT12ePb8HBRO87A4JVGIcWr ITN9iJS4jCtwxeGrZIKPIwXXL+TkaWl84AaHVYxbAu6RnQfOtD+3Kt5mQCwkcfT6oft7 Ppxz2XZM2jX25hU++x2xmNfn/mPFl9CxildemH5VtD6FufMl6BybY9PGhy4kljJug3pj 1d9wPlPHzauKWG5XRQs+LQFywptzgmwBhDWS8KXVYQ5CeP8tH+bEnlz5t9Baf7DretL0 Zgsp0TtOS1k/8gznFphKvYo2ePOmQuTT3+Y/RZPMa3GPpBCMp0KT0CKDSYzLzQ/m0j5G kJzA== X-Gm-Message-State: AGi0PuaeF3oKVjMnpsPw+LL1yjSI2PtoZXtDl9Wz8ojqU9ORDzcDZMK2 6QHjLzh+C2igtimkMUu9/nWcHFEOd2s= X-Google-Smtp-Source: APiQypKWa/QU3mBr8qNVtZoW8/hCd3u7++648Q6PPb0tFKLlkmydTq29R5+wTNf/fBkbcBiEf5iVkw== X-Received: by 2002:a1c:e242:: with SMTP id z63mr205942wmg.72.1586195301541; Mon, 06 Apr 2020 10:48:21 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Markus Armbruster Subject: [PATCH-for-5.1 v2 26/54] hw/arm/fsl-imx: Add missing error-propagation code Date: Mon, 6 Apr 2020 19:47:15 +0200 Message-Id: <20200406174743.16956-27-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200406174743.16956-1-f4bug@amsat.org> References: <20200406174743.16956-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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:4864:20::329 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: Peter Maydell , Vladimir Sementsov-Ogievskiy , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "open list:i.MX25 PDK" , Jean-Christophe Dubois Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Patch created mechanically by running: $ spatch \ --macro-file scripts/cocci-macro-file.h --include-headers \ --sp-file scripts/coccinelle/use-error_propagate-in-realize.cocci \ --keep-comments --smpl-spacing --in-place --dir hw Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/fsl-imx25.c | 6 +++++- hw/arm/fsl-imx6.c | 18 +++++++++++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c index 6f1a82ce3d..3d87fe867e 100644 --- a/hw/arm/fsl-imx25.c +++ b/hw/arm/fsl-imx25.c @@ -295,7 +295,11 @@ static void fsl_imx25_realize(DeviceState *dev, Error = **errp) }; =20 object_property_set_bool(OBJECT(&s->usb[i]), true, "realized", - &error_abort); + &err); + if (err) { + error_propagate(errp, err); + return; + } sysbus_mmio_map(SYS_BUS_DEVICE(&s->usb[i]), 0, usb_table[i].addr); sysbus_connect_irq(SYS_BUS_DEVICE(&s->usb[i]), 0, qdev_get_gpio_in(DEVICE(&s->avic), diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c index 6bf8aa0404..b3cef5bb57 100644 --- a/hw/arm/fsl-imx6.c +++ b/hw/arm/fsl-imx6.c @@ -359,7 +359,11 @@ static void fsl_imx6_realize(DeviceState *dev, Error *= *errp) /* USB */ for (i =3D 0; i < FSL_IMX6_NUM_USB_PHYS; i++) { object_property_set_bool(OBJECT(&s->usbphy[i]), true, "realized", - &error_abort); + &err); + if (err) { + error_propagate(errp, err); + return; + } sysbus_mmio_map(SYS_BUS_DEVICE(&s->usbphy[i]), 0, FSL_IMX6_USBPHY1_ADDR + i * 0x1000); } @@ -372,7 +376,11 @@ static void fsl_imx6_realize(DeviceState *dev, Error *= *errp) }; =20 object_property_set_bool(OBJECT(&s->usb[i]), true, "realized", - &error_abort); + &err); + if (err) { + error_propagate(errp, err); + return; + } sysbus_mmio_map(SYS_BUS_DEVICE(&s->usb[i]), 0, FSL_IMX6_USBOH3_USB_ADDR + i * 0x200); sysbus_connect_irq(SYS_BUS_DEVICE(&s->usb[i]), 0, @@ -430,7 +438,11 @@ static void fsl_imx6_realize(DeviceState *dev, Error *= *errp) }; =20 object_property_set_bool(OBJECT(&s->wdt[i]), true, "realized", - &error_abort); + &err); + if (err) { + error_propagate(errp, err); + return; + } =20 sysbus_mmio_map(SYS_BUS_DEVICE(&s->wdt[i]), 0, FSL_IMX6_WDOGn_ADDR= [i]); } --=20 2.21.1