[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/17] vhost-user-blk-test: close fork child file descriptors
From: |
Michael S. Tsirkin |
Subject: |
[PULL 10/17] vhost-user-blk-test: close fork child file descriptors |
Date: |
Sun, 15 Nov 2020 17:27:36 -0500 |
From: Stefan Hajnoczi <stefanha@redhat.com>
Do not leave stdin and stdout open after fork. stdout is the
tap-driver.pl pipe. If we keep the pipe open then tap-driver.pl will not
detect that qos-test has terminated and it will hang.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20201111124331.1393747-6-stefanha@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
tests/qtest/vhost-user-blk-test.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/tests/qtest/vhost-user-blk-test.c
b/tests/qtest/vhost-user-blk-test.c
index f05f14c192..4019a72ac0 100644
--- a/tests/qtest/vhost-user-blk-test.c
+++ b/tests/qtest/vhost-user-blk-test.c
@@ -749,6 +749,15 @@ static char *start_vhost_user_blk(GString *cmd_line, int
vus_instances,
storage_daemon_command->str);
pid_t pid = fork();
if (pid == 0) {
+ /*
+ * Close standard file descriptors so tap-driver.pl pipe detects when
+ * our parent terminates.
+ */
+ close(0);
+ close(1);
+ open("/dev/null", O_RDONLY);
+ open("/dev/null", O_WRONLY);
+
execlp("/bin/sh", "sh", "-c", storage_daemon_command->str, NULL);
exit(1);
}
--
MST
- [PULL 08/17] libqtest: add qtest_socket_server(), (continued)
- [PULL 08/17] libqtest: add qtest_socket_server(), Michael S. Tsirkin, 2020/11/15
- [PULL 06/17] test: new qTest case to test the vhost-user-blk-server, Michael S. Tsirkin, 2020/11/15
- [PULL 09/17] vhost-user-blk-test: rename destroy_drive() to destroy_file(), Michael S. Tsirkin, 2020/11/15
- [PULL 11/17] vhost-user-blk-test: drop unused return value, Michael S. Tsirkin, 2020/11/15
- [PULL 12/17] vhost-user-blk-test: fix races by using fd passing, Michael S. Tsirkin, 2020/11/15
- [PULL 13/17] block/export: port virtio-blk discard/write zeroes input validation, Michael S. Tsirkin, 2020/11/15
- [PULL 14/17] vhost-user-blk-test: test discard/write zeroes invalid inputs, Michael S. Tsirkin, 2020/11/15
- [PULL 15/17] block/export: port virtio-blk read/write range check, Michael S. Tsirkin, 2020/11/15
- [PULL 16/17] contrib/libvhost-user: Fix bad printf format specifiers, Michael S. Tsirkin, 2020/11/15
- [PULL 04/17] configure: mark vhost-user Linux-only, Michael S. Tsirkin, 2020/11/15
- [PULL 10/17] vhost-user-blk-test: close fork child file descriptors,
Michael S. Tsirkin <=
- [PULL 17/17] vhost-user-blk/scsi: Fix broken error handling for socket call, Michael S. Tsirkin, 2020/11/15
- Re: [PULL 00/17] pc,vhost: fixes, new test, Peter Maydell, 2020/11/16