[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 6/8] nbd: Remove x-nbd-server-add-bitmap
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v3 6/8] nbd: Remove x-nbd-server-add-bitmap |
Date: |
Fri, 11 Jan 2019 13:47:18 -0600 |
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: Eric Blake <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
qapi/block.json | 23 -----------------------
blockdev-nbd.c | 23 -----------------------
2 files changed, 46 deletions(-)
diff --git a/qapi/block.json b/qapi/block.json
index 3d70420f763..5a79d639e8c 100644
--- a/qapi/block.json
+++ b/qapi/block.json
@@ -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:
#
diff --git a/blockdev-nbd.c b/blockdev-nbd.c
index ec8cf0ab8c3..cd86b38cdaa 100644
--- a/blockdev-nbd.c
+++ b/blockdev-nbd.c
@@ -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);
-}
--
2.20.1
- [Qemu-devel] [PATCH v3 3/8] nbd: Only require disabled bitmap for read-only exports, (continued)
- [Qemu-devel] [PATCH v3 3/8] nbd: Only require disabled bitmap for read-only exports, Eric Blake, 2019/01/11
- [Qemu-devel] [PATCH v3 4/8] nbd: Merge nbd_export_set_name into nbd_export_new, Eric Blake, 2019/01/11
- [Qemu-devel] [PATCH v3 7/8] nbd: Merge nbd_export_bitmap into nbd_export_new, Eric Blake, 2019/01/11
- [Qemu-devel] [PATCH v3 5/8] nbd: Allow bitmap export during QMP nbd-server-add, Eric Blake, 2019/01/11
- [Qemu-devel] [PATCH v3 1/8] nbd: Add some error case testing to iotests 223, Eric Blake, 2019/01/11
- [Qemu-devel] [PATCH v3 8/8] qemu-nbd: Add --bitmap=NAME option, Eric Blake, 2019/01/11
- [Qemu-devel] [PATCH v3 6/8] nbd: Remove x-nbd-server-add-bitmap,
Eric Blake <=
- Re: [Qemu-devel] [PATCH v3 0/8] Promote x-nbd-server-add-bitmap to stable, Eric Blake, 2019/01/11