From nobody Tue Feb 10 07:22:32 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1662118463; cv=none; d=zohomail.com; s=zohoarc; b=gb/5Q1sEA4i3jn+oZuvd3mjb0Y0D6+fAo/3sg+3oWkWXi6ZBbm9WMvYuoeqDTC8uEjK7+pG6b2gNMkvs4E4TkqD0tH9GjUlEb5B6I+N9S0AGVrpf8IKfuraIig7n2JBVLAg35D01nTg3FEeebfiXz1dp42BYD+0B2vtSTIVR82o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662118463; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=52NAMJZDToe0/qwaXgHbNBBIJFLzcLd3cbJxkM16roo=; b=UleL+zSYQLyACRo52zng1MIQ3qPkSrqe5bpWRuPX/EeQnwb48MmOA7kTD35otQTujeyPQfyLe/7tAIHofiQJivi31PB3NXKbh5cAH80bbZp0KUAd6+95T6xKL9oefwPOLUvGJcoKXZZ8YQwQE5qlaqEQQdSAH/Lk/ghGnwLIDgM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1662118463787721.6733283142013; Fri, 2 Sep 2022 04:34:23 -0700 (PDT) Received: from localhost ([::1]:39426 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oU4wI-0005LU-It for importer@patchew.org; Fri, 02 Sep 2022 07:34:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46046) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oU4hh-0001HY-RM for qemu-devel@nongnu.org; Fri, 02 Sep 2022 07:19:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:42005) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oU4hg-0006aM-3v for qemu-devel@nongnu.org; Fri, 02 Sep 2022 07:19:17 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-635-_StsSeSOOUWtiwXuSJxBgw-1; Fri, 02 Sep 2022 07:19:14 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 842EC1818212 for ; Fri, 2 Sep 2022 11:19:13 +0000 (UTC) Received: from localhost (unknown [10.39.208.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 619361415125; Fri, 2 Sep 2022 11:19:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1662117555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=52NAMJZDToe0/qwaXgHbNBBIJFLzcLd3cbJxkM16roo=; b=Ty29CST7qSDu4WKA2IYthaXPxaNShXrgjfQO4laE6fwGoR2I64EeB57M6E5xPZF75jvBHg ng9jXCnGS8OMkdIJ16a+xCsOXjNKa+kC/X0ZPytb+HdKz8IfqLH1HZp0aJEVs0v+Jrf8Jp OYaUqLHKfkbFKg+ws22IJM5ViO7r2Ng= X-MC-Unique: _StsSeSOOUWtiwXuSJxBgw-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v2 2/3] io/command: implement support for win32 Date: Fri, 2 Sep 2022 15:18:59 +0400 Message-Id: <20220902111900.3029260-3-marcandre.lureau@redhat.com> In-Reply-To: <20220902111900.3029260-1-marcandre.lureau@redhat.com> References: <20220902111900.3029260-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1662118465503100001 From: Marc-Andr=C3=A9 Lureau This is a fairly straightforward implementation of the equivalent UNIX version. GLib uses _mkpipe() to setup the FDs. We take that for granted, and set the underlying named-pipes to nonblocking. This is done by other projects as well (found on github), but I am not confident this works reliably (msdn SetNamedPipeHandleState documentation discourage this usage). Alternatively, we could setup the FDs ourself, and use UNIX sockets on Windows, which can be used in blocking/non-blocking mode. I haven't tried it, as I am not sure it is necessary. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Daniel P. Berrang=C3=A9 --- io/channel-command.c | 58 ++++++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/io/channel-command.c b/io/channel-command.c index 35ba14c6a2..9bc292f3fd 100644 --- a/io/channel-command.c +++ b/io/channel-command.c @@ -26,7 +26,6 @@ #include "qemu/sockets.h" #include "trace.h" =20 -#ifndef WIN32 /** * qio_channel_command_new_pid: * @writefd: the FD connected to the command's stdin @@ -60,7 +59,13 @@ qio_channel_command_new_pid(int writefd, ioc->writefd =3D writefd; ioc->pid =3D pid; =20 - trace_qio_channel_command_new_pid(ioc, writefd, readfd, pid); + trace_qio_channel_command_new_pid(ioc, writefd, readfd, +#ifdef WIN32 + GetProcessId(pid) +#else + pid +#endif + ); return ioc; } =20 @@ -89,18 +94,6 @@ qio_channel_command_new_spawn(const char *const argv[], return qio_channel_command_new_pid(stdinfd, stdoutfd, pid); } =20 -#else /* WIN32 */ -QIOChannelCommand * -qio_channel_command_new_spawn(const char *const argv[], - int flags, - Error **errp) -{ - error_setg_errno(errp, ENOSYS, - "Command spawn not supported on this platform"); - return NULL; -} -#endif /* WIN32 */ - #ifndef WIN32 static int qio_channel_command_abort(QIOChannelCommand *ioc, Error **errp) @@ -143,6 +136,23 @@ static int qio_channel_command_abort(QIOChannelCommand= *ioc, =20 return 0; } +#else +static int qio_channel_command_abort(QIOChannelCommand *ioc, + Error **errp) +{ + DWORD ret; + + TerminateProcess(ioc->pid, 0); + ret =3D WaitForSingleObject(ioc->pid, 1000); + if (ret !=3D WAIT_OBJECT_0) { + error_setg(errp, + "Process %llu refused to die", + (unsigned long long)GetProcessId(ioc->pid)); + return -1; + } + + return 0; +} #endif /* ! WIN32 */ =20 =20 @@ -166,9 +176,7 @@ static void qio_channel_command_finalize(Object *obj) } ioc->writefd =3D ioc->readfd =3D -1; if (ioc->pid > 0) { -#ifndef WIN32 qio_channel_command_abort(ioc, NULL); -#endif g_spawn_close_pid(ioc->pid); } } @@ -233,14 +241,20 @@ static int qio_channel_command_set_blocking(QIOChanne= l *ioc, bool enabled, Error **errp) { + QIOChannelCommand *cioc =3D QIO_CHANNEL_COMMAND(ioc); + #ifdef WIN32 - /* command spawn is not supported on win32 */ - g_assert_not_reached(); + DWORD dwMode =3D PIPE_READMODE_BYTE | enabled ? PIPE_WAIT : PIPE_NOWAI= T; + + if ((cioc->writefd >=3D 0 && !SetNamedPipeHandleState((HANDLE)_get_osf= handle(cioc->writefd), &dwMode, NULL, NULL)) || + (cioc->readfd >=3D 0 &&!SetNamedPipeHandleState((HANDLE)_get_osfha= ndle(cioc->readfd), &dwMode, NULL, NULL))) { + error_setg_win32(errp, GetLastError(), "Failed to set nonblocking"= ); + return -1; + } #else - QIOChannelCommand *cioc =3D QIO_CHANNEL_COMMAND(ioc); =20 - if (!g_unix_set_fd_nonblocking(cioc->writefd, !enabled, NULL) || - !g_unix_set_fd_nonblocking(cioc->readfd, !enabled, NULL)) { + if ((cioc->writefd >=3D 0 && !g_unix_set_fd_nonblocking(cioc->writefd,= !enabled, NULL)) || + (cioc->readfd >=3D 0 && !g_unix_set_fd_nonblocking(cioc->readfd, != enabled, NULL))) { error_setg_errno(errp, errno, "Failed to set FD nonblocking"); return -1; } @@ -281,6 +295,8 @@ static int qio_channel_command_close(QIOChannel *ioc, (unsigned long long)cioc->pid); return -1; } +#else + WaitForSingleObject(cioc->pid, INFINITE); #endif =20 if (rv < 0) { --=20 2.37.2