2
0
Эх сурвалжийг харах

qemu-nbd: Close inherited stderr

Close inherited stderr of the parent if fork_process is false.
Otherwise no one will close it. (introduced by e6df58a5)

This only affected 'qemu-nbd -c /dev/nbd0'.

Signed-off-by: Raphael Pour <raphael.pour@hetzner.com>
Message-Id: <d8ddc993-9816-836e-a3de-c6edab9d9c49@hetzner.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
[eblake: Enhance commit message]
Signed-off-by: Eric Blake <eblake@redhat.com>
Raphael Pour 5 жил өмнө
parent
commit
0eaf453ebf
1 өөрчлөгдсөн 5 нэмэгдсэн , 1 устгасан
  1. 5 1
      qemu-nbd.c

+ 5 - 1
qemu-nbd.c

@@ -916,7 +916,11 @@ int main(int argc, char **argv)
         } else if (pid == 0) {
         } else if (pid == 0) {
             close(stderr_fd[0]);
             close(stderr_fd[0]);
 
 
-            old_stderr = dup(STDERR_FILENO);
+            /* Remember parent's stderr if we will be restoring it. */
+            if (fork_process) {
+                old_stderr = dup(STDERR_FILENO);
+            }
+
             ret = qemu_daemon(1, 0);
             ret = qemu_daemon(1, 0);
 
 
             /* Temporarily redirect stderr to the parent's pipe...  */
             /* Temporarily redirect stderr to the parent's pipe...  */