From patchwork Wed Jul 27 07:35:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 12930207 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 071E4C19F29 for ; Wed, 27 Jul 2022 07:39:10 +0000 (UTC) Received: from localhost ([::1]:56704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGbdN-00009M-WF for qemu-devel@archiver.kernel.org; Wed, 27 Jul 2022 03:39:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46864) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGbaE-0005wF-9X for qemu-devel@nongnu.org; Wed, 27 Jul 2022 03:35:54 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]:45908) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGbaC-0002I0-NS for qemu-devel@nongnu.org; Wed, 27 Jul 2022 03:35:53 -0400 Received: by mail-pf1-x42a.google.com with SMTP id y9so15368121pff.12 for ; Wed, 27 Jul 2022 00:35:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kS/P/+A+ljy2bYx4PLr8f8hnFjz0iV4LBw7/6hnHSmQ=; b=UY0ItBBbOL8xRO2BSV8SGeB6FVlk8IGwc+ATRPN4yWIZJCzU+W/hKufHkpx+BEMuK6 x3O2G0LspxjG3iFZiqvqUJYComjQmR3TlBE7p6qRcBfgikyIbPuRwKUAk5M4GMc54m52 RJOdd1L909kjgIsGZXJIFDC/Kxw07y0PNqMkMUVUI0fct9EDxP8XJFEYExrjaZrnT/R2 qAXUcTkNvWHd27au0wMo5OQQYjKjovl2FmmkZtI1itgPhBNy0s31WITJ/E0VpghSScHS 8S8wRPE0aH8TXS/fMVArgvPdojvrKlGBmtodXZNq2tDwm6L752ZUyhaDjowNY0sLkfB4 lTPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kS/P/+A+ljy2bYx4PLr8f8hnFjz0iV4LBw7/6hnHSmQ=; b=jdPH4yALaAHTyy6NasgF+RjmfwuTWB/LdfE2IFAN/6yifWQ+9u/oo3uE20HS2NZoS6 QSaL1olhjSH2Ukmh3PLbUGpj6c2tZfCQvzdnLG2WXlgKtnG0TmQiMhH3Agbc9oqrfmkD A0vGGFHL6/9yqFudotVQyPvQbP3g5vxsCyf5C71eE5nNy1G6j7LTU7PnA9GRfAzdN3Q4 t50v9MMPBRScZvdXqW8R2M9jOvZPldnYP2atImDXdHDMRBKgIjwBwgO3Q+xCDbmQuddW Bej1LRlVxvMIc02DEHPwmQf64A81gHMQM+yi3GVFpuu8mXd4nbhzzmkcoXqHVvTmVTzr THqQ== X-Gm-Message-State: AJIora8mhT0ytyJqGr6lJkn8b+B+O+alwcCoOTm3PiWW/7NTniADrkKi h99YDzcSujLxiLOFifDL9/UGyZ8/SQg= X-Google-Smtp-Source: AGRyM1u8D9/jn+uhWgVK4yvcTpDFDLnLQwmfnB2Xbxh40ZNHCmSIUQxZHrb+Nr1aFKIJkkptl5t0eA== X-Received: by 2002:a65:460b:0:b0:41a:6637:6544 with SMTP id v11-20020a65460b000000b0041a66376544mr17832655pgq.511.1658907351057; Wed, 27 Jul 2022 00:35:51 -0700 (PDT) Received: from ubuntu.. (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id z7-20020a170902ccc700b0016c09a0ef87sm10533834ple.255.2022.07.27.00.35.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jul 2022 00:35:50 -0700 (PDT) From: Bin Meng To: qemu-devel@nongnu.org Cc: Bin Meng , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PATCH 1/5] util/qemu-sockets: Replace the call to close a socket with closesocket() Date: Wed, 27 Jul 2022 15:35:38 +0800 Message-Id: <20220727073542.811420-2-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220727073542.811420-1-bmeng.cn@gmail.com> References: <20220727073542.811420-1-bmeng.cn@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42a; envelope-from=bmeng.cn@gmail.com; helo=mail-pf1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Bin Meng close() is a *nix function. It works on any file descriptor, and sockets in *nix are an example of a file descriptor. closesocket() is a Windows-specific function, which works only specifically with sockets. Sockets on Windows do not use *nix-style file descriptors, and socket() returns a handle to a kernel object instead, so it must be closed with closesocket(). In QEMU there is already a logic to handle such platform difference in os-posix.h and os-win32.h, that: * closesocket maps to close on POSIX * closesocket maps to a wrapper that calls the real closesocket() on Windows Replace the call to close a socket with closesocket() instead. Signed-off-by: Bin Meng --- util/qemu-sockets.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 13b5b197f9..0e2298278f 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -487,7 +487,7 @@ int inet_connect_saddr(InetSocketAddress *saddr, Error **errp) if (ret < 0) { error_setg_errno(errp, errno, "Unable to set KEEPALIVE"); - close(sock); + closesocket(sock); return -1; } } @@ -1050,7 +1050,7 @@ static int unix_connect_saddr(UnixSocketAddress *saddr, Error **errp) return sock; err: - close(sock); + closesocket(sock); return -1; } From patchwork Wed Jul 27 07:35:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 12930212 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8E185C04A68 for ; Wed, 27 Jul 2022 07:43:15 +0000 (UTC) Received: from localhost ([::1]:35064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGbhK-0004sV-1I for qemu-devel@archiver.kernel.org; Wed, 27 Jul 2022 03:43:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGbaG-0005xv-Po for qemu-devel@nongnu.org; Wed, 27 Jul 2022 03:35:57 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]:35717) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGbaF-0002IP-B8 for qemu-devel@nongnu.org; Wed, 27 Jul 2022 03:35:56 -0400 Received: by mail-pl1-x62e.google.com with SMTP id t2so1448561ply.2 for ; Wed, 27 Jul 2022 00:35:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dhIcUePJ3TCkM/NTCNUzXkEdR1JjTZt6sHSrXk6NROo=; b=MmdL13Lj+w30ngceHHtgOP1S8yoSjr2txit0046rW5A5TdN1qMerDv+m/XBJHp4dfS F2v1qK+HXFD30VpYrJ4DttdAsdEkFGnJAVAymXFXPiXr/bzp17eweUaJfDY7WA6ce7Z0 VJja9W/kyBW6olaTpTnb5h0aRMstgH0E7UzeViKx9tmQL6NO7Z+72Tn/txtoF0rcxOuC B8/N0ArlqdWLhhXPi2lvrDjFANSBjquBO9cXu5eM4AH9IrMPQP0TCXnm6XFilL0l13Qo QfBwNXyoiqX/rHOt6g4kzow6tZsPR9lKSTZvG7aruvyn9g75XojKnK2kKI93O0T8y6u4 IVtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dhIcUePJ3TCkM/NTCNUzXkEdR1JjTZt6sHSrXk6NROo=; b=e14EOThJilDZ5hDw4YDTEl5N6bvb9Dl0ndLZHqHwwFxH39led76TKQ8wuh0Qb2/waT uh9i438TasUYAPz46qpxDZRCxXNUZr9yCkdDntXLPP/ogaaUSt5Ho83K3k7SkF/iPJuB SuxEMWN1Qdt8UAjVnHmAcRNeV2gev7Fjwfkqjc2rdh/rxDO0WwhqzX+Gy/r1uumwURlJ mpeX6IyJ7xFJVPvUjntTXctY+bxFGVocME+64h2JqxdYhO5cQyIlY2S2e1nayISz9uLl LrPHjaJyPNmx0TqUyuPyJdTrFIr1bqm8j4EXxrOs/q+m0vDkD9HQ0q7j65Nwz9MJW69d yIdw== X-Gm-Message-State: AJIora+YLnHWBrpODWG1C6jvp/Jux7wtyAZFpFZhVVArRimVuFaBCXho G4mtQG/sm0GAmAtqj6kzfzkcrdYdt0w= X-Google-Smtp-Source: AGRyM1vdwLN9rLfd4M94cvlpSrVy8R1nO/NIj/aKH6FzUjjerkK+fJs9CJDMSxcFU9quOCj+7ImfSg== X-Received: by 2002:a17:903:245:b0:16b:9b6d:20bc with SMTP id j5-20020a170903024500b0016b9b6d20bcmr19580228plh.14.1658907353783; Wed, 27 Jul 2022 00:35:53 -0700 (PDT) Received: from ubuntu.. (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id z7-20020a170902ccc700b0016c09a0ef87sm10533834ple.255.2022.07.27.00.35.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jul 2022 00:35:52 -0700 (PDT) From: Bin Meng To: qemu-devel@nongnu.org Cc: Bin Meng , Xuzhou Cheng , Stefan Weil Subject: [PATCH 2/5] util/oslib-win32: Add a helper to get the Windows version Date: Wed, 27 Jul 2022 15:35:39 +0800 Message-Id: <20220727073542.811420-3-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220727073542.811420-1-bmeng.cn@gmail.com> References: <20220727073542.811420-1-bmeng.cn@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62e; envelope-from=bmeng.cn@gmail.com; helo=mail-pl1-x62e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Bin Meng This adds a helper to get the Windows version via the RtlGetVersion call, for QEMU codes to determine the Windows version at run-time. Signed-off-by: Xuzhou Cheng Signed-off-by: Bin Meng --- include/sysemu/os-win32.h | 2 ++ util/oslib-win32.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/include/sysemu/os-win32.h b/include/sysemu/os-win32.h index edc3b38a57..1e324026a4 100644 --- a/include/sysemu/os-win32.h +++ b/include/sysemu/os-win32.h @@ -204,6 +204,8 @@ ssize_t qemu_recv_wrap(int sockfd, void *buf, size_t len, int flags); ssize_t qemu_recvfrom_wrap(int sockfd, void *buf, size_t len, int flags, struct sockaddr *addr, socklen_t *addrlen); +void os_get_win_version(RTL_OSVERSIONINFOEXW *info); + #ifdef __cplusplus } #endif diff --git a/util/oslib-win32.c b/util/oslib-win32.c index 5723d3eb4c..6d2387b9ff 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -547,3 +547,18 @@ int qemu_msync(void *addr, size_t length, int fd) */ return qemu_fdatasync(fd); } + +void os_get_win_version(RTL_OSVERSIONINFOEXW *info) +{ + typedef LONG (WINAPI *rtl_get_version_t)(PRTL_OSVERSIONINFOEXW); + + /* RtlGetVersion is available starting with Windows 2000 */ + HMODULE module = GetModuleHandle("ntdll"); + PVOID fun = GetProcAddress(module, "RtlGetVersion"); + rtl_get_version_t rtl_get_version = (rtl_get_version_t)fun; + + info->dwOSVersionInfoSize = sizeof(RTL_OSVERSIONINFOEXW); + rtl_get_version(info); + + return; +} From patchwork Wed Jul 27 07:35:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 12930208 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E40EFC19F21 for ; Wed, 27 Jul 2022 07:39:12 +0000 (UTC) Received: from localhost ([::1]:56760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGbdP-0000CI-PP for qemu-devel@archiver.kernel.org; Wed, 27 Jul 2022 03:39:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46896) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGbaK-000609-Fz for qemu-devel@nongnu.org; Wed, 27 Jul 2022 03:36:00 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]:35717) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGbaI-0002IP-5g for qemu-devel@nongnu.org; Wed, 27 Jul 2022 03:36:00 -0400 Received: by mail-pl1-x62e.google.com with SMTP id t2so1448683ply.2 for ; Wed, 27 Jul 2022 00:35:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fFZfjp0jm4rG+YetdnNNuYVFJ5peINhs32kgHpyqjdA=; b=NJsJYBwt66amVam2SCGwCrrETqwcQp2pyFEMFD+kfE0hoXwzS2kawlpxrA+5zlZEBU CW9YzdD8VoMBFbSJ5Tl5b2mmB2R90+pNDZKoUf3NOWLJ9TiniuGITLBc9Tk7T3WqOvVC OBPuDexPHrV5bACQll5vSVpLEwVAnK2i7FR6IS7pAgzN+ddgdIRtZdD9mWvrQQxY458n EUD8/ys9Nb9SL9Y5LOfWspQZV3RJXTLLet0kyBDbIpw+OI0tYRpbNADW324DkleEIAef Og+xhWnJMGGaMO3QfEDrxe4ixsV0NQM6bkSCu+d/XhCC4fjp8+Ca+kQxHSaW/YxVdgfG lr6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fFZfjp0jm4rG+YetdnNNuYVFJ5peINhs32kgHpyqjdA=; b=TnWtcrgFgjTjexFbVq/68zhnXZ21Ln5fFtOAobyhQRQiE/TQ7g+NNqGs920QIdPR/v psxp6am9pl1bHU9I14uyS0qkKO92NGKxnVCKYR70SESVBLK/R9jb21wQrBFnGOLcZPKV tyldPfaQnkAmclftic7kFxPOWizihxLo7lJGXaytdKMfGNL7am7NVYDUFt9Cj9vS8WOu U+BB7L766Fzaud+dZ0k9xo2QXoL1FPHOPGQnoQAYFt6lkkW/G9EPlKMIlHIrhlLQ+hHT QotxQzYmswu6nVTTYUdnTqRjaoRariA9ltFm83LtBCcso6MwnW2BpBBKQwhUccGl+f6H H2Sw== X-Gm-Message-State: AJIora+EOvFwb8FEbB206ajIe3HwwNzdpHXHOkGWASjFmwnNNb0YQ0AJ pwv+VyBo+NbYUxD+bhrARuSHq6jCPPo= X-Google-Smtp-Source: AGRyM1vSxQLy/IOfQep9oH/v9BNXGuPU44Der9zC2DnWteqVLoOtODl8nx+IfEgovPm7S1EobNa5Lw== X-Received: by 2002:a17:902:ecc7:b0:16d:66eb:bb88 with SMTP id a7-20020a170902ecc700b0016d66ebbb88mr15870202plh.170.1658907357164; Wed, 27 Jul 2022 00:35:57 -0700 (PDT) Received: from ubuntu.. (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id z7-20020a170902ccc700b0016c09a0ef87sm10533834ple.255.2022.07.27.00.35.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jul 2022 00:35:55 -0700 (PDT) From: Bin Meng To: qemu-devel@nongnu.org Cc: Bin Meng , Konstantin Kostiuk , Michael Roth Subject: [PATCH 3/5] qga/commands-win32: Use os_get_win_version() Date: Wed, 27 Jul 2022 15:35:40 +0800 Message-Id: <20220727073542.811420-4-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220727073542.811420-1-bmeng.cn@gmail.com> References: <20220727073542.811420-1-bmeng.cn@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62e; envelope-from=bmeng.cn@gmail.com; helo=mail-pl1-x62e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Bin Meng Drop its own ga_get_win_version() implementation, and use the one provided in oslib-win32 instead. Signed-off-by: Bin Meng --- qga/commands-win32.c | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 7ed7664715..6186f2e1f2 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -2178,26 +2178,6 @@ static ga_win_10_0_t const WIN_10_0_CLIENT_VERSION_MATRIX[3] = { {0, 0} }; -static void ga_get_win_version(RTL_OSVERSIONINFOEXW *info, Error **errp) -{ - typedef NTSTATUS(WINAPI *rtl_get_version_t)( - RTL_OSVERSIONINFOEXW *os_version_info_ex); - - info->dwOSVersionInfoSize = sizeof(RTL_OSVERSIONINFOEXW); - - HMODULE module = GetModuleHandle("ntdll"); - PVOID fun = GetProcAddress(module, "RtlGetVersion"); - if (fun == NULL) { - error_setg(errp, QERR_QGA_COMMAND_FAILED, - "Failed to get address of RtlGetVersion"); - return; - } - - rtl_get_version_t rtl_get_version = (rtl_get_version_t)fun; - rtl_get_version(info); - return; -} - static char *ga_get_win_name(OSVERSIONINFOEXW const *os_version, bool id) { DWORD major = os_version->dwMajorVersion; @@ -2312,17 +2292,12 @@ static char *ga_get_current_arch(void) GuestOSInfo *qmp_guest_get_osinfo(Error **errp) { - Error *local_err = NULL; OSVERSIONINFOEXW os_version = {0}; bool server; char *product_name; GuestOSInfo *info; - ga_get_win_version(&os_version, &local_err); - if (local_err) { - error_propagate(errp, local_err); - return NULL; - } + os_get_win_version(&os_version); server = os_version.wProductType != VER_NT_WORKSTATION; product_name = ga_get_win_product_name(errp); From patchwork Wed Jul 27 07:35:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 12930215 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 52D73C19F29 for ; Wed, 27 Jul 2022 07:46:53 +0000 (UTC) Received: from localhost ([::1]:40854 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGbkq-0000Pd-Cj for qemu-devel@archiver.kernel.org; Wed, 27 Jul 2022 03:46:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGbaO-00064Z-En for qemu-devel@nongnu.org; Wed, 27 Jul 2022 03:36:06 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]:46893) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGbaL-0002It-FZ for qemu-devel@nongnu.org; Wed, 27 Jul 2022 03:36:03 -0400 Received: by mail-pl1-x62e.google.com with SMTP id p8so15412605plq.13 for ; Wed, 27 Jul 2022 00:36:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=I7rLye0exZ0yQucdqCIrvg6cLevXh7qsl3mNWHbKQN8=; b=B+VEkWlF9lCZFlORz91+qenCrN/JMuBTPyetKcwPcxAikrJqIuFviqjt9s9o99JnS+ w93/Gr8iA4E1jRCeJo2QEgRfSCY/X0Y6LwZ7rBHDqqF+jiKGKzpCZCMHZ/fKiev11uh1 RDNZ/Tp5SkzuFE+6B47ho8DXNgChJAs85fPHwSxMf3tRDAMD7sHS4e08YnQd4KNO9Oil nKk89jDCGz7svG2MA9NK+fJD2CPnBJ0AwcaGNm45ylNbtu4dQ1HhpmbrxxrDR/W6JWOh yH2HvorKq+sMx6JQv4ZE6V8buoSgxxSl3ttvGO1HnIz3FhyAS0RJESR7JI82KAp2UKxC +UUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=I7rLye0exZ0yQucdqCIrvg6cLevXh7qsl3mNWHbKQN8=; b=pJDTAXnCMPyU4ShETh2R6vMmTqhJ3iCS9FQBV/XxWJpd/eNKIxL8KcgxobUlKVqZ+t NxmeROB++QkLVR7wKH5dh8lK8lz9L6Mb3exYd2tRRUxOs6Qi3B6+MYYj2/kY5uz//iL6 Pwui8qK14a7NfvrpzI+MfjLKYJdlyfVpXBSc3++/V0asSKQo+vIMAWIpAxb6VOjRSz/u QWE7rCIOM9Q+oImzuE+kKP9Bx39OHjcMofLUxptJFZ0ncQPhoxim15OeDn1g1FezcYH2 6gEEWiv87KnDm5l5C3c8Lblpy22FKMPx22Adn/rv1kk5/UQ6e+f4tCn9vgM6OAheSA3b rRMw== X-Gm-Message-State: AJIora/RYGCvbQHiEFJr5AGsKqm58ocMb7w99mgglocwegC4LHUX0CxM npRlV5SwSV/0c5dUP50flbGXWJjuBbQ= X-Google-Smtp-Source: AGRyM1vlNvaMcuehO9PYsVaE130cR9X66A59l1DqAz83uBA817VeL2Vx9GUVWaGGr+Wt16E9n4vU5Q== X-Received: by 2002:a17:902:c992:b0:16d:710d:8add with SMTP id g18-20020a170902c99200b0016d710d8addmr13301362plc.0.1658907360031; Wed, 27 Jul 2022 00:36:00 -0700 (PDT) Received: from ubuntu.. (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id z7-20020a170902ccc700b0016c09a0ef87sm10533834ple.255.2022.07.27.00.35.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jul 2022 00:35:58 -0700 (PDT) From: Bin Meng To: qemu-devel@nongnu.org Cc: Bin Meng , Xuzhou Cheng , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= Subject: [PATCH 4/5] util/qemu-sockets: Enable unix socket support on Windows Date: Wed, 27 Jul 2022 15:35:41 +0800 Message-Id: <20220727073542.811420-5-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220727073542.811420-1-bmeng.cn@gmail.com> References: <20220727073542.811420-1-bmeng.cn@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62e; envelope-from=bmeng.cn@gmail.com; helo=mail-pl1-x62e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Bin Meng Support for the unix socket has existed both in BSD and Linux for the longest time, but not on Windows. Since Windows 10 build 17063 [1], the native support for the unix socket has came to Windows. Starting this build, two Win32 processes can use the AF_UNIX address family over Winsock API to communicate with each other. Introduce a new build time config option CONFIG_AF_UNIX when the build host has such a capability, and a run-time check afunix_available() for Windows host in the QEMU sockets util codes. [1] https://devblogs.microsoft.com/commandline/af_unix-comes-to-windows/ Signed-off-by: Xuzhou Cheng Signed-off-by: Bin Meng --- meson.build | 6 ++++++ util/qemu-sockets.c | 48 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index 75aaca8462..73e5de5957 100644 --- a/meson.build +++ b/meson.build @@ -2327,6 +2327,12 @@ have_afalg = get_option('crypto_afalg') \ '''), error_message: 'AF_ALG requested but could not be detected').allowed() config_host_data.set('CONFIG_AF_ALG', have_afalg) +if targetos != 'windows' + config_host_data.set('CONFIG_AF_UNIX', true) +else + config_host_data.set('CONFIG_AF_UNIX', cc.has_header('afunix.h')) +endif + config_host_data.set('CONFIG_AF_VSOCK', cc.has_header_symbol( 'linux/vm_sockets.h', 'AF_VSOCK', prefix: '#include ', diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 0e2298278f..d85f3ea3ee 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -17,6 +17,15 @@ */ #include "qemu/osdep.h" +#if defined(CONFIG_WIN32) && defined(CONFIG_AF_UNIX) +# include +/* + * AF_UNIX support is available since Windows 10 build 17063 + * See https://devblogs.microsoft.com/commandline/af_unix-comes-to-windows/ + */ +# define WIN_BUILD_AF_UNIX 17063 +#endif /* CONFIG_WIN32 && CONFIG_AF_UNIX */ + #ifdef CONFIG_AF_VSOCK #include #endif /* CONFIG_AF_VSOCK */ @@ -880,7 +889,7 @@ static int vsock_parse(VsockSocketAddress *addr, const char *str, } #endif /* CONFIG_AF_VSOCK */ -#ifndef _WIN32 +#ifdef CONFIG_AF_UNIX static bool saddr_is_abstract(UnixSocketAddress *saddr) { @@ -900,6 +909,17 @@ static bool saddr_is_tight(UnixSocketAddress *saddr) #endif } +#ifdef CONFIG_WIN32 +static bool afunix_available(void) +{ + OSVERSIONINFOEXW os_version = { 0 }; + + os_get_win_version(&os_version); + + return os_version.dwBuildNumber >= WIN_BUILD_AF_UNIX; +} +#endif + static int unix_listen_saddr(UnixSocketAddress *saddr, int num, Error **errp) @@ -912,6 +932,13 @@ static int unix_listen_saddr(UnixSocketAddress *saddr, size_t pathlen; size_t addrlen; +#ifdef CONFIG_WIN32 + if (!afunix_available()) { + error_setg(errp, "AF_UNIX is not available on your Windows"); + return -1; + } +#endif + sock = qemu_socket(PF_UNIX, SOCK_STREAM, 0); if (sock < 0) { error_setg_errno(errp, errno, "Failed to create Unix socket"); @@ -1004,6 +1031,13 @@ static int unix_connect_saddr(UnixSocketAddress *saddr, Error **errp) return -1; } +#ifdef CONFIG_WIN32 + if (!afunix_available()) { + error_setg(errp, "AF_UNIX is not available on your Windows"); + return -1; + } +#endif + sock = qemu_socket(PF_UNIX, SOCK_STREAM, 0); if (sock < 0) { error_setg_errno(errp, errno, "Failed to create socket"); @@ -1060,14 +1094,14 @@ static int unix_listen_saddr(UnixSocketAddress *saddr, int num, Error **errp) { - error_setg(errp, "unix sockets are not available on windows"); + error_setg(errp, "unix sockets are not available on your host"); errno = ENOTSUP; return -1; } static int unix_connect_saddr(UnixSocketAddress *saddr, Error **errp) { - error_setg(errp, "unix sockets are not available on windows"); + error_setg(errp, "unix sockets are not available on your host"); errno = ENOTSUP; return -1; } @@ -1335,7 +1369,7 @@ socket_sockaddr_to_address_inet(struct sockaddr_storage *sa, } -#ifndef WIN32 +#ifdef CONFIG_AF_UNIX static SocketAddress * socket_sockaddr_to_address_unix(struct sockaddr_storage *sa, socklen_t salen, @@ -1362,7 +1396,7 @@ socket_sockaddr_to_address_unix(struct sockaddr_storage *sa, addr->u.q_unix.path = g_strndup(su->sun_path, salen); return addr; } -#endif /* WIN32 */ +#endif /* CONFIG_AF_UNIX */ #ifdef CONFIG_AF_VSOCK static SocketAddress * @@ -1394,10 +1428,10 @@ socket_sockaddr_to_address(struct sockaddr_storage *sa, case AF_INET6: return socket_sockaddr_to_address_inet(sa, salen, errp); -#ifndef WIN32 +#ifdef CONFIG_AF_UNIX case AF_UNIX: return socket_sockaddr_to_address_unix(sa, salen, errp); -#endif /* WIN32 */ +#endif #ifdef CONFIG_AF_VSOCK case AF_VSOCK: From patchwork Wed Jul 27 07:35:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 12930213 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AE8F0C19F29 for ; Wed, 27 Jul 2022 07:43:37 +0000 (UTC) Received: from localhost ([::1]:35372 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGbhg-00055U-RU for qemu-devel@archiver.kernel.org; Wed, 27 Jul 2022 03:43:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46938) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGbaQ-00065x-LM for qemu-devel@nongnu.org; Wed, 27 Jul 2022 03:36:06 -0400 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]:35434) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGbaP-0002J7-2R for qemu-devel@nongnu.org; Wed, 27 Jul 2022 03:36:06 -0400 Received: by mail-pj1-x1033.google.com with SMTP id o20-20020a17090aac1400b001f2da729979so1370409pjq.0 for ; Wed, 27 Jul 2022 00:36:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5hG4N7Ezu98rJmTsW2Ab18WDLpLbgofhoWTD2kC/llU=; b=kzDIkmvZSCsxA+Nzz+/bo/gXdr8UDlpdOdoJWL/zbhM7tczoVwxQspjNJlPQPycZ82 Z1Xa0Q30/FKZZFGwIGeRNS+2SPlYrWW057hxrkENqAxaKPLQpFKSJpJ8sR+ZNF4h87zD 5UPYXh3zAzXDAeRXDefc/AQ/oKISpPHYj1htTVvPGQl/O8AoOc+1397Fkr/z1E6A76id lTK5u38TU1q5acO+IraWQwFkBonq+pdMWypawa2xusnG+qppICyuXk1WdNKdeMEio7Xi sdK2+RkWdQp7glO2I7eUbT7+iHsZqnmwpZ6078wI2bzcduAdsU1O0tWnVaxe1U913A8o 9r6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5hG4N7Ezu98rJmTsW2Ab18WDLpLbgofhoWTD2kC/llU=; b=5O3WfHMpjeoThD7qT30PS6azawiHO/D1l4CbEAJw67FvjpmxY1jAixcv9xcx6OYBDn XhabBb9/49u4vfvqPwLZfghTK2uu4tcTEtncA+1aBq75SH4wDh0VPuE5jebjiG2P5UFv 58WhDhP6RmrA9usdA80DG0KpdOA+ghkFpjzoRj2ZUnlTpcsM92XyoDZ45Yr40ynIcMwu Oue9Zfyj234OH+aAOdot9tLFTaV6q8SQEsts1nBq3Otg3NCQkT9hk166rfBDDBHS4OwK sEhMp5oKy6CVGa0MDBPpaNyCuGEkY5f/66SXlQqFAWEbcUGqq74diPqlypt3G5KIbTzf iNXQ== X-Gm-Message-State: AJIora+FO3njZiiRhq54+NYqLF9HsKr9DLSynxpzj0OIwPKNr00joCTW 7T7xGRC1WCklJI9muH1CdbFj06PdUVY= X-Google-Smtp-Source: AGRyM1tp27dTYYxAUvDLjKfUAR91d67gWbn3t3UH954P+yuPYfPHK4lYpHkScjnly5b+QXIMCnOTjQ== X-Received: by 2002:a17:902:cf4b:b0:16c:4634:72 with SMTP id e11-20020a170902cf4b00b0016c46340072mr20123630plg.15.1658907362900; Wed, 27 Jul 2022 00:36:02 -0700 (PDT) Received: from ubuntu.. (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id z7-20020a170902ccc700b0016c09a0ef87sm10533834ple.255.2022.07.27.00.36.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jul 2022 00:36:01 -0700 (PDT) From: Bin Meng To: qemu-devel@nongnu.org Cc: Bin Meng , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini Subject: [PATCH 5/5] chardev/char-socket: Update AF_UNIX for Windows Date: Wed, 27 Jul 2022 15:35:42 +0800 Message-Id: <20220727073542.811420-6-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220727073542.811420-1-bmeng.cn@gmail.com> References: <20220727073542.811420-1-bmeng.cn@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1033; envelope-from=bmeng.cn@gmail.com; helo=mail-pj1-x1033.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Bin Meng Now that AF_UNIX has come to Windows, update the existing logic in qemu_chr_compute_filename() and qmp_chardev_open_socket() for Windows. Signed-off-by: Bin Meng --- chardev/char-socket.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index dc4e218eeb..5a1fa0db33 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -37,6 +37,10 @@ #include "chardev/char-io.h" #include "chardev/char-socket.h" +#if defined(CONFIG_WIN32) && defined(CONFIG_AF_UNIX) +# include +#endif /* CONFIG_WIN32 && CONFIG_AF_UNIX */ + static gboolean socket_reconnect_timeout(gpointer opaque); static void tcp_chr_telnet_init(Chardev *chr); @@ -557,7 +561,7 @@ static char *qemu_chr_compute_filename(SocketChardev *s) const char *left = "", *right = ""; switch (ss->ss_family) { -#ifndef _WIN32 +#ifdef CONFIG_AF_UNIX case AF_UNIX: return g_strdup_printf("unix:%s%s", ((struct sockaddr_un *)(ss))->sun_path, @@ -1372,10 +1376,12 @@ static void qmp_chardev_open_socket(Chardev *chr, } qemu_chr_set_feature(chr, QEMU_CHAR_FEATURE_RECONNECTABLE); +#ifndef _WIN32 /* TODO SOCKET_ADDRESS_FD where fd has AF_UNIX */ if (addr->type == SOCKET_ADDRESS_TYPE_UNIX) { qemu_chr_set_feature(chr, QEMU_CHAR_FEATURE_FD_PASS); } +#endif /* * In the chardev-change special-case, we shouldn't register a new yank