From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 18 Jul 2019 16:31:40 +0000 (+0200)
Subject: qemu: driver: Report error if pivoting fails in qemuDomainBlockJobAbort
X-Git-Tag: v5.6.0-rc1~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ed4e3577255acc590caf1ed9e84827d68223f7f;p=thirdparty%2Flibvirt.git

qemu: driver: Report error if pivoting fails in qemuDomainBlockJobAbort

As the error message is now available and we know whether the job failed
we can report an error straight away rather than having the user check
the event.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 3a2c5f5334..44cc9501c6 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -17231,6 +17231,22 @@ qemuDomainBlockJobAbort(virDomainPtr dom,
             }
             qemuBlockJobUpdate(vm, job, QEMU_ASYNC_JOB_NONE);
         }
+
+        if (pivot &&
+            job->state == QEMU_BLOCKJOB_STATE_FAILED) {
+            if (job->errmsg) {
+                virReportError(VIR_ERR_OPERATION_FAILED,
+                               _("block job '%s' failed while pivoting"),
+                               job->name);
+            } else {
+                virReportError(VIR_ERR_OPERATION_FAILED,
+                               _("block job '%s' failed while pivoting: %s"),
+                               job->name, job->errmsg);
+            }
+
+            ret = -1;
+            goto endjob;
+        }
     }
 
  endjob: