From nobody Tue Feb 10 09:01:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=1600087452; cv=none; d=zohomail.com; s=zohoarc; b=UVa4tRK/pKVO8w0LRDgU/0hFU1jih4T7qqfh9ZDruV3UA+x7NWzeYIHxZxcTUs9TdFBH8obSvAqEZukJGjnIgnKwSMnMmYuEizg2F6Lw4eD4TqML7TwFEgQ1eXMVFaCsJIDY1G8L/OAAIBH2sOBLwBDoHlNcCW9NJ0jhqysrHqU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600087452; 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=EuC1EbnWhM/Fi5lxlv1KbPYDBPGfrjv4Tl4oecu4G/4=; b=CKty08m5n6u9LwNCm8nktI0ncv3+awqWmKz91fXJWVKuFvbDyB/r6U4dTps2Ni5g2xSGVsp7/YbhmZ/au5ZsbAk01PQHz8cT3j0cX4JX+rMaxBF09msxT2EKF+3n8y3xJcvvfwwqng6Sc6r78sTkowc2Y+OaeQC7syL+4T9ODj8= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 1600087452781570.1735889661402; Mon, 14 Sep 2020 05:44:12 -0700 (PDT) Received: from localhost ([::1]:46094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHnq7-0005bL-H2 for importer@patchew.org; Mon, 14 Sep 2020 08:44:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHnhy-0006w9-Tw for qemu-devel@nongnu.org; Mon, 14 Sep 2020 08:35:46 -0400 Received: from us-smtp-delivery-44.mimecast.com ([207.211.30.44]:58037) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kHnhw-0000ll-Va for qemu-devel@nongnu.org; Mon, 14 Sep 2020 08:35:46 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-535-jEntAfBRPde7mp1nNt0Egg-1; Mon, 14 Sep 2020 08:35:42 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5ACF764086; Mon, 14 Sep 2020 12:35:41 +0000 (UTC) Received: from bahia.redhat.com (ovpn-112-218.ams2.redhat.com [10.36.112.218]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0714D1002D4E; Mon, 14 Sep 2020 12:35:39 +0000 (UTC) X-MC-Unique: jEntAfBRPde7mp1nNt0Egg-1 From: Greg Kurz To: qemu-devel@nongnu.org Subject: [PATCH 15/15] spapr: Simplify error handling in spapr_memory_unplug_request() Date: Mon, 14 Sep 2020 14:35:05 +0200 Message-Id: <20200914123505.612812-16-groug@kaod.org> In-Reply-To: <20200914123505.612812-1-groug@kaod.org> References: <20200914123505.612812-1-groug@kaod.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=groug@kaod.org X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: kaod.org Content-Transfer-Encoding: quoted-printable 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; Received-SPF: softfail client-ip=207.211.30.44; envelope-from=groug@kaod.org; helo=us-smtp-delivery-44.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/14 08:35:33 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no autolearn_force=no X-Spam_action: no action 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: Greg Kurz , Vladimir Sementsov-Ogievskiy , qemu-ppc@nongnu.org, Markus Armbruster , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Since object_property_get_uint() only returns 0 on failure, use that instead of local_err, and get rid of the error propagation overhead. Signed-off-by: Greg Kurz --- hw/ppc/spapr.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index d6b4de6a1c53..2eca9dc26668 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3609,7 +3609,6 @@ static void spapr_memory_unplug_request(HotplugHandle= r *hotplug_dev, DeviceState *dev, Error **errp) { SpaprMachineState *spapr =3D SPAPR_MACHINE(hotplug_dev); - Error *local_err =3D NULL; PCDIMMDevice *dimm =3D PC_DIMM(dev); uint32_t nr_lmbs; uint64_t size, addr_start, addr; @@ -3625,9 +3624,8 @@ static void spapr_memory_unplug_request(HotplugHandle= r *hotplug_dev, nr_lmbs =3D size / SPAPR_MEMORY_BLOCK_SIZE; =20 addr_start =3D object_property_get_uint(OBJECT(dimm), PC_DIMM_ADDR_PRO= P, - &local_err); - if (local_err) { - error_propagate(errp, local_err); + errp); + if (!addr_start) { return; } =20 --=20 2.26.2