[libvirt] [PATCH 02/10] qemu: blockjob: Properly propagate cancellation of blockjobs

[Cole Robinson]

On 11/26/19 10:17 AM, Peter Krempa wrote:
> qemu returns an error message in the job statistics even if the job was
> cancelled to emphasize it was not successful. Libvirt didn't properly
> transform it into QEMU_BLOCKJOB_STATE_CANCELLED though.
> 
> Signed-off-by: Peter Krempa <pkrempa at redhat.com>
> ---
>  src/qemu/qemu_blockjob.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
> index 92e4d391c9..2283d49c61 100644
> --- a/src/qemu/qemu_blockjob.c
> +++ b/src/qemu/qemu_blockjob.c
> @@ -1313,7 +1313,8 @@ qemuBlockJobEventProcessConcluded(qemuBlockJobDataPtr job,
>      if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0)
>          goto cleanup;
> 
> -    if (job->newstate == QEMU_BLOCKJOB_STATE_COMPLETED &&
> +    if ((job->newstate == QEMU_BLOCKJOB_STATE_COMPLETED ||
> +         job->newstate == QEMU_BLOCKJOB_STATE_FAILED) &&
>          job->state == QEMU_BLOCKJOB_STATE_ABORTING)
>          job->newstate = QEMU_BLOCKJOB_STATE_CANCELLED;
> 

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

- Cole