[libvirt] [PATCH 10/10] qemu: blockjob: Finish handling job with broken data

Cole Robinson crobinso at redhat.com
Tue Nov 26 23:49:48 UTC 2019


On 11/26/19 10:17 AM, Peter Krempa wrote:
> 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 at redhat.com>
> ---
>  src/qemu/qemu_blockjob.c | 5 -----
>  1 file changed, 5 deletions(-)
> 
> diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
> index d957e3175e..2c51367c67 100644
> --- a/src/qemu/qemu_blockjob.c
> +++ b/src/qemu/qemu_blockjob.c
> @@ -1334,11 +1334,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)
> 

Reviewed-by: Cole Robinson <crobinso at redhat.com>

- Cole




More information about the libvir-list mailing list