]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: blockjob: Finish handling job with broken data
authorPeter Krempa <pkrempa@redhat.com>
Tue, 26 Nov 2019 14:13:57 +0000 (15:13 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Wed, 27 Nov 2019 14:59:33 +0000 (15:59 +0100)
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>
src/qemu/qemu_blockjob.c

index 1e31052385b6b4c545c5acad5aa7ff260bf3cbaa..baa79ea80c2e2a3d6bd6baa60dcd7b5f47c3d8a2 100644 (file)
@@ -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)