Re: [Qemu-devel] [PATCH v5 5/6] qapi: new qmp command nbd-server-add-bitmap

[Eric Blake <eblake@redhat.com>]

On 06/20/2018 09:13 AM, Vladimir Sementsov-Ogievskiy wrote:
> 20.06.2018 14:26, Eric Blake wrote:
>> On 06/09/2018 10:17 AM, Vladimir Sementsov-Ogievskiy wrote:
>>> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
>>> ---
>>>   qapi/block.json | 23 +++++++++++++++++++++++
>>>   blockdev-nbd.c  | 23 +++++++++++++++++++++++
>>>   2 files changed, 46 insertions(+)
>>
>> I'm tempted to temporarily name this x-nbd-server-add-bitmap, until I 
>> have the counterpart Libvirt patches tested, just in case testing 
>> turns up any tweaks we need to the interface.
>>

>>> +# @bitmap-export-name: How the bitmap will be seen by nbd clients
>>> +#                      (default @bitmap)
>>
>> Do we really need the flexibility of naming the bitmap differently to 
>> the NBD client than we do in qemu?
> 
> It was needed for our backup-api implementation. Nikolay?

In fact, if we include the ability now, we can't remove it later (unless 
we use the x- prefix); but if we omit it now, we can add it later 
(regardless of using the x- prefix).  So I've gone ahead and added the 
x- prefix; here's what I'm squashing, along with:

Reviewed-by: Eric Blake <eblake@redhat.com>

diff --git i/qapi/block.json w/qapi/block.json
index ddbca2e286c..ca807f176ae 100644
--- i/qapi/block.json
+++ w/qapi/block.json
@@ -269,7 +269,7 @@
    'data': {'name': 'str', '*mode': 'NbdServerRemoveMode'} }

  ##
-# @nbd-server-add-bitmap:
+# @x-nbd-server-add-bitmap:
  #
  # Expose a dirty bitmap associated with the selected export. The 
bitmap search
  # starts at the device attached to the export, and includes all 
backing files.
@@ -288,7 +288,7 @@
  #
  # Since: 3.0
  ##
-  { 'command': 'nbd-server-add-bitmap',
+  { 'command': 'x-nbd-server-add-bitmap',
      'data': {'name': 'str', 'bitmap': 'str', '*bitmap-export-name': 
'str'} }

  ##
diff --git i/blockdev-nbd.c w/blockdev-nbd.c
index 6b0c50732c1..1ef11041a73 100644
--- i/blockdev-nbd.c
+++ w/blockdev-nbd.c
@@ -221,10 +221,10 @@ void qmp_nbd_server_stop(Error **errp)
      nbd_server = NULL;
  }

-void qmp_nbd_server_add_bitmap(const char *name, const char *bitmap,
-                               bool has_bitmap_export_name,
-                               const char *bitmap_export_name,
-                               Error **errp)
+void qmp_x_nbd_server_add_bitmap(const char *name, const char *bitmap,
+                                 bool has_bitmap_export_name,
+                                 const char *bitmap_export_name,
+                                 Error **errp)
  {
      NBDExport *exp;



-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org