From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Mon, 25 Apr 2022 13:39:06 +0000 (+0400)
Subject: qga: replace qemu_set_nonblock()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b0a8f9adfed871728154b0064a28e34b6670f9f2;p=qemu.git

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 <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---

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) {