On Tue, Dec 06, 2016 at 10:18:15 -0600, Eric Blake wrote:
On 12/06/2016 10:07 AM, Eric Blake wrote:
On 12/06/2016 10:00 AM, Peter Krempa wrote:
Qemu 2.8.0+ changes arguments structure for blockdev-add in the effort to make it finally stable. Since libvirt recently added the detection of gluster debug support relying on the old syntax we need to add the new as well. --- src/qemu/qemu_capabilities.c | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + 2 files changed, 2 insertions(+)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index df417f2..214f848 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1725,6 +1725,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsUSBNECXHCI[] = { /* see documentation for virQEMUCapsQMPSchemaGetByPath for the query format */ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = { { "blockdev-add/arg-type/options/+gluster/debug-level", QEMU_CAPS_GLUSTER_DEBUG_LEVEL}, + { "blockdev-add/arg-type/+gluster/debug-level", QEMU_CAPS_GLUSTER_DEBUG_LEVEL},
Except that in 2.8, it will be spelled 'debug', not 'debug-level': https://lists.gnu.org/archive/html/qemu-devel/2016-12/msg00572.html https://lists.gnu.org/archive/html/qemu-devel/2016-12/msg00567.html
debug-level should only be used in 2.7.
qemu 2.7 command line spells it "debug", it was only QMP that spelled it "debug-level". And libvirt's only use of QEMU_CAPS_GLUSTER_DEBUG_LEVEL was to request "debug" from the command line. Eventually, libvirt will want to use blockdev-add, and we'd prefer that the spelling be consistent throughout (that is, command line and hotplug through QMP should be identical). Which is why qemu 2.8 is fixing the QMP spelling to match the command line for -rc3.
So Jeff's patch to qemu 2.8 is still correct, and all we need on the libvirt side is to match the patch spelling to the actual qemu 2.8 release (and not the 2.8-rc2 release).
The current qemu repository apparently contains the patch. I'll post a update to qemucapabilitiesdata/caps_2.8.0.x86_64.replies which are taken pre-rc2 and thus did not contain this change along with an updated version of this patch.