[libvirt] [PATCH] qemu: Fix QMP detection of QXL graphics

[Daniel P. Berrange]

On Tue, Oct 09, 2012 at 08:30:40AM +0200, Jiri Denemark wrote:
> With the recent introduction of QMP capabilities probing, libvirt failed
> to detect support for QXL graphics in QEMU 1.2 and newer. In addition to
> fixing that, this patch also causes libvirt to detect QXL support for
> qemu-kvm-0.13.0, which doesn't advertise it in -help output but mentions
> it in device list. Since qemu-kvm-0.13.0 supported -spice, it looks like
> not having qxl in -help was a bug.
> ---
>  src/qemu/qemu_capabilities.c | 1 +
>  tests/qemuhelptest.c         | 1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> index d16a7bc..982b875 100644
> --- a/src/qemu/qemu_capabilities.c
> +++ b/src/qemu/qemu_capabilities.c
> @@ -1276,6 +1276,7 @@ struct qemuCapsStringFlags qemuCapsObjectTypes[] = {
>      { "virtio-scsi-pci", QEMU_CAPS_VIRTIO_SCSI_PCI },
>      { "spicevmc", QEMU_CAPS_DEVICE_SPICEVMC },
>      { "qxl-vga", QEMU_CAPS_DEVICE_QXL_VGA },
> +    { "qxl", QEMU_CAPS_VGA_QXL },
>      { "sga", QEMU_CAPS_SGA },
>      { "scsi-block", QEMU_CAPS_SCSI_BLOCK },
>      { "scsi-cd", QEMU_CAPS_SCSI_CD },
> diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
> index 681f425..df30ac1 100644
> --- a/tests/qemuhelptest.c
> +++ b/tests/qemuhelptest.c
> @@ -467,6 +467,7 @@ mymain(void)
>              QEMU_CAPS_NESTING,
>              QEMU_CAPS_NAME_PROCESS,
>              QEMU_CAPS_SMBIOS_TYPE,
> +            QEMU_CAPS_VGA_QXL,
>              QEMU_CAPS_SPICE,
>              QEMU_CAPS_VGA_NONE,
>              QEMU_CAPS_MIGRATE_QEMU_FD,

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