From ed78331ddafeca55f45ce9ce8bec6c7660a6d621 Mon Sep 17 00:00:00 2001 From: Marc-André Lureau Date: Fri, 22 Apr 2022 14:46:36 +0400 Subject: qga: replace pipe() with g_unix_open_pipe(CLOEXEC) Suggested-by: Daniel P. Berrangé Signed-off-by: Marc-André Lureau Reviewed-by: Daniel P. Berrangé --- qga/commands-posix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qga/commands-posix.c') diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 77f4672ca2..094487c2c3 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -2529,7 +2529,7 @@ void qmp_guest_set_user_password(const char *username, goto out; } - if (pipe(datafd) < 0) { + if (!g_unix_open_pipe(datafd, FD_CLOEXEC, NULL)) { error_setg(errp, "cannot create pipe FDs"); goto out; } -- cgit v1.2.3-55-g7522 From b0a8f9adfed871728154b0064a28e34b6670f9f2 Mon Sep 17 00:00:00 2001 From: Marc-André Lureau Date: Mon, 25 Apr 2022 17:39:06 +0400 Subject: qga: replace qemu_set_nonblock() The call is POSIX-specific. Use the dedicated GLib API. (this is a preliminary patch before renaming qemu_set_nonblock()) Signed-off-by: Marc-André Lureau Reviewed-by: Daniel P. Berrangé --- qga/commands-posix.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'qga/commands-posix.c') diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 094487c2c3..78f2f21001 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -404,7 +404,11 @@ int64_t qmp_guest_file_open(const char *path, bool has_mode, const char *mode, /* set fd non-blocking to avoid common use cases (like reading from a * named pipe) from hanging the agent */ - qemu_set_nonblock(fileno(fh)); + if (!g_unix_set_fd_nonblocking(fileno(fh), true, NULL)) { + fclose(fh); + error_setg_errno(errp, errno, "Failed to set FD nonblocking"); + return -1; + } handle = guest_file_handle_add(fh, errp); if (handle < 0) { -- cgit v1.2.3-55-g7522