From nobody Tue Feb 10 06:08:24 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=1597725495; cv=none; d=zohomail.com; s=zohoarc; b=PwM94rZDBBX4t0Ag6a8zJjPeSC2OZGlqRaWxNATy5N+PWQ3BcmdzHJGPzWJY8MbQR6yqGWi7JZ4QscXi7iO9IWbb98Iy6VaUwUNz/8CYsl1eZe/+U1EHFPgDEzbs1vtKEDqOWjdkEF1+Kje0mtu/TT+4rfitnGYkeUeKcDl26BU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597725495; 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=F65747YSBJqK99P+ia+E3ZGRknA5Q9317jMOU+Iikr4=; b=X97Vac42fD95xQCIRr+aN/g/71ZZtG2YDKmZrOWGMbcK6DlndJKSmfPr/2EvQCWtFueP3zJTKrBO+dlzFnAqmu7j12RYQaIhyofnU2k3+6HnF6M9TQNiOJBtcWQ5nJPCI13dqxPL4nUhyGNRntrjpnL6vhlrxWH5H1+eqkfYGmo= 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 1597725495761641.7700164206182; Mon, 17 Aug 2020 21:38:15 -0700 (PDT) Received: from localhost ([::1]:51010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7tO2-0007rj-Hp for importer@patchew.org; Tue, 18 Aug 2020 00:38:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50526) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7t7U-00010C-Qt; Tue, 18 Aug 2020 00:21:08 -0400 Received: from ozlabs.org ([203.11.71.1]:48747) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7t7T-0006Rf-0r; Tue, 18 Aug 2020 00:21:08 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 4BVyNh1bhwz9sW3; 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=/tKjcLtS76XXLQ/pn0TEycoIQ/uHeOAgdmkWU4oTH6k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XWe1UumWCfLxtN6cKNqDez3m20Q5wVSR0eihIJhXod2sGvR0anQJzrnILsOxaHG2Z Jsd8YuqWuGJdm+c/xW0l/JAXVzHmxWrB4CA8YKgqUbfyZbYQmswXpyTqMZA6YI2lQk q30qRVDbcfC82s/ncoaHfcn1xq2xZTTOWhUPjtrA= From: David Gibson To: peter.maydell@linaro.org, groug@kaod.org Subject: [PULL 33/40] spapr/kvm: Fix error handling in kvmppc_xive_pre_save() Date: Tue, 18 Aug 2020 14:19:15 +1000 Message-Id: <20200818041922.251708-34-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 kvmppc_xive_get_queues() returns a negative errno on failure, check with 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: <159707849455.1489912.6034461176847728064.stgit@bahia.lan> Signed-off-by: David Gibson --- hw/intc/spapr_xive_kvm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/intc/spapr_xive_kvm.c b/hw/intc/spapr_xive_kvm.c index f2dda69218..1686b036eb 100644 --- a/hw/intc/spapr_xive_kvm.c +++ b/hw/intc/spapr_xive_kvm.c @@ -604,16 +604,17 @@ void kvmppc_xive_synchronize_state(SpaprXive *xive, E= rror **errp) int kvmppc_xive_pre_save(SpaprXive *xive) { Error *local_err =3D NULL; + int ret; =20 assert(xive->fd !=3D -1); =20 /* EAT: there is no extra state to query from KVM */ =20 /* ENDT */ - kvmppc_xive_get_queues(xive, &local_err); - if (local_err) { + ret =3D kvmppc_xive_get_queues(xive, &local_err); + if (ret < 0) { error_report_err(local_err); - return -1; + return ret; } =20 return 0; --=20 2.26.2