Commit 7dc570b3 authored by Eric Blake's avatar Eric Blake
Browse files

nbd: Remove x-nbd-server-add-bitmap 



Now that nbd-server-add can do the same functionality (well, other
than making the exported bitmap name different than the underlying
bitamp - but we argued that was not essential, since it is just as
easy to create a new non-persistent bitmap with the desired name),
we no longer need the experimental separate command.

Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20190111194720.15671-7-eblake@redhat.com>
parent 5fcbeb06

blockdev-nbd.c

+0 −23
Original line number Diff line number Diff line
@@ -233,26 +233,3 @@ void qmp_nbd_server_stop(Error **errp) 
    nbd_server_free(nbd_server);

    nbd_server = NULL;

}
 


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;



    if (!nbd_server) {

        error_setg(errp, "NBD server not running");

        return;

    }



    exp = nbd_export_find(name);

    if (exp == NULL) {

        error_setg(errp, "Export '%s' is not found", name);

        return;

    }



    nbd_export_bitmap(exp, bitmap,

                      has_bitmap_export_name ? bitmap_export_name : bitmap,

                      errp);

}

qapi/block.json

+0 −23
Original line number Diff line number Diff line
@@ -301,29 +301,6 @@ 
{ 'command': 'nbd-server-remove',

  'data': {'name': 'str', '*mode': 'NbdServerRemoveMode'} }



##

# @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.

# The exported bitmap is then locked until the NBD export is removed.

#

# @name: Export name.

#

# @bitmap: Bitmap name to search for.

#

# @bitmap-export-name: How the bitmap will be seen by nbd clients

#                      (default @bitmap)

#

# Note: the client must use NBD_OPT_SET_META_CONTEXT with a query of

# "qemu:dirty-bitmap:NAME" (where NAME matches @bitmap-export-name) to access

# the exposed bitmap.

#

# Since: 3.0

##

  { 'command': 'x-nbd-server-add-bitmap',

    'data': {'name': 'str', 'bitmap': 'str', '*bitmap-export-name': 'str'} }



##

# @nbd-server-stop:

#