From nobody Tue Feb 10 02:55:04 2026 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=1597725639; cv=none; d=zohomail.com; s=zohoarc; b=mx0r3wjlH01ZB8PwSKGRKf37KmW/TAkJjG1kC1+INpGqPoqtHuO7NLNqInpcXIDzr1/AGLCDVIVGwxTjimvp/kWC9pPnvFZXSMjJJbECf9oeVN3+enHhau95F54bgv5BAp+yc/8tufnYlIH1boC8bQg8tcTXG1UyIxGZx9ri3dg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597725639; h=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=7pg7BfwwaqdoKcYl5e7/bK5IwnDLijg3tHu02n1WLoQ=; b=nMAsYgUSg4utXU8EauMNOBSE4WgTSZI8YJR7NpIqjEvxKF7j7gbt56SKYsVbNK3VRUCt15tdqi+J2ar3PEWcRGhpiKwBmpSfh2zBY1Ba/PFo/Eq8tMtvkRMPDEWDwB4/ieNMmgZcXlag8bpxG/qrqi6S5/rjw9SCU3RlQ79SayI= 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 1597725639260171.79123511791965; Mon, 17 Aug 2020 21:40:39 -0700 (PDT) Received: from localhost ([::1]:60726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7tQM-0003P5-4J for importer@patchew.org; Tue, 18 Aug 2020 00:40:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50562) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7t7W-00013r-5Z; Tue, 18 Aug 2020 00:21:10 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:38513 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 1k7t7T-0006Rh-2d; Tue, 18 Aug 2020 00:21:09 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 4BVyNh4sT8z9sW4; Tue, 18 Aug 2020 14:19:32 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1597724372; bh=190f+V+vuJPVY9rkM/6szxDl+6qCDUsVZleu5RtI4uU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q4BDq/NTxdlUl1I0ClKcaRRq6ewbT/jJo81tIh/1pbZZYNJIwIRAtpT0uG2Uv6Krs X+H2AgL+rM9eUPKBf66ZuQiMOllVLcpuQnDdL6Q4hDC7YFCf9SWDws2DS7SUOauJn9 PHkjP5ThMZfnxr3ex/chRQzwbWFDaVbrsqBDYYZg= From: David Gibson To: peter.maydell@linaro.org, groug@kaod.org Subject: [PULL 34/40] spapr/xive: Fix error handling in kvmppc_xive_post_load() Date: Tue, 18 Aug 2020 14:19:16 +1000 Message-Id: <20200818041922.251708-35-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200818041922.251708-1-david@gibson.dropbear.id.au> References: <20200818041922.251708-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 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=203.11.71.1; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/18 00:19:26 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -9 X-Spam_score: -1.0 X-Spam_bar: - X-Spam_report: (-1.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=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: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Greg Kurz Now that all these functions return a negative errno on failure, check that because it is preferred to local_err. And most of all, propagate it because vmstate expects negative errnos. Signed-off-by: Greg Kurz Message-Id: <159707850148.1489912.18355118622296682631.stgit@bahia.lan> Signed-off-by: David Gibson --- hw/intc/spapr_xive_kvm.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/hw/intc/spapr_xive_kvm.c b/hw/intc/spapr_xive_kvm.c index 1686b036eb..005729ebff 100644 --- a/hw/intc/spapr_xive_kvm.c +++ b/hw/intc/spapr_xive_kvm.c @@ -631,6 +631,7 @@ int kvmppc_xive_post_load(SpaprXive *xive, int version_= id) Error *local_err =3D NULL; CPUState *cs; int i; + int ret; =20 /* The KVM XIVE device should be in use */ assert(xive->fd !=3D -1); @@ -641,11 +642,10 @@ int kvmppc_xive_post_load(SpaprXive *xive, int versio= n_id) continue; } =20 - kvmppc_xive_set_queue_config(xive, SPAPR_XIVE_BLOCK_ID, i, - &xive->endt[i], &local_err); - if (local_err) { - error_report_err(local_err); - return -1; + ret =3D kvmppc_xive_set_queue_config(xive, SPAPR_XIVE_BLOCK_ID, i, + &xive->endt[i], &local_err); + if (ret < 0) { + goto fail; } } =20 @@ -660,16 +660,14 @@ int kvmppc_xive_post_load(SpaprXive *xive, int versio= n_id) * previously set in KVM. Since we don't do that for all interrupts * at reset time anymore, let's do it now. */ - kvmppc_xive_source_reset_one(&xive->source, i, &local_err); - if (local_err) { - error_report_err(local_err); - return -1; + ret =3D kvmppc_xive_source_reset_one(&xive->source, i, &local_err); + if (ret < 0) { + goto fail; } =20 - kvmppc_xive_set_source_config(xive, i, &xive->eat[i], &local_err); - if (local_err) { - error_report_err(local_err); - return -1; + ret =3D kvmppc_xive_set_source_config(xive, i, &xive->eat[i], &loc= al_err); + if (ret < 0) { + goto fail; } } =20 @@ -686,15 +684,18 @@ int kvmppc_xive_post_load(SpaprXive *xive, int versio= n_id) CPU_FOREACH(cs) { PowerPCCPU *cpu =3D POWERPC_CPU(cs); =20 - kvmppc_xive_cpu_set_state(spapr_cpu_state(cpu)->tctx, &local_err); - if (local_err) { - error_report_err(local_err); - return -1; + ret =3D kvmppc_xive_cpu_set_state(spapr_cpu_state(cpu)->tctx, &loc= al_err); + if (ret < 0) { + goto fail; } } =20 /* The source states will be restored when the machine starts running = */ return 0; + +fail: + error_report_err(local_err); + return ret; } =20 /* Returns MAP_FAILED on error and sets errno */ --=20 2.26.2