From: Eric Blake <eblake@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Denis V. Lunev" <den@openvz.org>,
Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>,
qemu-block@nongnu.org (open list:Network Block Dev...)
Subject: [PULL 11/13] qemu-nbd: invent nbd_client_release_pipe() helper
Date: Thu, 7 Sep 2023 20:35:47 -0500 [thread overview]
Message-ID: <20230908013535.990731-26-eblake@redhat.com> (raw)
In-Reply-To: <20230908013535.990731-15-eblake@redhat.com>
From: "Denis V. Lunev" <den@openvz.org>
Move the code from main() and nbd_client_thread() into the specific
helper. This code is going to be grown.
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-6-den@openvz.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---
qemu-nbd.c | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/qemu-nbd.c b/qemu-nbd.c
index 86bb2f04e24..7c4e22def17 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -259,6 +259,16 @@ struct NbdClientOpts {
bool verbose;
};
+static void nbd_client_release_pipe(void)
+{
+ /* Close stderr so that the qemu-nbd process exits. */
+ if (dup2(STDOUT_FILENO, STDERR_FILENO) < 0) {
+ error_report("Could not release pipe to parent: %s",
+ strerror(errno));
+ exit(EXIT_FAILURE);
+ }
+}
+
#if HAVE_NBD_DEVICE
static void *show_parts(void *arg)
{
@@ -322,12 +332,7 @@ static void *nbd_client_thread(void *arg)
fprintf(stderr, "NBD device %s is now connected to %s\n",
opts->device, opts->srcpath);
} else {
- /* Close stderr so that the qemu-nbd process exits. */
- if (dup2(STDOUT_FILENO, STDERR_FILENO) < 0) {
- error_report("Could not release pipe to parent: %s",
- strerror(errno));
- exit(EXIT_FAILURE);
- }
+ nbd_client_release_pipe();
}
if (nbd_client(fd) < 0) {
@@ -1176,11 +1181,7 @@ int main(int argc, char **argv)
}
if (opts.fork_process) {
- if (dup2(STDOUT_FILENO, STDERR_FILENO) < 0) {
- error_report("Could not release pipe to parent: %s",
- strerror(errno));
- exit(EXIT_FAILURE);
- }
+ nbd_client_release_pipe();
}
state = RUNNING;
--
2.41.0
next prev parent reply other threads:[~2023-09-08 1:37 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-08 1:35 [PULL 00/13] NBD patches through 2023-09-07 Eric Blake
2023-09-08 1:35 ` [PULL 01/13] qemu-iotests/197: use more generic commands for formats other than qcow2 Eric Blake
2023-09-08 1:35 ` [PULL 02/13] nbd: drop unused nbd_receive_negotiate() aio_context argument Eric Blake
2023-09-08 1:35 ` [PULL 03/13] nbd: drop unused nbd_start_negotiate() " Eric Blake
2023-09-08 1:35 ` [PULL 04/13] io: check there are no qio_channel_yield() coroutines during ->finalize() Eric Blake
2023-09-08 1:35 ` [PULL 05/13] io: follow coroutine AioContext in qio_channel_yield() Eric Blake
2023-09-08 1:35 ` [PULL 06/13] util/iov: Avoid dynamic stack allocation Eric Blake
2023-09-08 1:35 ` [PULL 07/13] qemu-nbd: improve error message for dup2 error Eric Blake
2023-09-08 1:35 ` [PULL 08/13] qemu-nbd: define struct NbdClientOpts when HAVE_NBD_DEVICE is not defined Eric Blake
2023-09-08 1:35 ` [PULL 09/13] qemu-nbd: move srcpath into struct NbdClientOpts Eric Blake
2023-09-08 1:35 ` [PULL 10/13] qemu-nbd: put saddr into " Eric Blake
2023-09-08 1:35 ` Eric Blake [this message]
2023-09-08 1:35 ` [PULL 12/13] qemu-nbd: Restore "qemu-nbd -v --fork" output Eric Blake
2023-09-08 11:03 ` Stefan Hajnoczi
2023-09-08 11:24 ` Denis V. Lunev
2023-09-08 11:42 ` Denis V. Lunev
2023-09-08 12:09 ` Eric Blake
2023-09-08 1:35 ` [PULL 13/13] qemu-nbd: document -v behavior in respect to --fork in man 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=20230908013535.990731-26-eblake@redhat.com \
--to=eblake@redhat.com \
--cc=den@openvz.org \
--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).