]> git.ipfire.org Git - thirdparty/libvirt.git/commit
qemu: detect multi-head qxl via more than version check
authorEric Blake <eblake@redhat.com>
Thu, 14 Mar 2013 00:41:22 +0000 (18:41 -0600)
committerEric Blake <eblake@redhat.com>
Thu, 14 Mar 2013 15:38:20 +0000 (09:38 -0600)
commit5ac846e42e5b7e0475f6aa9cc1e0b0c8dac84d44
treeb06b7089ab593829e6d9014cc42f55e7e04d5035
parent0946c5f5fc766b782aa5606942370dd751cebb36
qemu: detect multi-head qxl via more than version check

Multi-head QXL support is so useful that distros have started to
backport it to qemu earlier than 1.2.  After discussion with
Alon Levy, we determined that the existence of the qxl-vga.surfaces
property is a reliable indicator of whether '-device qxl-vga' works,
or whether we have to stick to the older '-vga qxl'.  I'm leaving
in the existing check for QEMU_CAPS_DEVICE_VIDEO_PRIMARY tied to
qemu 1.2 and newer (in case qemu is built without qxl support),
but for those distros that backport qxl, this additional capability
check will allow the correct command line for both RHEL 6.3 (which
lacks the feature) and RHEL 6.4 (where qemu still claims to be
version 0.12.2.x, but has backported multi-head qxl).

* src/qemu/qemu_capabilities.c (virQEMUCapsObjectPropsQxlVga): New
property test.
(virQEMUCapsExtractDeviceStr): Probe for backport of new
capability to qemu earlier than 1.2.
* tests/qemuhelpdata/qemu-kvm-1.2.0-device: Update test.
* tests/qemuhelpdata/qemu-1.2.0-device: Likewise.
* tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta-device:
Likewise.
src/qemu/qemu_capabilities.c
tests/qemuhelpdata/qemu-1.2.0-device
tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta-device
tests/qemuhelpdata/qemu-kvm-1.2.0-device