aboutsummaryrefslogtreecommitdiff
path: root/qemu-nbd.c
diff options
context:
space:
mode:
authorRaphael Pour <raphael.pour@hetzner.com>2020-05-15 08:36:07 +0200
committerEric Blake <eblake@redhat.com>2020-05-18 11:02:05 -0500
commit0eaf453ebf6788885fbb5d40426b154ef8805407 (patch)
tree85991abf73cdfbcf93a9f17b7ef3947a4f7bc15e /qemu-nbd.c
parentdebe78ce14bf8f8940c2bdf3ef387505e9e035a9 (diff)
downloadqemu-0eaf453ebf6788885fbb5d40426b154ef8805407.zip
qemu-0eaf453ebf6788885fbb5d40426b154ef8805407.tar.gz
qemu-0eaf453ebf6788885fbb5d40426b154ef8805407.tar.bz2
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>
Diffstat (limited to 'qemu-nbd.c')
-rw-r--r--qemu-nbd.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/qemu-nbd.c b/qemu-nbd.c
index 4aa0050..306e44f 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -916,7 +916,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... */