diff options
| author | Denis V. Lunev <den@openvz.org> | 2023-07-17 22:25:20 +0200 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2023-07-19 15:25:27 -0500 |
| commit | 414c0cf0e88b8cba1d4f5a6bc32f9796a66b5c26 (patch) | |
| tree | 996e7dd1890e0c7f3b323c1263fce35fa0cdf435 /qemu-nbd.c | |
| parent | 173776f74d072f375b3815a4beaa6ddc7bf26cab (diff) | |
qemu-nbd: make verbose bool and local variable in main()
Pass 'verbose' to nbd_client_thread() inside NbdClientOpts which looks
a little bit cleaner and make it bool as it is used as bool actually.
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: <20230717202520.236999-1-den@openvz.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'qemu-nbd.c')
| -rw-r--r-- | qemu-nbd.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/qemu-nbd.c b/qemu-nbd.c index e30c9ac179..5b2757920c 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -73,7 +73,6 @@ #define MBR_SIZE 512 -static int verbose; static char *srcpath; static SocketAddress *saddr; static int persistent = 0; @@ -275,6 +274,7 @@ static void *show_parts(void *arg) struct NbdClientOpts { char *device; bool fork_process; + bool verbose; }; static void *nbd_client_thread(void *arg) @@ -318,7 +318,7 @@ static void *nbd_client_thread(void *arg) /* update partition table */ pthread_create(&show_parts_thread, NULL, show_parts, opts->device); - if (verbose && !opts->fork_process) { + if (opts->verbose && !opts->fork_process) { fprintf(stderr, "NBD device %s is now connected to %s\n", opts->device, srcpath); } else { @@ -582,6 +582,7 @@ int main(int argc, char **argv) const char *tlshostname = NULL; bool imageOpts = false; bool writethrough = false; /* Client will flush as needed. */ + bool verbose = false; bool fork_process = false; bool list = false; unsigned socket_activation; @@ -746,7 +747,7 @@ int main(int argc, char **argv) } break; case 'v': - verbose = 1; + verbose = true; break; case 'V': version(argv[0]); @@ -1147,6 +1148,7 @@ int main(int argc, char **argv) struct NbdClientOpts opts = { .device = device, .fork_process = fork_process, + .verbose = verbose, }; ret = pthread_create(&client_thread, NULL, nbd_client_thread, &opts); |