[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 13/26] tests: replace pipe() with g_unix_open_pipe(CLOEXEC)
From: |
marcandre . lureau |
Subject: |
[PATCH v2 13/26] tests: replace pipe() with g_unix_open_pipe(CLOEXEC) |
Date: |
Tue, 26 Apr 2022 13:27:02 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
tests/qtest/ivshmem-test.c | 5 +++--
tests/unit/test-io-channel-file.c | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/qtest/ivshmem-test.c b/tests/qtest/ivshmem-test.c
index bfc91d1719d2..e23a97fa8ef4 100644
--- a/tests/qtest/ivshmem-test.c
+++ b/tests/qtest/ivshmem-test.c
@@ -304,6 +304,7 @@ static void setup_vm_with_server(IVState *s, int nvectors)
static void test_ivshmem_server(void)
{
+ g_autoptr(GError) err = NULL;
IVState state1, state2, *s1, *s2;
ServerThread thread;
IvshmemServer server;
@@ -320,8 +321,8 @@ static void test_ivshmem_server(void)
g_assert_cmpint(ret, ==, 0);
thread.server = &server;
- ret = pipe(thread.pipe);
- g_assert_cmpint(ret, ==, 0);
+ g_unix_open_pipe(thread.pipe, FD_CLOEXEC, &err);
+ g_assert_no_error(err);
thread.thread = g_thread_new("ivshmem-server", server_thread, &thread);
g_assert(thread.thread != NULL);
diff --git a/tests/unit/test-io-channel-file.c
b/tests/unit/test-io-channel-file.c
index 29038e67b64d..1977006ce922 100644
--- a/tests/unit/test-io-channel-file.c
+++ b/tests/unit/test-io-channel-file.c
@@ -109,7 +109,7 @@ static void test_io_channel_pipe(bool async)
QIOChannelTest *test;
int fd[2];
- if (pipe(fd) < 0) {
+ if (!g_unix_open_pipe(fd, FD_CLOEXEC, NULL)) {
perror("pipe");
abort();
}
--
2.36.0
- Re: [PATCH v2 07/26] tests: make libqmp buildable for win32, (continued)
[PATCH v2 08/26] Use g_unix_set_fd_nonblocking(), marcandre . lureau, 2022/04/26
[PATCH v2 09/26] block: move fcntl_setfl(), marcandre . lureau, 2022/04/26
[PATCH v2 11/26] util: replace pipe()+cloexec with g_unix_open_pipe(), marcandre . lureau, 2022/04/26
[PATCH v2 10/26] Replace qemu_pipe() with g_unix_open_pipe(), marcandre . lureau, 2022/04/26
[PATCH v2 13/26] tests: replace pipe() with g_unix_open_pipe(CLOEXEC),
marcandre . lureau <=
[PATCH v2 12/26] qga: replace pipe() with g_unix_open_pipe(CLOEXEC), marcandre . lureau, 2022/04/26
[PATCH v2 14/26] os-posix: replace pipe()+cloexec with g_unix_open_pipe(CLOEXEC), marcandre . lureau, 2022/04/26
[PATCH v2 17/26] Replace fcntl(0_NONBLOCK) with g_unix_set_fd_nonblocking(), marcandre . lureau, 2022/04/26
[PATCH v2 16/26] io: replace pipe() with g_unix_open_pipe(CLOEXEC), marcandre . lureau, 2022/04/26
[PATCH v2 15/26] virtiofsd: replace pipe() with g_unix_open_pipe(CLOEXEC), marcandre . lureau, 2022/04/26