[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/13] qemu-nbd: put saddr into into struct NbdClientOpts
From: |
Eric Blake |
Subject: |
[PULL 10/13] qemu-nbd: put saddr into into struct NbdClientOpts |
Date: |
Thu, 7 Sep 2023 20:35:46 -0500 |
From: "Denis V. Lunev" <den@openvz.org>
We pass other parameters into nbd_client_thread() in this way. This patch
makes the code more consistent.
Signed-off-by: Denis V. Lunev <den@openvz.org>
CC: Eric Blake <eblake@redhat.com>
CC: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Message-ID: <20230906093210.339585-5-den@openvz.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---
qemu-nbd.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/qemu-nbd.c b/qemu-nbd.c
index 16c59424f13..86bb2f04e24 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -73,7 +73,6 @@
#define MBR_SIZE 512
-static SocketAddress *saddr;
static int persistent = 0;
static enum { RUNNING, TERMINATE, TERMINATED } state;
static int shared = 1;
@@ -255,6 +254,7 @@ static int qemu_nbd_client_list(SocketAddress *saddr,
QCryptoTLSCreds *tls,
struct NbdClientOpts {
char *device;
char *srcpath;
+ SocketAddress *saddr;
bool fork_process;
bool verbose;
};
@@ -289,7 +289,7 @@ static void *nbd_client_thread(void *arg)
sioc = qio_channel_socket_new();
if (qio_channel_socket_connect_sync(sioc,
- saddr,
+ opts->saddr,
&local_error) < 0) {
error_report_err(local_error);
goto out;
@@ -591,6 +591,7 @@ int main(int argc, char **argv)
.verbose = false,
.device = NULL,
.srcpath = NULL,
+ .saddr = NULL,
};
#ifdef CONFIG_POSIX
@@ -892,8 +893,8 @@ int main(int argc, char **argv)
}
if (list) {
- saddr = nbd_build_socket_address(sockpath, bindto, port);
- return qemu_nbd_client_list(saddr, tlscreds,
+ opts.saddr = nbd_build_socket_address(sockpath, bindto, port);
+ return qemu_nbd_client_list(opts.saddr, tlscreds,
tlshostname ? tlshostname : bindto);
}
@@ -1024,8 +1025,8 @@ int main(int argc, char **argv)
exit(EXIT_FAILURE);
}
#endif
- saddr = nbd_build_socket_address(sockpath, bindto, port);
- if (qio_net_listener_open_sync(server, saddr, backlog,
+ opts.saddr = nbd_build_socket_address(sockpath, bindto, port);
+ if (qio_net_listener_open_sync(server, opts.saddr, backlog,
&local_err) < 0) {
object_unref(OBJECT(server));
error_report_err(local_err);
--
2.41.0
- [PULL 00/13] NBD patches through 2023-09-07, Eric Blake, 2023/09/07
- [PULL 01/13] qemu-iotests/197: use more generic commands for formats other than qcow2, Eric Blake, 2023/09/07
- [PULL 02/13] nbd: drop unused nbd_receive_negotiate() aio_context argument, Eric Blake, 2023/09/07
- [PULL 04/13] io: check there are no qio_channel_yield() coroutines during ->finalize(), Eric Blake, 2023/09/07
- [PULL 03/13] nbd: drop unused nbd_start_negotiate() aio_context argument, Eric Blake, 2023/09/07
- [PULL 07/13] qemu-nbd: improve error message for dup2 error, Eric Blake, 2023/09/07
- [PULL 05/13] io: follow coroutine AioContext in qio_channel_yield(), Eric Blake, 2023/09/07
- [PULL 06/13] util/iov: Avoid dynamic stack allocation, Eric Blake, 2023/09/07
- [PULL 08/13] qemu-nbd: define struct NbdClientOpts when HAVE_NBD_DEVICE is not defined, Eric Blake, 2023/09/07
- [PULL 09/13] qemu-nbd: move srcpath into struct NbdClientOpts, Eric Blake, 2023/09/07
- [PULL 10/13] qemu-nbd: put saddr into into struct NbdClientOpts,
Eric Blake <=
- [PULL 11/13] qemu-nbd: invent nbd_client_release_pipe() helper, Eric Blake, 2023/09/07
- [PULL 13/13] qemu-nbd: document -v behavior in respect to --fork in man, Eric Blake, 2023/09/07
- [PULL 12/13] qemu-nbd: Restore "qemu-nbd -v --fork" output, Eric Blake, 2023/09/07