From patchwork Wed Oct 7 10:59:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Denis V. Lunev" X-Patchwork-Id: 527255 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 2F4BD140D68 for ; Wed, 7 Oct 2015 22:00:18 +1100 (AEDT) Received: from localhost ([::1]:56986 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjmSG-00068M-8o for incoming@patchwork.ozlabs.org; Wed, 07 Oct 2015 07:00:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52988) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjmRm-0005JJ-CD for qemu-devel@nongnu.org; Wed, 07 Oct 2015 06:59:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZjmRk-0002SQ-0l for qemu-devel@nongnu.org; Wed, 07 Oct 2015 06:59:46 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:40789 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjmRj-0002Rv-M2 for qemu-devel@nongnu.org; Wed, 07 Oct 2015 06:59:43 -0400 Received: from irbis.sw.ru ([10.30.2.139]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id t97AxYk0027456; Wed, 7 Oct 2015 13:59:38 +0300 (MSK) From: "Denis V. Lunev" To: Date: Wed, 7 Oct 2015 13:59:34 +0300 Message-Id: <1444215574-11895-3-git-send-email-den@openvz.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1444215574-11895-1-git-send-email-den@openvz.org> References: <1444215574-11895-1-git-send-email-den@openvz.org> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x X-Received-From: 195.214.232.25 Cc: "Denis V. Lunev" , Olga Krishtal , Stefan Weil , mdroth@linux.vnet.ibm.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 2/2] qga: set file descriptors in qmp_guest_file_open non-blocking on Win32 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Olga Krishtal Set fd non-blocking to avoid common use cases (like reading from a named pipe) from hanging the agent. This was missed in the original code. Restore compatibility with Posix implementation. The patch adds Win32 specific implementation of qemu_set_nonblock. On Windows OS there is a separate API for changing flags of file, pipes and sockets. Portable way to change file descriptor flags requires to detect file descriptor type and proper actions depending of that type. The patch adds wrapper qemu_set_fd_nonblocking into Windows specific code to handle this stuff properly. The only problem is that qemu_set_nonblock is void but this should not be a big deal. Signed-off-by: Olga Krishtal Signed-off-by: Denis V. Lunev Reviewed-by: Yuri Pudgorodskiy CC: Michael Roth CC: Stefan Weil --- qga/commands-win32.c | 6 ++++++ util/oslib-win32.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 53 insertions(+), 5 deletions(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 3374678..3274417 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -34,6 +34,7 @@ #include "qapi/qmp/qerror.h" #include "qemu/queue.h" #include "qemu/host-utils.h" +#include "qemu/sockets.h" #ifndef SHTDN_REASON_FLAG_PLANNED #define SHTDN_REASON_FLAG_PLANNED 0x80000000 @@ -158,6 +159,11 @@ int64_t qmp_guest_file_open(const char *path, bool has_mode, return -1; } + /* set fd non-blocking to avoid common use cases (like reading from a + * named pipe) from hanging the agent + */ + qemu_set_nonblock(fileno(fh)); + fd = guest_file_handle_add(fh, errp); if (fd < 0) { CloseHandle(&fh); diff --git a/util/oslib-win32.c b/util/oslib-win32.c index 08f5a9c..f19aed5 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -121,17 +121,59 @@ struct tm *localtime_r(const time_t *timep, struct tm *result) } #endif /* CONFIG_LOCALTIME_R */ -void qemu_set_block(int fd) +static void qemu_set_fd_nonblocking(int fd, bool nonblocking) { - unsigned long opt = 0; - WSAEventSelect(fd, NULL, 0); + HANDLE handle; + DWORD file_type, pipe_state; + + handle = (HANDLE)_get_osfhandle(fd); + if (handle == INVALID_HANDLE_VALUE) { + return; + } + + file_type = GetFileType(handle); + if (file_type != FILE_TYPE_PIPE) { + return; + } + + /* If file_type == FILE_TYPE_PIPE, according to msdn + * the specified file is socket or named pipe */ + if (GetNamedPipeHandleState(handle, &pipe_state, NULL, + NULL, NULL, NULL, 0)) { + /* The fd is named pipe fd */ + if (!nonblocking == !(pipe_state & PIPE_NOWAIT)) { + /* In this case we do not need perform any operation, because + * nonblocking = true and PIPE_NOWAIT is already set or + * nonblocking = false and PIPE_NOWAIT is not set */ + return; + } + + if (nonblocking) { + pipe_state |= PIPE_NOWAIT; + } else { + pipe_state &= ~PIPE_NOWAIT; + } + + SetNamedPipeHandleState(handle, &pipe_state, NULL, NULL); + return; + } + + /* The fd is socket fd */ + unsigned long opt = (unsigned long)nonblocking; + if (!nonblocking) { + WSAEventSelect(fd, NULL, 0); + } ioctlsocket(fd, FIONBIO, &opt); } +void qemu_set_block(int fd) +{ + qemu_set_fd_nonblocking(fd, false); +} + void qemu_set_nonblock(int fd) { - unsigned long opt = 1; - ioctlsocket(fd, FIONBIO, &opt); + qemu_set_fd_nonblocking(fd, true); qemu_fd_register(fd); }