From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 26 Nov 2019 14:13:57 +0000 (+0100)
Subject: qemu: blockjob: Finish handling job with broken data
X-Git-Tag: v5.10.0-rc2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d310b0869753a860e499c66823fb4fe427d46af8;p=thirdparty%2Flibvirt.git

qemu: blockjob: Finish handling job with broken data

Now that we have a separate job type which will not trigger normal code
paths for terminating job we can remove the ad-hoc handling.

This possibly fixes the issue of a broken job inheriting the disk and
then finishing in which case we'd not detach the backing chain.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Cole Robinson <crobinso@redhat.com>
---

diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
index 1e31052385..baa79ea80c 100644
--- a/src/qemu/qemu_blockjob.c
+++ b/src/qemu/qemu_blockjob.c
@@ -1335,11 +1335,6 @@ qemuBlockJobEventProcessConcluded(qemuBlockJobDataPtr job,
     if (qemuDomainObjExitMonitor(driver, vm) < 0)
         goto cleanup;
 
-    if (job->invalidData) {
-        VIR_WARN("terminating job '%s' with invalid data", job->name);
-        goto cleanup;
-    }
-
     if ((job->newstate == QEMU_BLOCKJOB_STATE_COMPLETED ||
          job->newstate == QEMU_BLOCKJOB_STATE_FAILED) &&
         job->state == QEMU_BLOCKJOB_STATE_ABORTING)