[libvirt] [PATCHv4 2/4] qemu: fix blkiotune --live --config

[Daniel P. Berrange]

On Mon, Nov 14, 2011 at 09:30:00PM -0700, Eric Blake wrote:
> Without this,  'virsh blkiotune --live --config --weight=n'
> only affected live.
> 
> * src/qemu/qemu_driver.c (qemuDomainSetBlkioParameters): Allow
> setting both configurations at once.
> ---
>  src/qemu/qemu_driver.c |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)
> 
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index 5f4a18d..b0ce115 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -5981,7 +5981,10 @@ static int qemuDomainSetBlkioParameters(virDomainPtr dom,
>                  ret = -1;
>              }
>          }
> -    } else if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
> +    }
> +    if (ret < 0)
> +        goto cleanup;
> +    if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
>          /* Clang can't see that if we get here, persistentDef was set.  */
>          sa_assert(persistentDef);

ACK


Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|