[vOther,1/1] qemu-nbd: Restore "qemu-nbd -v --fork" output

Commit Message

Denis V. Lunev Aug. 25, 2023, 7:29 p.m. UTC

Closing stderr earlier is good for daemonized qemu-nbd under ssh
earlier, but breaks the case where -v is being used to track what is
happening in the server, as in iotest 233.

When we know we are verbose, we should preserve original stderr and
restore it once the setup stage is done. This commit restores the
original behavior with -v option. In this case original output
inside the test is kept intact.

Reported-by: Kevin Wolf <[e-mail]>
Signed-off-by: Denis V. Lunev <[e-mail]>
CC: Eric Blake <[e-mail]>
CC: Vladimir Sementsov-Ogievskiy <[e-mail]>
CC: Hanna Reitz <[e-mail]>
Fixes: 5c56dd27a2 ("qemu-nbd: fix regression with qemu-nbd --fork run over ssh")
---
After lengthy thoughts there is a different proposal to fix the
introduced regression. Under this approach we could keep original
test output. This looks important to me.

Eric, do you have any opinion?

Thank you in advance,
    Den

 qemu-nbd.c | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

Patch

diff --git a/qemu-nbd.c b/qemu-nbd.c
index aaccaa3318..8322bd5b5b 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -275,6 +275,7 @@  struct NbdClientOpts {
     char *device;
     bool fork_process;
     bool verbose;
+    int stderr;
 };
 
 static void *nbd_client_thread(void *arg)
@@ -323,11 +324,14 @@  static void *nbd_client_thread(void *arg)
                 opts->device, srcpath);
     } else {
         /* Close stderr so that the qemu-nbd process exits.  */
-        if (dup2(STDOUT_FILENO, STDERR_FILENO) < 0) {
+        if (dup2(opts->stderr, STDERR_FILENO) < 0) {
             error_report("Could not set stderr to /dev/null: %s",
                          strerror(errno));
             exit(EXIT_FAILURE);
         }
+        if (opts->stderr != STDOUT_FILENO) {
+            close(opts->stderr);
+        }
     }
 
     if (nbd_client(fd) < 0) {
@@ -590,7 +594,9 @@  int main(int argc, char **argv)
     const char *selinux_label = NULL;
     BlockExportOptions *export_opts;
 #if HAVE_NBD_DEVICE
-    struct NbdClientOpts opts;
+    struct NbdClientOpts opts = {
+        .stderr = STDOUT_FILENO,
+    };
 #endif
 
 #ifdef CONFIG_POSIX
@@ -944,6 +950,15 @@  int main(int argc, char **argv)
 
             close(stderr_fd[0]);
 
+            /* Remember parent's stderr if we will be restoring it. */
+            if (verbose /* fork_process is set */) {
+                opts.stderr = dup(STDERR_FILENO);
+                if (opts.stderr < 0) {
+                    error_report("Could not dup stdedd: %s", strerror(errno));
+                    exit(EXIT_FAILURE);
+                }
+            }
+
             ret = qemu_daemon(1, 0);
             saved_errno = errno;    /* dup2 will overwrite error below */
 
@@ -1180,11 +1195,14 @@  int main(int argc, char **argv)
     }
 
     if (fork_process) {
-        if (dup2(STDOUT_FILENO, STDERR_FILENO) < 0) {
+        if (dup2(opts.stderr, STDERR_FILENO) < 0) {
             error_report("Could not set stderr to /dev/null: %s",
                          strerror(errno));
             exit(EXIT_FAILURE);
         }
+        if (opts.stderr != STDOUT_FILENO) {
+            close(opts.stderr);
+        }
     }
 
     state = RUNNING;