[libvirt] [PATCH] qemu: block-commit: Mark disk in block jobs only on successful command

[Eric Blake]

On 03/16/2015 09:55 AM, Peter Krempa wrote:
> Patch 51f9f03a4ca50b070c0fbfb29748d49f583e15e1 introduces a regression
> where if a blockCommit operation fails the disk is still marked as being
> part of a block job but can't be unmarked later.
> ---
>  src/qemu/qemu_driver.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

ACK. Serves me right for reviewing but not thoroughly testing the
earlier patches.

> 
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index 7ca993d..4b8e104 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -17086,7 +17086,8 @@ qemuDomainBlockCommit(virDomainPtr dom,
>          goto endjob;
>      }
> 
> -    disk->blockjob = true;
> +    if (ret == 0)
> +        disk->blockjob = true;
> 
>      if (mirror) {
>          if (ret == 0) {
> 

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 604 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20150316/8cfbe665/attachment-0001.sig>