Now that nbd-server-add can do the same functionality, we no
longer need the experimental separate command.
Signed-off-by: Eric Blake <ebl...@redhat.com>
---
qapi/block.json | 23 -----------------------
blockdev-nbd.c | 23 -----------------------
2 files changed, 46 deletions(-)
diff --git a/qapi/block.json b/qapi/block.json
index 4b336303d21..980682e69ea 100644
--- a/qapi/block.json
+++ b/qapi/block.json
@@ -306,29 +306,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:
#
diff --git a/blockdev-nbd.c b/blockdev-nbd.c
index cae9e802d48..faecde3b6e1 100644
--- a/blockdev-nbd.c
+++ b/blockdev-nbd.c
@@ -243,26 +243,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);
-}
--
2.20.1
