qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Denis V. Lunev" <den@openvz.org>
To: qemu-devel@nongnu.org, qemu-block@nongnu.org
Cc: den@openvz.org, Eric Blake <eblake@redhat.com>,
	Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Subject: [PATCH 5/8] qemu-nbd: invent nbd_client_release_pipe() helper
Date: Wed,  6 Sep 2023 11:32:07 +0200	[thread overview]
Message-ID: <20230906093210.339585-6-den@openvz.org> (raw)
In-Reply-To: <20230906093210.339585-1-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>
---
 qemu-nbd.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/qemu-nbd.c b/qemu-nbd.c
index d0f8d8bad2..9f28e3ebda 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.34.1



  parent reply	other threads:[~2023-09-06  9:33 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-06  9:32 [PATCH v3 0/8] qemu-nbd: Restore "qemu-nbd -v --fork" output Denis V. Lunev
2023-09-06  9:32 ` [PATCH 1/8] qemu-nbd: improve error message for dup2 error Denis V. Lunev
2023-09-07 20:46   ` Eric Blake
2023-09-06  9:32 ` [PATCH 2/8] qemu-nbd: define struct NbdClientOpts when HAVE_NBD_DEVICE is not defined Denis V. Lunev
2023-09-07 21:35   ` Eric Blake
2023-09-06  9:32 ` [PATCH 3/8] qemu-nbd: move srcpath into struct NbdClientOpts Denis V. Lunev
2023-09-07 21:43   ` Eric Blake
2023-09-06  9:32 ` [PATCH 4/8] qemu-nbd: put saddr into " Denis V. Lunev
2023-09-07 21:48   ` Eric Blake
2023-09-06  9:32 ` Denis V. Lunev [this message]
2023-09-07 21:54   ` [PATCH 5/8] qemu-nbd: invent nbd_client_release_pipe() helper Eric Blake
2023-09-06  9:32 ` [PATCH 6/8] qemu-nbd: Restore "qemu-nbd -v --fork" output Denis V. Lunev
2023-09-07 21:59   ` Eric Blake
2023-09-06  9:32 ` [PATCH 7/8] qemu-nbd: document -v behavior in respect to --fork in man Denis V. Lunev
2023-09-07 22:01   ` Eric Blake
2023-09-07 22:03     ` Denis V. Lunev
2023-09-06  9:32 ` [PATCH 8/8] qemu-nbd: fix formatting in main() Denis V. Lunev
2023-09-07 22:15   ` 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=20230906093210.339585-6-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).