[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/6] qemu-nbd: Close inherited stderr
From: |
Eric Blake |
Subject: |
[PULL 1/6] qemu-nbd: Close inherited stderr |
Date: |
Mon, 18 May 2020 11:32:13 -0500 |
From: Raphael Pour <address@hidden>
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 <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
[eblake: Enhance commit message]
Signed-off-by: Eric Blake <address@hidden>
---
qemu-nbd.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/qemu-nbd.c b/qemu-nbd.c
index 4aa005004ebd..306e44fb0a4b 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... */
--
2.26.2
- [PULL 0/6] NBD patches for 2020-05-18, Eric Blake, 2020/05/18
- [PULL 4/6] qemu-img: refactor dump_map_entry JSON format output, Eric Blake, 2020/05/18
- [PULL 5/6] qemu-img: Add --start-offset and --max-length to map, Eric Blake, 2020/05/18
- [PULL 6/6] iotests: Enhance 223 to cover qemu-img map improvements, Eric Blake, 2020/05/18
- [PULL 1/6] qemu-nbd: Close inherited stderr,
Eric Blake <=
- [PULL 3/6] qemu-img: validate image length in img_map, Eric Blake, 2020/05/18
- [PULL 2/6] qemu_img: add cvtnum_full to print error reports, Eric Blake, 2020/05/18
- Re: [PULL 0/6] NBD patches for 2020-05-18, Eric Blake, 2020/05/18
- Re: [PULL 0/6] NBD patches for 2020-05-18, Peter Maydell, 2020/05/19