On Wed, Jul 22, 2015 at 10:12:02AM +0100, Daniel P. Berrange wrote:
On Wed, Jul 22, 2015 at 10:05:48AM +0200, Martin Kletzander wrote:This reverts commit 7b401c3bdacdf8367a0070e625d73eafb802045d. Until libvirt is able to differentiate whether heads='1' is just a leftover from previous libvirt or whether that's added by user on purpose and also whether the domain was started with the support for qxl's max_outputs, we cannot incorporate this patch into the tree due to compatibility reasons. Signed-off-by: Martin Kletzander <mkletzan@xxxxxxxxxx> --- The discussion about this can be found in this thread: https://www.redhat.com/archives/libvir-list/2015-July/msg00808.html src/qemu/qemu_capabilities.c | 2 -- src/qemu/qemu_capabilities.h | 1 - src/qemu/qemu_command.c | 5 ---- .../qemuxml2argv-video-qxl-device-max-outputs.args | 7 ------ .../qemuxml2argv-video-qxl-device-max-outputs.xml | 29 ---------------------- tests/qemuxml2argvtest.c | 3 --- 6 files changed, 47 deletions(-) delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-max-outputs.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-max-outputs.xml diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 0769316fe999..d8cb32d77761 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -288,7 +288,6 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "vhost-user-multiqueue", /* 190 */ "migration-event", - "qxl-vga.max_outputs", );Removing the capability will cause libvirt to fail to load any running QEMU guests which had that capability, even if they were not using it. We must keep the capability detection and only revert the addition to qemu_command.c
We had no release with this commit yet, it is in only for two days now.
Regards, 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 :|
Attachment:
signature.asc
Description: PGP signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list