From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35868) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zr8Mh-0002Z8-H8 for qemu-devel@nongnu.org; Tue, 27 Oct 2015 13:49:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zr8Mc-0005TV-S1 for qemu-devel@nongnu.org; Tue, 27 Oct 2015 13:48:55 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:44767 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zr8Mc-0005TD-FI for qemu-devel@nongnu.org; Tue, 27 Oct 2015 13:48:50 -0400 From: "Denis V. Lunev" Date: Tue, 27 Oct 2015 20:48:41 +0300 Message-Id: <1445968123-1773-2-git-send-email-den@openvz.org> In-Reply-To: <1445968123-1773-1-git-send-email-den@openvz.org> References: <1445968123-1773-1-git-send-email-den@openvz.org> Subject: [Qemu-devel] [PATCH 1/3] qga: drop hand-made guest_file_toggle_flags helper List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Denis V. Lunev" , qemu-devel@nongnu.org, Michael Roth We'd better use generic qemu_set_nonblock directly. Signed-off-by: Denis V. Lunev Reviewed-by: Yuri Pudgorodskiy Reviewed-by: Eric Blake CC: Michael Roth --- qga/commands-posix.c | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 67a173a..0ebd473 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -28,6 +28,7 @@ #include "qapi/qmp/qerror.h" #include "qemu/queue.h" #include "qemu/host-utils.h" +#include "qemu/sockets.h" #ifndef CONFIG_HAS_ENVIRON #ifdef __APPLE__ @@ -385,27 +386,6 @@ safe_open_or_create(const char *path, const char *mode, Error **errp) return NULL; } -static int guest_file_toggle_flags(int fd, int flags, bool set, Error **err) -{ - int ret, old_flags; - - old_flags = fcntl(fd, F_GETFL); - if (old_flags == -1) { - error_setg_errno(err, errno, QERR_QGA_COMMAND_FAILED, - "failed to fetch filehandle flags"); - return -1; - } - - ret = fcntl(fd, F_SETFL, set ? (old_flags | flags) : (old_flags & ~flags)); - if (ret == -1) { - error_setg_errno(err, errno, QERR_QGA_COMMAND_FAILED, - "failed to set filehandle flags"); - return -1; - } - - return ret; -} - int64_t qmp_guest_file_open(const char *path, bool has_mode, const char *mode, Error **errp) { @@ -426,10 +406,7 @@ 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 */ - if (guest_file_toggle_flags(fileno(fh), O_NONBLOCK, true, errp) < 0) { - fclose(fh); - return -1; - } + qemu_set_nonblock(fileno(fh)); handle = guest_file_handle_add(fh, errp); if (handle < 0) { -- 2.1.4