From nobody Tue Feb 10 07:57:45 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=1597078653; cv=none; d=zohomail.com; s=zohoarc; b=hYeBjXD4C6H/7GNQmeIb21BuUMawkMOUkpCxEwV8NKZ/uu3Vb+mpyEmoAh+xWF/DE6Pisup6mmRaZIIzAjLNa87HCcuG4kjyjIk77MSIA94OPJrN5KAaqYoTobo6LMAZPD1GVSHTHJJyDc0KIyW/2IX1L7EWD8NtrH3+5OWg/kI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597078653; 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=jX/bDYHk1UEYCndrEwGw3VO93mNJ+bFNWbr0Id5pr8M=; b=cfmubGewWTcLRu7mEq6kcyRXl0Z5pr21C3OGVsNltxOqXOl4b2uby09mst4a1FH7yH2tV6wqDSZtmYszGZWK/6xyRpFoVUiijytzeEhPV1aEa9Ve1NrHEZh6cHT4VuIQWoXy/pKzBluhvwFppJm0QSNdMGyvnLszrKnaBXwD+9E= 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 1597078653104931.0914795351429; Mon, 10 Aug 2020 09:57:33 -0700 (PDT) Received: from localhost ([::1]:60558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5B75-0002vj-SU for importer@patchew.org; Mon, 10 Aug 2020 12:57:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5B4o-0006mG-Fw for qemu-devel@nongnu.org; Mon, 10 Aug 2020 12:55:10 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:57021 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5B4m-0000mt-TT for qemu-devel@nongnu.org; Mon, 10 Aug 2020 12:55:10 -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-386-f9Y9hy54M0O6kAR2OcFVgg-1; Mon, 10 Aug 2020 12:55:04 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2DE991940920; Mon, 10 Aug 2020 16:55:03 +0000 (UTC) Received: from bahia.lan (ovpn-112-38.ams2.redhat.com [10.36.112.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id 585656F129; Mon, 10 Aug 2020 16:55:02 +0000 (UTC) X-MC-Unique: f9Y9hy54M0O6kAR2OcFVgg-1 Subject: [PATCH 10/14] spapr/xive: Fix error handling in kvmppc_xive_post_load() From: Greg Kurz To: David Gibson Date: Mon, 10 Aug 2020 18:55:01 +0200 Message-ID: <159707850148.1489912.18355118622296682631.stgit@bahia.lan> In-Reply-To: <159707843034.1489912.1082061742626355958.stgit@bahia.lan> References: <159707843034.1489912.1082061742626355958.stgit@bahia.lan> User-Agent: StGit/0.21 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 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=205.139.110.120; envelope-from=groug@kaod.org; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 11:00:11 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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: qemu-ppc@nongnu.org, =?utf-8?q?C=C3=A9dric_Le_Goater?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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 --- 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 1686b036eb2d..005729ebffed 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 */