[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/12] vhost-user-blk-test: close fork child file descriptors
From: |
Stefan Hajnoczi |
Subject: |
[PATCH 10/12] vhost-user-blk-test: close fork child file descriptors |
Date: |
Tue, 27 Oct 2020 17:35:26 +0000 |
Do not leave stdin, stdout, stderr 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>
---
tests/qtest/vhost-user-blk-test.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/tests/qtest/vhost-user-blk-test.c
b/tests/qtest/vhost-user-blk-test.c
index f05f14c192..15daf8ccbc 100644
--- a/tests/qtest/vhost-user-blk-test.c
+++ b/tests/qtest/vhost-user-blk-test.c
@@ -749,6 +749,17 @@ 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);
+ close(2);
+ open("/dev/null", O_RDONLY);
+ open("/dev/null", O_WRONLY);
+ open("/dev/null", O_WRONLY);
+
execlp("/bin/sh", "sh", "-c", storage_daemon_command->str, NULL);
exit(1);
}
--
2.26.2
- [PATCH 00/12] block/export: vhost-user-blk server cleanups and tests, Stefan Hajnoczi, 2020/10/27
- [PATCH 01/12] libvhost-user: follow QEMU comment style, Stefan Hajnoczi, 2020/10/27
- [PATCH 02/12] configure: introduce --enable-vhost-user-blk-server, Stefan Hajnoczi, 2020/10/27
- [PATCH 03/12] block/export: make vhost-user-blk config space little-endian, Stefan Hajnoczi, 2020/10/27
- [PATCH 05/12] contrib/vhost-user-blk: fix get_config() information leak, Stefan Hajnoczi, 2020/10/27
- [PATCH 04/12] block/export: fix vhost-user-blk get_config() information leak, Stefan Hajnoczi, 2020/10/27
- [PATCH 07/12] tests/qtest: add multi-queue test case to vhost-user-blk-test, Stefan Hajnoczi, 2020/10/27
- [PATCH 10/12] vhost-user-blk-test: close fork child file descriptors,
Stefan Hajnoczi <=
- [PATCH 09/12] vhost-user-blk-test: rename destroy_drive() to destroy_file(), Stefan Hajnoczi, 2020/10/27
- [PATCH 06/12] test: new qTest case to test the vhost-user-blk-server, Stefan Hajnoczi, 2020/10/27
- [PATCH 08/12] libqtest: add qtest_socket_server(), Stefan Hajnoczi, 2020/10/27
- [PATCH 12/12] vhost-user-blk-test: fix races by using fd passing, Stefan Hajnoczi, 2020/10/27
- [PATCH 11/12] vhost-user-blk-test: drop unused return value, Stefan Hajnoczi, 2020/10/27
- Re: [PATCH 00/12] block/export: vhost-user-blk server cleanups and tests, Michael S. Tsirkin, 2020/10/30