From 146d12c6ccf3b30b0423ff9f96be75ca67561e92 Mon Sep 17 00:00:00 2001 From: Guannan Ren Date: Fri, 26 Jul 2013 20:53:47 +0800 Subject: [PATCH] caps: use -device for primary video when qemu >=1.6 libvirt: https://bugzilla.redhat.com/show_bug.cgi?id=986384 qemu: https://bugzilla.redhat.com/show_bug.cgi?id=981094 The commit 0ad9025ef introduce qemu flag QEMU_CAPS_DEVICE_VIDEO_PRIMARY for using -device VGA, -device cirrus-vga, -device vmware-svga and -device qxl-vga. In use, for -device qxl-vga, mouse doesn't display in guest window like the desciption in above bug. This patch try to use -device for primary video when qemu >=1.6 which contains the bug fix patch (cherry picked from commit e3f2686bdf6c94f658d8645c32a6039692753411) Conflicts: src/qemu/qemu_capabilities.c - context with other new capabilities not backported --- src/qemu/qemu_capabilities.c | 5 +++-- tests/qemuhelptest.c | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 2acf535e2c..4357bf7380 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1185,8 +1185,6 @@ virQEMUCapsComputeCmdFlags(const char *help, if (version >= 1001000) virQEMUCapsSet(qemuCaps, QEMU_CAPS_IPV6_MIGRATION); - if (version >= 1002000) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); return 0; } @@ -2538,6 +2536,9 @@ virQEMUCapsInitQMP(virQEMUCapsPtr qemuCaps, virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI); } + if (qemuCaps->version >= 1006000) + virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); + if (virQEMUCapsProbeQMPCommands(qemuCaps, mon) < 0) goto cleanup; if (virQEMUCapsProbeQMPEvents(qemuCaps, mon) < 0) diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index eeba4d4201..9752f36dcf 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -919,7 +919,6 @@ mymain(void) QEMU_CAPS_DEVICE_VGA, QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_DEVICE_VMWARE_SVGA, - QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_USB_SERIAL, QEMU_CAPS_DEVICE_USB_NET, QEMU_CAPS_DTB, @@ -1028,7 +1027,6 @@ mymain(void) QEMU_CAPS_DEVICE_VGA, QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_DEVICE_VMWARE_SVGA, - QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_USB_SERIAL, QEMU_CAPS_DEVICE_USB_NET, QEMU_CAPS_DTB, -- 2.47.2