[PATCH 1/4] qemu: blockcopy: Actually unplug unused images when mirror job fails to start

[Eric Blake]

On 1/23/20 9:57 AM, Peter Krempa wrote:
> If a mirror job fails to start in -blockdev mode we'd not unplug the
> backing files we added first because the code on the error path checked
> the wrong value. 'rc' is used as status of the code which added the
> images, but the state of the 'block(dev)-mirror' call is stored in 'ret'
> at that point.
> 
> Signed-off-by: Peter Krempa <pkrempa at redhat.com>
> ---
>   src/qemu/qemu_driver.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

The patch itself lacks the context to show it is correct, but I looked 
at the file to confirm it makes sense.

Reviewed-by: Eric Blake <eblake at redhat.com>

> 
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index 0a1dc414ae..3218dc0e23 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -18413,7 +18413,7 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm,
>       qemuBlockJobStarted(job, vm);
> 
>    endjob:
> -    if (rc < 0 &&
> +    if (ret < 0 &&
>           virDomainObjIsActive(vm) &&
>           (data || crdata)) {
>           qemuDomainObjEnterMonitor(driver, vm);
> 

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org