From: Eric Blake <eblake@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Daniel P . Berrangé" <berrange@redhat.com>,
"open list:Network Block Dev..." <qemu-block@nongnu.org>
Subject: [PULL 02/14] qemu-nbd: Permit --shared=0 for unlimited clients
Date: Fri, 12 Feb 2021 14:16:07 -0600 [thread overview]
Message-ID: <20210212201619.1388255-3-eblake@redhat.com> (raw)
In-Reply-To: <20210212201619.1388255-1-eblake@redhat.com>
This gives us better feature parity with QMP nbd-server-start, where
max-connections defaults to 0 for unlimited.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20210209152759.209074-3-eblake@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---
docs/tools/qemu-nbd.rst | 4 ++--
qemu-nbd.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/docs/tools/qemu-nbd.rst b/docs/tools/qemu-nbd.rst
index fe41336dc550..ee862fa0bc02 100644
--- a/docs/tools/qemu-nbd.rst
+++ b/docs/tools/qemu-nbd.rst
@@ -136,8 +136,8 @@ driver options if ``--image-opts`` is specified.
.. option:: -e, --shared=NUM
Allow up to *NUM* clients to share the device (default
- ``1``). Safe for readers, but for now, consistency is not
- guaranteed between multiple writers.
+ ``1``), 0 for unlimited. Safe for readers, but for now,
+ consistency is not guaranteed between multiple writers.
.. option:: -t, --persistent
diff --git a/qemu-nbd.c b/qemu-nbd.c
index 1a340ea4858d..b1b9430a8f54 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -328,7 +328,7 @@ static void *nbd_client_thread(void *arg)
static int nbd_can_accept(void)
{
- return state == RUNNING && nb_fds < shared;
+ return state == RUNNING && (shared == 0 || nb_fds < shared);
}
static void nbd_update_server_watch(void);
@@ -707,7 +707,7 @@ int main(int argc, char **argv)
break;
case 'e':
if (qemu_strtoi(optarg, NULL, 0, &shared) < 0 ||
- shared < 1) {
+ shared < 0) {
error_report("Invalid shared device number '%s'", optarg);
exit(EXIT_FAILURE);
}
@@ -966,7 +966,7 @@ int main(int argc, char **argv)
if (socket_activation == 0) {
int backlog;
- if (persistent) {
+ if (persistent || shared == 0) {
backlog = SOMAXCONN;
} else {
backlog = MIN(shared, SOMAXCONN);
--
2.30.1
next prev parent reply other threads:[~2021-02-12 20:21 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-12 20:16 [PULL 00/14] NBD patches through 2021-02-12 Eric Blake
2021-02-12 20:16 ` [PULL 01/14] qemu-nbd: Use SOMAXCONN for socket listen() backlog Eric Blake
2021-02-12 20:16 ` Eric Blake [this message]
2021-02-12 20:16 ` [PULL 03/14] iotests/210: Fix reference output Eric Blake
2021-02-12 20:16 ` [PULL 04/14] io: error_prepend() in qio_channel_readv_full_all() causes segfault Eric Blake
2021-02-12 20:16 ` [PULL 05/14] block: add new BlockDriver handler: bdrv_cancel_in_flight Eric Blake
2021-02-12 20:16 ` [PULL 06/14] block/nbd: implement .bdrv_cancel_in_flight Eric Blake
2021-02-12 20:16 ` [PULL 07/14] block/raw-format: implement .bdrv_cancel_in_flight handler Eric Blake
2021-02-12 20:16 ` [PULL 08/14] job: add .cancel handler for the driver Eric Blake
2021-02-12 20:16 ` [PULL 09/14] block/mirror: implement .cancel job handler Eric Blake
2021-02-12 20:16 ` [PULL 10/14] iotests/264: move to python unittest Eric Blake
2021-02-12 20:16 ` [PULL 11/14] iotests.py: qemu_nbd_popen: remove pid file after use Eric Blake
2021-02-12 20:16 ` [PULL 12/14] iotests/264: add mirror-cancel test-case Eric Blake
2021-02-12 20:16 ` [PULL 13/14] block/backup: implement .cancel job handler Eric Blake
2021-02-12 20:16 ` [PULL 14/14] iotests/264: add backup-cancel test-case Eric Blake
2021-02-13 18:16 ` [PULL 00/14] NBD patches through 2021-02-12 Peter Maydell
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=20210212201619.1388255-3-eblake@redhat.com \
--to=eblake@redhat.com \
--cc=berrange@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.