From: Eric Blake <eblake@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, vsementsov@virtuozzo.com,
qemu-block@nongnu.org, Markus Armbruster <armbru@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
Max Reitz <mreitz@redhat.com>,
mlevitsk@redhat.com
Subject: [PATCH v2 2/2] nbd: Allow description when creating NBD blockdev
Date: Thu, 10 Oct 2019 16:00:18 -0500 [thread overview]
Message-ID: <20191010210018.22000-3-eblake@redhat.com> (raw)
In-Reply-To: <20191010210018.22000-1-eblake@redhat.com>
Allow blockdevs to match the feature already present in qemu-nbd -D.
Enhance iotest 223 to cover it.
Signed-off-by: Eric Blake <eblake@redhat.com>
---
qapi/block.json | 8 +++++---
blockdev-nbd.c | 9 ++++++++-
monitor/hmp-cmds.c | 4 ++--
tests/qemu-iotests/223 | 2 +-
tests/qemu-iotests/223.out | 1 +
5 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/qapi/block.json b/qapi/block.json
index 145c268bb646..a6617b5bd03a 100644
--- a/qapi/block.json
+++ b/qapi/block.json
@@ -250,9 +250,11 @@
# @name: Export name. If unspecified, the @device parameter is used as the
# export name. (Since 2.12)
#
+# @description: Free-form description of the export. (Since 4.2)
+#
# @writable: Whether clients should be able to write to the device via the
# NBD connection (default false).
-
+#
# @bitmap: Also export the dirty bitmap reachable from @device, so the
# NBD client can use NBD_OPT_SET_META_CONTEXT with
# "qemu:dirty-bitmap:NAME" to inspect the bitmap. (since 4.0)
@@ -263,8 +265,8 @@
# Since: 1.3.0
##
{ 'command': 'nbd-server-add',
- 'data': {'device': 'str', '*name': 'str', '*writable': 'bool',
- '*bitmap': 'str' } }
+ 'data': {'device': 'str', '*name': 'str', '*description': 'str',
+ '*writable': 'bool', '*bitmap': 'str' } }
##
# @NbdServerRemoveMode:
diff --git a/blockdev-nbd.c b/blockdev-nbd.c
index 8c20baa4a4b9..de2f2ff71320 100644
--- a/blockdev-nbd.c
+++ b/blockdev-nbd.c
@@ -144,6 +144,7 @@ void qmp_nbd_server_start(SocketAddressLegacy *addr,
}
void qmp_nbd_server_add(const char *device, bool has_name, const char *name,
+ bool has_description, const char *description,
bool has_writable, bool writable,
bool has_bitmap, const char *bitmap, Error **errp)
{
@@ -167,6 +168,11 @@ void qmp_nbd_server_add(const char *device, bool has_name, const char *name,
return;
}
+ if (has_description && strlen(description) > NBD_MAX_STRING_SIZE) {
+ error_setg(errp, "description '%s' too long", description);
+ return;
+ }
+
if (nbd_export_find(name)) {
error_setg(errp, "NBD server already has export named '%s'", name);
return;
@@ -195,7 +201,8 @@ void qmp_nbd_server_add(const char *device, bool has_name, const char *name,
writable = false;
}
- exp = nbd_export_new(bs, 0, len, name, NULL, bitmap, !writable, !writable,
+ exp = nbd_export_new(bs, 0, len, name, description, bitmap,
+ !writable, !writable,
NULL, false, on_eject_blk, errp);
if (!exp) {
goto out;
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index b2551c16d129..574c6321c9d0 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -2352,7 +2352,7 @@ void hmp_nbd_server_start(Monitor *mon, const QDict *qdict)
continue;
}
- qmp_nbd_server_add(info->value->device, false, NULL,
+ qmp_nbd_server_add(info->value->device, false, NULL, false, NULL,
true, writable, false, NULL, &local_err);
if (local_err != NULL) {
@@ -2374,7 +2374,7 @@ void hmp_nbd_server_add(Monitor *mon, const QDict *qdict)
bool writable = qdict_get_try_bool(qdict, "writable", false);
Error *local_err = NULL;
- qmp_nbd_server_add(device, !!name, name, true, writable,
+ qmp_nbd_server_add(device, !!name, name, false, NULL, true, writable,
false, NULL, &local_err);
hmp_handle_error(mon, &local_err);
}
diff --git a/tests/qemu-iotests/223 b/tests/qemu-iotests/223
index 2ba3d8124b4f..06bdc96be48f 100755
--- a/tests/qemu-iotests/223
+++ b/tests/qemu-iotests/223
@@ -144,7 +144,7 @@ _send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add",
"bitmap":"b3"}}' "error" # Missing bitmap
_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add",
"arguments":{"device":"n", "name":"n2", "writable":true,
- "bitmap":"b2"}}' "return"
+ "description":"some text", "bitmap":"b2"}}' "return"
$QEMU_NBD_PROG -L -k "$TEST_DIR/nbd"
echo
diff --git a/tests/qemu-iotests/223.out b/tests/qemu-iotests/223.out
index 23b34fcd202e..16d597585b4f 100644
--- a/tests/qemu-iotests/223.out
+++ b/tests/qemu-iotests/223.out
@@ -49,6 +49,7 @@ exports available: 2
base:allocation
qemu:dirty-bitmap:b
export: 'n2'
+ description: some text
size: 4194304
flags: 0xced ( flush fua trim zeroes df cache fast-zero )
min block: 1
--
2.21.0
next prev parent reply other threads:[~2019-10-10 21:04 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-10 21:00 [PATCH v2 0/2] Better NBD string length handling Eric Blake
2019-10-10 21:00 ` [PATCH v2 1/2] nbd: Don't send oversize strings Eric Blake
2019-10-11 7:32 ` Vladimir Sementsov-Ogievskiy
2019-10-15 15:07 ` Eric Blake
2019-10-15 16:16 ` Vladimir Sementsov-Ogievskiy
2019-11-04 17:41 ` Maxim Levitsky
2019-11-13 15:47 ` Eric Blake
2019-10-10 21:00 ` Eric Blake [this message]
2019-10-11 7:41 ` [PATCH v2 2/2] nbd: Allow description when creating NBD blockdev Vladimir Sementsov-Ogievskiy
2019-11-04 17:53 ` Maxim Levitsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191010210018.22000-3-eblake@redhat.com \
--to=eblake@redhat.com \
--cc=armbru@redhat.com \
--cc=dgilbert@redhat.com \
--cc=kwolf@redhat.com \
--cc=mlevitsk@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).