On Mon, Nov 02, 2020 at 08:30:28 -0600, Eric Blake wrote: > On 10/29/20 12:10 PM, Peter Krempa wrote: > > On Mon, Oct 26, 2020 at 08:36:50 -0500, Eric Blake wrote: > >> On 10/26/20 8:19 AM, Peter Krempa wrote: > >>> We use the capability to switch to using 'block-export-add' in the > >>> upcoming qemu release instead of the at the same time deprecated > >>> 'nbd-server-add'. > >>> > >>> Unfortunately qemu wants to change the interface of 'block-export-add' > >>> before the release. Since we've tried to stay up to date and added the > >>> code before it was written in stone, we need to disable the use of the > >>> new interface for the upcoming libvirt release so that we don't have a > >>> version of libvirt which would not work with the upcoming qemu version. > >>> > >>> Remove the detection of 'block-export-add' until we are more sure how > >>> the qemu interface will look. > >>> > >>> This patch partially reverts commit adb9f7123adb94645 > >>> > >>> Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx> > >>> --- > >>> src/qemu/qemu_capabilities.c | 1 - > >>> tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - > >>> 2 files changed, 2 deletions(-) > >> > >> Reviewed-by: Eric Blake <eblake@xxxxxxxxxx> > >> > >> Safe for libvirt now no matter what happens in qemu's soft freeze this week. > > > > I've pushed this patch, since Jirka is about to cut 'rc2' of libvirt and > > the qemu changes didn't hit upstream yet. > > I see libvirt 6.9 is out now, so we can now proceed with the rest of the > series. The qemu patches are now officially upstream (the whole series > is in, but the qapi changes are in this one): I've pushed the two commits already: https://gitlab.com/libvirt/libvirt/-/commit/42558a43f87f5a3e73bacb88baf425648415a06f https://gitlab.com/libvirt/libvirt/-/commit/1c2314b9388714332b68c8c44df68814257ba888
