From: "Denis V. Lunev" <den@openvz.org>
To: qemu-block@nongnu.org, qemu-devel@nongnu.org
Cc: den@openvz.org, Eric Blake <eblake@redhat.com>,
Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Subject: [PATCH 6/5] qemu-nbd: make verbose bool and local variable in main()
Date: Mon, 17 Jul 2023 22:25:20 +0200 [thread overview]
Message-ID: <20230717202520.236999-1-den@openvz.org> (raw)
In-Reply-To: <20230717145544.194786-1-den@openvz.org>
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>
---
qemu-nbd.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/qemu-nbd.c b/qemu-nbd.c
index cd0e965705..958e5688c0 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 {
@@ -583,6 +583,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;
@@ -747,7 +748,7 @@ int main(int argc, char **argv)
}
break;
case 'v':
- verbose = 1;
+ verbose = true;
break;
case 'V':
version(argv[0]);
@@ -1148,6 +1149,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);
--
2.34.1
next prev parent reply other threads:[~2023-07-17 20:26 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-17 14:55 [PATCH v2 0/5] qemu-nbd: fix regression with qemu-nbd --fork run over ssh Denis V. Lunev
2023-07-17 14:55 ` [PATCH 1/5] qemu-nbd: pass structure into nbd_client_thread instead of plain char* Denis V. Lunev
2023-07-17 18:56 ` Eric Blake
2023-07-17 14:55 ` [PATCH 2/5] qemu-nbd: fix regression with qemu-nbd --fork run over ssh Denis V. Lunev
2023-07-17 19:04 ` Eric Blake
2023-07-17 20:26 ` Denis V. Lunev
2023-08-14 14:14 ` Kevin Wolf
2023-08-15 10:40 ` Denis V. Lunev
2023-08-15 12:17 ` Denis V. Lunev
2023-08-15 14:59 ` Kevin Wolf
2023-08-15 15:21 ` Peter Maydell
2023-08-15 16:08 ` Eric Blake
2023-07-17 14:55 ` [PATCH 3/5] qemu-nbd: properly report error on error in dup2() after qemu_daemon() Denis V. Lunev
2023-07-18 17:45 ` Eric Blake
2023-07-17 14:55 ` [PATCH 4/5] qemu-nbd: properly report error if qemu_daemon() is failed Denis V. Lunev
2023-07-18 17:50 ` Eric Blake
2023-07-17 14:55 ` [PATCH 5/5] qemu-nbd: handle dup2() error when qemu-nbd finished setup process Denis V. Lunev
2023-07-18 17:52 ` Eric Blake
2023-07-17 20:25 ` Denis V. Lunev [this message]
2023-07-18 17:53 ` [PATCH 6/5] qemu-nbd: make verbose bool and local variable in main() Eric Blake
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=20230717202520.236999-1-den@openvz.org \
--to=den@openvz.org \
--cc=eblake@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@yandex-team.ru \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).