SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

qemu-nbd: put saddr into into struct NbdClientOpts

Browse Source 
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>
This commit is contained in:
Denis V. Lunev 2023-09-06 11:32:06 +02:00 committed by Eric Blake
parent b18d72d723
commit b2cecdfee3
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qemu-nbd.c
View File

@ -73,7 +73,6 @@
#define MBR_SIZE 512 #define MBR_SIZE 512
static SocketAddress *saddr;
static int persistent = 0; static int persistent = 0;
static enum { RUNNING, TERMINATE, TERMINATED } state; static enum { RUNNING, TERMINATE, TERMINATED } state;
static int shared = 1; static int shared = 1;
@ -255,6 +254,7 @@ static int qemu_nbd_client_list(SocketAddress *saddr, QCryptoTLSCreds *tls,
struct NbdClientOpts { struct NbdClientOpts {
char *device; char *device;
char *srcpath; char *srcpath;
SocketAddress *saddr;
bool fork_process; bool fork_process;
bool verbose; bool verbose;
}; };
@ -289,7 +289,7 @@ static void *nbd_client_thread(void *arg)
sioc = qio_channel_socket_new(); sioc = qio_channel_socket_new();
if (qio_channel_socket_connect_sync(sioc, if (qio_channel_socket_connect_sync(sioc,
saddr, opts->saddr,
&local_error) < 0) { &local_error) < 0) {
error_report_err(local_error); error_report_err(local_error);
goto out; goto out;
@ -591,6 +591,7 @@ int main(int argc, char **argv)
.verbose = false, .verbose = false,
.device = NULL, .device = NULL,
.srcpath = NULL, .srcpath = NULL,
.saddr = NULL,
}; };
#ifdef CONFIG_POSIX #ifdef CONFIG_POSIX
@ -892,8 +893,8 @@ int main(int argc, char **argv)
} }
if (list) { if (list) {
saddr = nbd_build_socket_address(sockpath, bindto, port); opts.saddr = nbd_build_socket_address(sockpath, bindto, port);
return qemu_nbd_client_list(saddr, tlscreds, return qemu_nbd_client_list(opts.saddr, tlscreds,
tlshostname ? tlshostname : bindto); tlshostname ? tlshostname : bindto);
} }
@ -1024,8 +1025,8 @@ int main(int argc, char **argv)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
#endif #endif
saddr = nbd_build_socket_address(sockpath, bindto, port); opts.saddr = nbd_build_socket_address(sockpath, bindto, port);
if (qio_net_listener_open_sync(server, saddr, backlog, if (qio_net_listener_open_sync(server, opts.saddr, backlog,
&local_err) < 0) { &local_err) < 0) {
object_unref(OBJECT(server)); object_unref(OBJECT(server));
error_report_err(local_err); error_report_err(local_err);