From nobody Mon Nov 17 01:31:06 2025 Delivered-To: importer@patchew.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=1602239302; cv=none; d=zohomail.com; s=zohoarc; b=S8nMfMCX2fD5da6A23W+Yu/LQsWYulwNnMRcgjw708i+V6EzE8H+x+VzaAXT4IuODKVs7hI6JztMtu6wCavt4ujWgN3UEfbwc44aKt6d+KW4REY9VRv9pDljOBBwhVtphm/D09cLNsHUIMi6L3Q583oThoINzksUkxrVSwcEgjk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602239302; 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=4ZfM9RDEuEyNd4Ute/rZ1qao7OD+DnluZvBnjI6ZmQE=; b=ZlzI5UGvG8mqF9UTgIEgZHw92617FFCeEdFQ2qD0jfevvTxpOWgfoJZmC8XYN5L/7EQKdUpxfiUPEeV76qks/RTIuETg3ObGVwLfuys6mHPVUMa9OXJo0lyn9/GwQWTMjt9WBLILoQwMoWbSloxDUCx4ViGORwbDizqy6pA0kWU= 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 1602239302804711.731773341223; Fri, 9 Oct 2020 03:28:22 -0700 (PDT) Received: from localhost ([::1]:34842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kQpdN-0005KZ-Do for importer@patchew.org; Fri, 09 Oct 2020 06:28:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43004) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQpVT-0005Ct-HH for qemu-devel@nongnu.org; Fri, 09 Oct 2020 06:20:11 -0400 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2]:52195 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQpVQ-0001me-IJ for qemu-devel@nongnu.org; Fri, 09 Oct 2020 06:20:11 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 4C73wX10Ldz9sVS; Fri, 9 Oct 2020 21:19:56 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1602238796; bh=P6GDoue4Fmo2XAOiOyb4TA3e4zSKC+OE9HjRXqaEWYU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eOatJqYHzpb98WGMZtpl9eswgjsHGlCs5zYHZ6rjXVhvFt8pSOdplehSXbhyU3aPi 0uTIHCps0QKT2NYJDKo65raeN/brehW1MYbo/LpawrC3i4s6qIa9UCBI1uO7dSCrWZ uxq11gfurauwuoAfVDNgyZCpRQvzLSg474iVJ2tY= From: David Gibson To: peter.maydell@linaro.org Subject: [PULL 07/20] spapr: Simplify error handling in do_client_architecture_support() Date: Fri, 9 Oct 2020 21:19:38 +1100 Message-Id: <20201009101951.1569252-8-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201009101951.1569252-1-david@gibson.dropbear.id.au> References: <20201009101951.1569252-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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: pass client-ip=2401:3900:2:1::2; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.25, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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: Vladimir Sementsov-Ogievskiy , dbarboza@redhat.com, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nonngu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Greg Kurz Use the return value of ppc_set_compat_all() to check failures, which is preferred over hijacking local_err. Signed-off-by: Greg Kurz Message-Id: <20200914123505.612812-7-groug@kaod.org> Reviewed-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: David Gibson --- hw/ppc/spapr_hcall.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 885ea60778..607740150f 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -1666,7 +1666,6 @@ target_ulong do_client_architecture_support(PowerPCCP= U *cpu, uint32_t cas_pvr; SpaprOptionVector *ov1_guest, *ov5_guest; bool guest_radix; - Error *local_err =3D NULL; bool raw_mode_supported =3D false; bool guest_xive; CPUState *cs; @@ -1697,8 +1696,9 @@ target_ulong do_client_architecture_support(PowerPCCP= U *cpu, =20 /* Update CPUs */ if (cpu->compat_pvr !=3D cas_pvr) { - ppc_set_compat_all(cas_pvr, &local_err); - if (local_err) { + Error *local_err =3D NULL; + + if (ppc_set_compat_all(cas_pvr, &local_err) < 0) { /* We fail to set compat mode (likely because running with KVM= PR), * but maybe we can fallback to raw mode if the guest supports= it. */ @@ -1707,7 +1707,6 @@ target_ulong do_client_architecture_support(PowerPCCP= U *cpu, return H_HARDWARE; } error_free(local_err); - local_err =3D NULL; } } =20 --=20 2.26.2