On Tue, Apr 14, 2015 at 10:28:23AM -0600, Eric Blake wrote:
On 04/14/2015 10:24 AM, Martin Kletzander wrote:That works with the following change:ACK with that squashed in, no need to resend it ;)diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 768cef1..1b20a7f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2510,6 +2510,7 @@ struct virQEMUCapsCommandLineProps { static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { { "machine", "mem-merge", QEMU_CAPS_MEM_MERGE }, + { "machine", "vmport", QEMU_CAPS_MACHINE_VMPORT_OPT },But this will break on qemu 2.3, unless something changes there. I don't want to do a version check, but I also don't want something that works by accident in qemu 2.2 start failing with qemu 2.3.
I'm failing to find any compromise here. We would have to wait for QEMU to fix the introspection, but in the meantime we'd be unable to fix it ourselves. And since 2.3 is right around the corner, we'd have to wait for 2.4. Can we at least add all the patches except the hunks that set the capability and decide later on how to enable that, at least for any possible adopters to minimize their need for non-upstream patches?
Attachment:
signature.asc
Description: PGP signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list