Skip to content

Commit

Permalink
qemu-nbd: Close inherited stderr
Browse files Browse the repository at this point in the history
Close inherited stderr of the parent if fork_process is false.
Otherwise no one will close it. (introduced by e6df58a)

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>
(cherry picked from commit 0eaf453)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
  • Loading branch information
Raphael Pour authored and mdroth committed Jun 10, 2020
1 parent d5691a6 commit ad56aec
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion qemu-nbd.c
Expand Up @@ -1022,7 +1022,11 @@ int main(int argc, char **argv)
} else if (pid == 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);

/* Temporarily redirect stderr to the parent's pipe... */
Expand Down

0 comments on commit ad56aec

Please sign in to comment.