1. Patchew
  2. Libvirt
  3. [PATCH 0/3] qemu: Prevent breakage of libvirt-6.9.0 with qemu-5.2.0
  4. View patch

[PATCH 1/3] qemu: capabilities: Disable detection of QEMU_CAPS_BLOCK_EXPORT_ADD

Peter Krempa posted 3 patches 5 years, 3 months ago
[PATCH 1/3] qemu: capabilities: Disable detection of QEMU_CAPS_BLOCK_EXPORT_ADD
Posted by Peter Krempa 5 years, 3 months ago 
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@redhat.com>
---
 src/qemu/qemu_capabilities.c                     | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index a67fb785b5..78be372a0c 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1172,7 +1172,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
     { "block-dirty-bitmap-merge", QEMU_CAPS_BITMAP_MERGE },
     { "query-cpu-model-baseline", QEMU_CAPS_QUERY_CPU_MODEL_BASELINE },
     { "query-cpu-model-comparison", QEMU_CAPS_QUERY_CPU_MODEL_COMPARISON },
-    { "block-export-add", QEMU_CAPS_BLOCK_EXPORT_ADD },
 };

 struct virQEMUCapsStringFlags virQEMUCapsMigration[] = {
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 7e07ac486d..63e947c1b3 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -246,7 +246,6 @@
   <flag name='blockdev-hostdev-scsi'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
-  <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
   <version>5001050</version>
   <kvmVersion>0</kvmVersion>
-- 
2.26.2
Re: [PATCH 1/3] qemu: capabilities: Disable detection of QEMU_CAPS_BLOCK_EXPORT_ADD
Posted by Eric Blake 5 years, 3 months ago 
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@redhat.com>
> ---
>  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@redhat.com>

Safe for libvirt now no matter what happens in qemu's soft freeze this week.

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org
Re: [PATCH 1/3] qemu: capabilities: Disable detection of QEMU_CAPS_BLOCK_EXPORT_ADD
Posted by Peter Krempa 5 years, 3 months ago 
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@redhat.com>
> > ---
> >  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@redhat.com>
> 
> 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.
Re: [PATCH 1/3] qemu: capabilities: Disable detection of QEMU_CAPS_BLOCK_EXPORT_ADD
Posted by Eric Blake 5 years, 3 months ago 
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@redhat.com>
>>> ---
>>>  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@redhat.com>
>>
>> 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):

commit cbad81cef8cc7b220f04600997ea29d7302bae00
Author: Eric Blake <eblake@redhat.com>
Date:   Tue Oct 27 00:05:49 2020 -0500

    nbd: Update qapi to support exporting multiple bitmaps

    Since 'block-export-add' is new to 5.2, we can still tweak the
    interface; there, allowing 'bitmaps':['str'] is nicer than
    'bitmap':'str'.  This wires up the qapi and qemu-nbd changes to permit
    passing multiple bitmaps as distinct metadata contexts that the NBD
    client may request, but the actual support for more than one will
    require a further patch to the server.

    Note that there are no changes made to the existing deprecated
    'nbd-server-add' command; this required splitting the QAPI type
    BlockExportOptionsNbd, which fortunately does not affect QMP
    introspection.

    Signed-off-by: Eric Blake <eblake@redhat.com>
    Message-Id: <20201027050556.269064-5-eblake@redhat.com>
    Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
    Reviewed-by: Peter Krempa <pkrempa@redhat.com>


-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org
Re: [PATCH 1/3] qemu: capabilities: Disable detection of QEMU_CAPS_BLOCK_EXPORT_ADD
Posted by Peter Krempa 5 years, 3 months ago 
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@redhat.com>
> >>> ---
> >>>  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@redhat.com>
> >>
> >> 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

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.