ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Denis V. Lunev 2023-07-17 22:25:20 +02:00 committed by Eric Blake
parent 173776f74d
commit 414c0cf0e8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qemu-nbd.c
View File

@ -73,7 +73,6 @@
#define MBR_SIZE 512 #define MBR_SIZE 512
static int verbose;
static char *srcpath; static char *srcpath;
static SocketAddress *saddr; static SocketAddress *saddr;
static int persistent = 0; static int persistent = 0;
@ -275,6 +274,7 @@ static void *show_parts(void *arg)
struct NbdClientOpts { struct NbdClientOpts {
char *device; char *device;
bool fork_process; bool fork_process;
bool verbose;
}; };
static void *nbd_client_thread(void *arg) static void *nbd_client_thread(void *arg)
@ -318,7 +318,7 @@ static void *nbd_client_thread(void *arg)
/* update partition table */ /* update partition table */
pthread_create(&show_parts_thread, NULL, show_parts, opts->device); 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", fprintf(stderr, "NBD device %s is now connected to %s\n",
opts->device, srcpath); opts->device, srcpath);
} else { } else {
@ -582,6 +582,7 @@ int main(int argc, char **argv)
const char *tlshostname = NULL; const char *tlshostname = NULL;
bool imageOpts = false; bool imageOpts = false;
bool writethrough = false; /* Client will flush as needed. */ bool writethrough = false; /* Client will flush as needed. */
bool verbose = false;
bool fork_process = false; bool fork_process = false;
bool list = false; bool list = false;
unsigned socket_activation; unsigned socket_activation;
@ -746,7 +747,7 @@ int main(int argc, char **argv)
} }
break; break;
case 'v': case 'v':
verbose = 1; verbose = true;
break; break;
case 'V': case 'V':
version(argv[0]); version(argv[0]);
@ -1147,6 +1148,7 @@ int main(int argc, char **argv)
struct NbdClientOpts opts = { struct NbdClientOpts opts = {
.device = device, .device = device,
.fork_process = fork_process, .fork_process = fork_process,
.verbose = verbose,
}; };
ret = pthread_create(&client_thread, NULL, nbd_client_thread, &opts); ret = pthread_create(&client_thread, NULL, nbd_client_thread, &opts);