From nobody Tue Feb 10 20:48:23 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=1586196401; cv=none; d=zohomail.com; s=zohoarc; b=TzJZkz2JfQh8CslA9muDrth2VqMRpP2kUUOL+q7L9u06tBBKZmNDoYrXyIpS0zK9zeebZ7idw9dZ50/KL4w3pe6D3lBEZ26oAyVdAbO8GLiEpjbJbj8id4gUZSTaZXpkEyqUYxAYrKb1dLzo5+QSB1du+kXntyxXq3D6tpDhDvE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586196401; 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=4qH9Y6DuxMr7Hpaab8O+4h54IDNv0/jiVmK2ORkgQcM=; b=LeYQz5so0xMckYA8mCQXiWMmcvoGBUrJKYOwXzaRfuZpquoFv2jK/nrhmgnkRxfwRwugFjva7HEBQmVR9rTmn2Y51WwOp6447SsiR2tQWxGr1Lyg+op8RAzkx5dCu51+UU9ls9KThG+Y0bCSGzYJpANPwQqWMHi5jtqeZJzoeOw= 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 1586196401655191.54294530249354; Mon, 6 Apr 2020 11:06:41 -0700 (PDT) Received: from localhost ([::1]:36228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLW8u-0000sH-8f for importer@patchew.org; Mon, 06 Apr 2020 14:06:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36402) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLVrH-0002Jn-TS for qemu-devel@nongnu.org; Mon, 06 Apr 2020 13:48:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jLVrF-0003GK-V4 for qemu-devel@nongnu.org; Mon, 06 Apr 2020 13:48:27 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:36688) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jLVrF-0003Fa-CL; Mon, 06 Apr 2020 13:48:25 -0400 Received: by mail-wr1-x435.google.com with SMTP id k1so526602wrm.3; Mon, 06 Apr 2020 10:48:25 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2020 10:48:23 -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=4qH9Y6DuxMr7Hpaab8O+4h54IDNv0/jiVmK2ORkgQcM=; b=ZuDlqPJogrtywgtHo4K1K/hz3DAl5EpWjYGKKa4fN4HE+kv1/j+tL/RpJNONx0+Fvy sZZrVWt2VMRGrKxGz+JaG2LdxnO+d9f1r3UFF4vGOoJGQewLN6C4FyFP0B8ByeXmmGbV xvglBopPhx7dxZWfo56hyCdcsHbPIApDcZFX5DC0jiQQMmNCN7Vj4Q6f0Fa0EleqHd78 4iBnWvW9FEfPqP357fTAg3kbTCzKG0Xk+/w2sYkr+hMGKSZumg2j2p2Yi4213mVKz2fa ZY8p9j7FXJ1r8YPo2EKLnFdA/H4S9HuxfB40BfsQc9IG7cDFC7FMY0mV3f2bR7d/WbUM 19RA== 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=4qH9Y6DuxMr7Hpaab8O+4h54IDNv0/jiVmK2ORkgQcM=; b=q7aTnrE+fxjQg5rhx3qUNut6hr7g8lN1UrZGzRI3R69nvYpTYjnbt9NWnEceDYKEus LM2SlZMhzusICvb4oQqVRlSsAWKefr2W1w1pTJ/AM5PpwuBbTmso6wkO7SsrX4DOAKeB IjLI3wLxSr49tNhsuubyup7RAZpJr4RS1ZqSn+3xqXcJIMc0Pzvbqetcr2XlBvVM54+b vzVJV1azrbkALMxE0JRwX7arRDm8czp3CjntXS27UL/DmFK2uJaoPCHhN2KPTMSdLhBM nx8WbT875hGNvru6R5Jz5bzcI7IjnwUyk04fkqr9BQ6d64OQ9CFhBtWrqS/LO27ZuUxK 5+yA== X-Gm-Message-State: AGi0PuZEUC3ERHXvlEKlmteIcgFmZ339EbtTEK7dwNPD6ieiB2+waZJz tSgS7CeYbU7CNJehi1Pp1kV3bNrFxkE= X-Google-Smtp-Source: APiQypLXUCdyx6FH0UxlG//cNePSGsrB43ux8fV+wI5gEV+n4XJkEpjhXKGIcLmdMPHfS8qmbH5aTA== X-Received: by 2002:adf:f1ce:: with SMTP id z14mr396708wro.68.1586195304023; Mon, 06 Apr 2020 10:48:24 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Markus Armbruster Subject: [PATCH-for-5.1 v2 28/54] hw/arm/aspeed: Add missing error-propagation code Date: Mon, 6 Apr 2020 19:47:17 +0200 Message-Id: <20200406174743.16956-29-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::435 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 , Andrew Jeffery , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "open list:ASPEED BMCs" , Joel Stanley , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: C=C3=A9dric Le Goater --- hw/arm/aspeed_ast2600.c | 36 ++++++++++++++++++++++++++++++------ hw/arm/aspeed_soc.c | 12 ++++++++++-- 2 files changed, 40 insertions(+), 8 deletions(-) diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c index c8e0171824..d810df928c 100644 --- a/hw/arm/aspeed_ast2600.c +++ b/hw/arm/aspeed_ast2600.c @@ -277,7 +277,11 @@ static void aspeed_soc_ast2600_realize(DeviceState *de= v, Error **errp) if (s->num_cpus > 1) { object_property_set_int(OBJECT(&s->cpu[i]), ASPEED_A7MPCORE_ADDR, - "reset-cbar", &error_abort); + "reset-cbar", &err); + if (err) { + error_propagate(errp, err); + return; + } } /* * TODO: the secondary CPUs are started and a boot helper @@ -293,10 +297,18 @@ static void aspeed_soc_ast2600_realize(DeviceState *d= ev, Error **errp) =20 /* A7MPCORE */ object_property_set_int(OBJECT(&s->a7mpcore), s->num_cpus, "num-cpu", - &error_abort); + &err); + if (err) { + error_propagate(errp, err); + return; + } =20 object_property_set_bool(OBJECT(&s->a7mpcore), true, "realized", - &error_abort); + &err); + if (err) { + error_propagate(errp, err); + return; + } sysbus_mmio_map(SYS_BUS_DEVICE(&s->a7mpcore), 0, ASPEED_A7MPCORE_ADDR); =20 for (i =3D 0; i < s->num_cpus; i++) { @@ -343,7 +355,11 @@ static void aspeed_soc_ast2600_realize(DeviceState *de= v, Error **errp) =20 /* Timer */ object_property_set_link(OBJECT(&s->timerctrl), - OBJECT(&s->scu), "scu", &error_abort); + OBJECT(&s->scu), "scu", &err); + if (err) { + error_propagate(errp, err); + return; + } object_property_set_bool(OBJECT(&s->timerctrl), true, "realized", &err= ); if (err) { error_propagate(errp, err); @@ -459,7 +475,11 @@ static void aspeed_soc_ast2600_realize(DeviceState *de= v, Error **errp) AspeedWDTClass *awc =3D ASPEED_WDT_GET_CLASS(&s->wdt[i]); =20 object_property_set_link(OBJECT(&s->wdt[i]), - OBJECT(&s->scu), "scu", &error_abort); + OBJECT(&s->scu), "scu", &err); + if (err) { + error_propagate(errp, err); + return; + } object_property_set_bool(OBJECT(&s->wdt[i]), true, "realized", &er= r); if (err) { error_propagate(errp, err); @@ -490,7 +510,11 @@ static void aspeed_soc_ast2600_realize(DeviceState *de= v, Error **errp) aspeed_soc_get_irq(s, ASPEED_ETH1 + i)); =20 object_property_set_link(OBJECT(&s->mii[i]), OBJECT(&s->ftgmac100[= i]), - "nic", &error_abort); + "nic", &err); + if (err) { + error_propagate(errp, err); + return; + } object_property_set_bool(OBJECT(&s->mii[i]), true, "realized", &err); if (err) { diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c index aa6d739ad0..5f90215187 100644 --- a/hw/arm/aspeed_soc.c +++ b/hw/arm/aspeed_soc.c @@ -301,7 +301,11 @@ static void aspeed_soc_realize(DeviceState *dev, Error= **errp) =20 /* Timer */ object_property_set_link(OBJECT(&s->timerctrl), - OBJECT(&s->scu), "scu", &error_abort); + OBJECT(&s->scu), "scu", &err); + if (err) { + error_propagate(errp, err); + return; + } object_property_set_bool(OBJECT(&s->timerctrl), true, "realized", &err= ); if (err) { error_propagate(errp, err); @@ -398,7 +402,11 @@ static void aspeed_soc_realize(DeviceState *dev, Error= **errp) AspeedWDTClass *awc =3D ASPEED_WDT_GET_CLASS(&s->wdt[i]); =20 object_property_set_link(OBJECT(&s->wdt[i]), - OBJECT(&s->scu), "scu", &error_abort); + OBJECT(&s->scu), "scu", &err); + if (err) { + error_propagate(errp, err); + return; + } object_property_set_bool(OBJECT(&s->wdt[i]), true, "realized", &er= r); if (err) { error_propagate(errp, err); --=20 2.21.1