From: Greg Kurz <groug@kaod.org>
Date: Mon, 10 Aug 2020 16:54:54 +0000 (+0200)
Subject: spapr/kvm: Fix error handling in kvmppc_xive_pre_save()
X-Git-Tag: v5.2.0-rc0~165^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=42a92d925d03ec49dfdefb43c15b46c3ca55f9e4;p=thirdparty%2Fqemu.git

spapr/kvm: Fix error handling in kvmppc_xive_pre_save()

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 <groug@kaod.org>
Message-Id: <159707849455.1489912.6034461176847728064.stgit@bahia.lan>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---

diff --git a/hw/intc/spapr_xive_kvm.c b/hw/intc/spapr_xive_kvm.c
index f2dda692183..1686b036eb2 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, Error **errp)
 int kvmppc_xive_pre_save(SpaprXive *xive)
 {
     Error *local_err = NULL;
+    int ret;
 
     assert(xive->fd != -1);
 
     /* EAT: there is no extra state to query from KVM */
 
     /* ENDT */
-    kvmppc_xive_get_queues(xive, &local_err);
-    if (local_err) {
+    ret = kvmppc_xive_get_queues(xive, &local_err);
+    if (ret < 0) {
         error_report_err(local_err);
-        return -1;
+        return ret;
     }
 
     return 0;