[libvirt] [PATCH] qemu: fix -global argument usage

[Daniel P. Berrange]

On Fri, Mar 11, 2011 at 10:05:02AM -0700, Eric Blake wrote:
> * src/qemu/qemu_command.c (qemuBuildCommandLine): Pass two
> separate arguments, and fix indentation.
> ---
> 
> I debated about pushing under the trivial rule, but restrained myself.
> 
>  src/qemu/qemu_command.c |   13 +++++++------
>  1 files changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
> index 0fc466c..8ca656a 100644
> --- a/src/qemu/qemu_command.c
> +++ b/src/qemu/qemu_command.c
> @@ -4042,12 +4042,13 @@ qemuBuildCommandLine(virConnectPtr conn,
>                  if (def->videos[0]->type == VIR_DOMAIN_VIDEO_TYPE_QXL) {
>                      if (def->videos[0]->vram &&
>                          qemuCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) {
> -                            if (qemuCapsGet(qemuCaps, QEMU_CAPS_DEVICE_QXL_VGA))
> -                                virCommandAddArgFormat(cmd, "-global qxl-vga.vram_size=%u",
> -                                                       def->videos[0]->vram * 1024);
> -                            else
> -                                virCommandAddArgFormat(cmd, "-global qxl.vram_size=%u",
> -                                                       def->videos[0]->vram * 1024);
> +                        virCommandAddArg(cmd, "-global");
> +                        if (qemuCapsGet(qemuCaps, QEMU_CAPS_DEVICE_QXL_VGA))
> +                            virCommandAddArgFormat(cmd, "qxl-vga.vram_size=%u",
> +                                                   def->videos[0]->vram * 1024);
> +                        else
> +                            virCommandAddArgFormat(cmd, "qxl.vram_size=%u",
> +                                                   def->videos[0]->vram * 1024);
>                      }

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 :|