[libvirt] [PATCH] qemu: Detect VGA_QXL capability correctly

[Daniel P. Berrange]

On Fri, Jan 04, 2013 at 10:00:34AM +0100, Michal Privoznik wrote:
> Since 4c993d8a we failed to set this important capability, which
> allows starting a domain with QXL video card. We set DEVICE_QXL
> capability bit instead, which is not necessary wrong. Anyway, if
> qemu supports the new '-device qxl' it supports older '-vga qxl'
> as well. The latter is used for the primary (the first) qxl video
> card, the former for other video cards.
> ---
> 
> Other approach is to set QEMU_CAPS_VGA_QXL unconditionally
> as supported by all qemu-1.2+ in qemuCapsInitQMPBasic().
> But I think this one is slightly nicer.
> 
>  src/qemu/qemu_capabilities.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> index f49a31c..e16bc70 100644
> --- a/src/qemu/qemu_capabilities.c
> +++ b/src/qemu/qemu_capabilities.c
> @@ -2018,6 +2018,9 @@ qemuCapsProbeQMPObjects(qemuCapsPtr caps,
>      /* Prefer -chardev spicevmc (detected earlier) over -device spicevmc */
>      if (qemuCapsGet(caps, QEMU_CAPS_CHARDEV_SPICEVMC))
>          qemuCapsClear(caps, QEMU_CAPS_DEVICE_SPICEVMC);
> +    /* If qemu supports newer -device qxl it supports -vga qxl as well */
> +    if (qemuCapsGet(caps, QEMU_CAPS_DEVICE_QXL))
> +        qemuCapsSet(caps, QEMU_CAPS_VGA_QXL);

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