From nobody Thu Apr 30 00:40:44 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=reject dis=none) header.from=unpredictable.fr ARC-Seal: i=1; a=rsa-sha256; t=1776099383; cv=none; d=zohomail.com; s=zohoarc; b=XmnoFUA8V95V4KHTZ9a2E7BqDBh2TzDCSqrMJ/33yOERo0s3uU5jwvZwDko81YKgYCeJwtatZnEDKnl7v7jvSx63hQN/y2BCpabg4N3ONGQXqX6ivhdKtBlLENXVt4idAvSlWPec/cIBW13lpA+Bf3cTWXrZFqlW7zJxD9puCvM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776099383; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=UzCpYCxioU37a8LihFnYJRJpzhI5QkED2mBVZIjSzck=; b=Kd0uOQlYGc4UynhjckXYBGHhOfTO702jdo+gZgl6XM7+GLbEmzWFkxt4X5ndLHxithVgBO3gFVdzjwHQVYj4kInAuVpCL44SfPkskH22mAxpB1SP1eAPC91AY4P38s7qsn+kCRNX/Oc11NY0vVVBRpX5fDwb6tT25NNKjel0BW8= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776099382996470.83038023954725; Mon, 13 Apr 2026 09:56:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCKZv-0004JQ-9w; Mon, 13 Apr 2026 12:56:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCKZu-0004JG-3J for qemu-devel@nongnu.org; Mon, 13 Apr 2026 12:56:02 -0400 Received: from qs-2004f-snip4-1.eps.apple.com ([57.103.84.54] helo=outbound.qs.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCKZs-0006Mn-Kg for qemu-devel@nongnu.org; Mon, 13 Apr 2026 12:56:01 -0400 Received: from outbound.qs.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-2d-100-percent-5 (Postfix) with ESMTPS id A4F9F1800B1C; Mon, 13 Apr 2026 16:55:56 +0000 (UTC) Received: from localhost.localdomain (unknown [17.57.155.37]) by p00-icloudmta-asmtp-us-east-2d-100-percent-5 (Postfix) with ESMTPSA id 1D0A41800543; Mon, 13 Apr 2026 16:43:43 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1776099360; x=1778691360; bh=UzCpYCxioU37a8LihFnYJRJpzhI5QkED2mBVZIjSzck=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=DU7QJL1Nv8KQtdMjuIJrUY5vBbyZdUZy0HHSywLwLbITXs/Ha3F5To6TcYSibeOvoGl+9UUftrWQarTXEL4jJP/1TVSnzGgbWAVgMtroxGoUsfRTuDuiNJ3qX8LiOywpUt6tjjzI7ynwiGWIC+wZ0LU3BPRlaZMlMkz6yrHHC7Jx2P8JIk/9Lbx9FsMB/3tZ5RI5iGtaSxPxYq+0bSYyiHSKXEiN/6FNIc0Gb5lCaKvBF7bTn+db+YSy4SpO+GcPfP0WgByP2ur80v3yV3NpeLwV5qv/FgO5jvPbd4CLa4z9V8gyDapRym9anqw2Og3j+Z/UoJ0BkOizpWM/foFTaQ== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Stefan Weil , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Jason Wang , Werner de Carne Subject: [PATCH 1/3] serial COM: windows serial COM PollingFunc don't sleep Date: Mon, 13 Apr 2026 18:43:36 +0200 Message-ID: <20260413164338.42894-2-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260413164338.42894-1-mohamed@unpredictable.fr> References: <20260413164338.42894-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDEzMDE2NiBTYWx0ZWRfX+9BrMHpOftiv vGsR3UKdQZBbBFwcBn3+VS3Kl6wi9Fj3Rg6mT6xy+p1GiQjtm23gYehe0+a1tv/LYTJZu52E3S5 /r/2u+R0rJFedqIPFwl6m0JTp1Q1tALu9vCoOED6m55r0qMMEPII9AACdDB0QmQmpKTGi/MMea+ 93Kz5556jusU4ei/jR4aoKE53rWRVjUdD00liJ7IPCU2Uo0lgJjgFRLwqyOU9o+nf/0tioPyJKc DZ5fe8GUzW5/7aDKypfpQt1UjqhmSEp+sQx+GuG93gHg9Cc38vvvE8Ptlh1QbAYpbgzY1RyF+cR VBh599MsCxrtKuIuZuTlJDFTEwN/bYcWv99Z5xgCueCfEkEJK2vliS6SQxA2w0= X-Authority-Info-Out: v=2.4 cv=I4hohdgg c=1 sm=1 tr=0 ts=69dd201d cx=c_apl:c_pps:t_out a=bsP7O+dXZ5uKcj+dsLqiMw==:117 a=bsP7O+dXZ5uKcj+dsLqiMw==:17 a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=p0WdMEafAAAA:8 a=Unios6BkgxOyw5t3swQA:9 X-Proofpoint-GUID: M1xfhkaEUfnbwya6K2NO8vctu68hy48b X-Proofpoint-ORIG-GUID: M1xfhkaEUfnbwya6K2NO8vctu68hy48b X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-13_03,2026-04-13_04,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 suspectscore=0 lowpriorityscore=0 adultscore=0 mlxlogscore=679 mlxscore=0 phishscore=0 clxscore=1030 malwarescore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2604130166 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=lists1p.gnu.org; Received-SPF: pass client-ip=57.103.84.54; envelope-from=mohamed@unpredictable.fr; helo=outbound.qs.icloud.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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @unpredictable.fr) X-ZM-MESSAGEID: 1776099384121154100 Content-Type: text/plain; charset="utf-8" From: Werner de Carne Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1802 Signed-off-by: Werner de Carne Reviewed-by: Marc-Andr=C3=A9 Lureau --- chardev/char-win.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/chardev/char-win.c b/chardev/char-win.c index fef45e83aa..f13d526e2f 100644 --- a/chardev/char-win.c +++ b/chardev/char-win.c @@ -28,7 +28,7 @@ #include "qapi/error.h" #include "chardev/char-win.h" =20 -static void win_chr_read(Chardev *chr, DWORD len) +static int win_chr_read(Chardev *chr, DWORD len) { WinChardev *s =3D WIN_CHARDEV(chr); int max_size =3D qemu_chr_be_can_write(chr); @@ -40,7 +40,7 @@ static void win_chr_read(Chardev *chr, DWORD len) len =3D max_size; } if (len =3D=3D 0) { - return; + return 0; } =20 ZeroMemory(&s->orecv, sizeof(s->orecv)); @@ -56,6 +56,8 @@ static void win_chr_read(Chardev *chr, DWORD len) if (size > 0) { qemu_chr_be_write(chr, buf, size); } + =20 + return size > 0 ? 1 : 0; } =20 static int win_chr_serial_poll(void *opaque) @@ -67,8 +69,9 @@ static int win_chr_serial_poll(void *opaque) =20 ClearCommError(s->file, &comerr, &status); if (status.cbInQue > 0) { - win_chr_read(chr, status.cbInQue); - return 1; + if (win_chr_read(chr, status.cbInQue)) { + return 1; + } } return 0; } @@ -147,8 +150,9 @@ int win_chr_pipe_poll(void *opaque) =20 PeekNamedPipe(s->file, NULL, 0, NULL, &size, NULL); if (size > 0) { - win_chr_read(chr, size); - return 1; + if (win_chr_read(chr, size)) { + return 1; + } } return 0; } --=20 2.50.1 (Apple Git-155) From nobody Thu Apr 30 00:40:44 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=reject dis=none) header.from=unpredictable.fr ARC-Seal: i=1; a=rsa-sha256; t=1776099396; cv=none; d=zohomail.com; s=zohoarc; b=j4P1oODBzCcvIT4qPLw7qXFVGn4OI14yiSdDZF29lwrZW4Ld9dyoyBAaxwMzfY9ccLbJ1H5Ba5Q3lFNcgvLUEs7RGfm4So0fQ6NWojB7CfqHZlMRezoSC3rIjJ6M+XwWR3Qe9n38XsMHmKgnIO9zjXcbdxf/Cm97IBAtTVp+W0w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776099396; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=9f07FQNjyD0hoJ0U5EAu159dHGKdBEB3GRYAO9xnLMs=; b=Pqr6I3gqgSBGEk84gM/PwK3QeYZaXQlnEWTkbpVrK4nj/Tte1amIA64HWnflZ1oStVM1cJ6fFXHKC+6NOSE92uCqOqE3HClZl4PU1Pzkrr4zrG1uh2pnqYgr7GOolnXG0UXdiMyM36mVsat81XRea6o9EDBikTQ0/7KnqVvCGu4= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776099396800874.0274540260788; Mon, 13 Apr 2026 09:56:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCKZy-0004K5-Pd; Mon, 13 Apr 2026 12:56:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCKZx-0004Jn-7z for qemu-devel@nongnu.org; Mon, 13 Apr 2026 12:56:05 -0400 Received: from qs-2004g-snip4-11.eps.apple.com ([57.103.84.73] helo=outbound.qs.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCKZv-0006NU-F4 for qemu-devel@nongnu.org; Mon, 13 Apr 2026 12:56:05 -0400 Received: from outbound.qs.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-2d-100-percent-5 (Postfix) with ESMTPS id A16941800547; Mon, 13 Apr 2026 16:55:59 +0000 (UTC) Received: from localhost.localdomain (unknown [17.57.155.37]) by p00-icloudmta-asmtp-us-east-2d-100-percent-5 (Postfix) with ESMTPSA id 2C2EE18003D4; Mon, 13 Apr 2026 16:43:44 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1776099362; x=1778691362; bh=9f07FQNjyD0hoJ0U5EAu159dHGKdBEB3GRYAO9xnLMs=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=duFfb/2rmCto425LJTPfTltwSWFddTZTI68/Otkk7QZOH+iAqtVtArQ7ASYE4CgmHvK2WJZZUbTfE4S8pwg1ThhbcpEhp/mpb3lYW+de8U8b6lvdNbH4I6bQP/CbRgwUktQp3eRLcYcclzhwqfscc4vvFFxVdK0sA5yog0Sq2Sp9XdbVaap0a4hsXRpS49DM+2qWQSCH/y9yAPpUFgS49wSdm1hjyfI1usWcYb8wBt6KPCFgKEnfVX8LMkLql839+xgjv1TZ2d+45QID6EePBkCcUXMyF7i+L37xXoWzoSkUSNAPcKD8ppb+lm8SzU5HH6Gh/aFTlflQBCNTuIbV7Q== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Stefan Weil , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Jason Wang , Gal Horowitz Subject: [PATCH 2/3] tap-win32: cleanup leaked handles on tap close Date: Mon, 13 Apr 2026 18:43:37 +0200 Message-ID: <20260413164338.42894-3-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260413164338.42894-1-mohamed@unpredictable.fr> References: <20260413164338.42894-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Info-Out: v=2.4 cv=Q6zfIo2a c=1 sm=1 tr=0 ts=69dd2020 cx=c_apl:c_pps:t_out a=bsP7O+dXZ5uKcj+dsLqiMw==:117 a=bsP7O+dXZ5uKcj+dsLqiMw==:17 a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=pGLkceISAAAA:8 a=vyeFzZFV0_OpdQW4t0UA:9 X-Proofpoint-ORIG-GUID: LkWj2pst9LbFVv6vSycUSyjcoe1-0Min X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDEzMDE2NiBTYWx0ZWRfX2AztmPWOGd+G PL8KGu6p5ICjsdjWyBCe8cN1rnYjoSZ2tWwAOLaYOEP1DTJNg1qtOpJyUz6ZVjsBc8CnMX2yYlL oQbZ0IlnTkcJ4umIdZxWdlKgogD/4a4CoRBG7/rgvW/3LNEkdsIkLY3nb49ehbA0Sq2b8tWc8m/ L9a5W1Od4KPfQL6yOvigQ1ZcV+CpUzoHMSfqfBT+HLu8DvUXcDSSirECbXY89FiIwwrrYjQxDiG PEUAau9hrV6nlolxjywKeqEhgXxAB6BZwVnUgLAtEhJxLgS+aajChl5vr3dcoY3/1kIMDlppLYq CHm2yV+iHf3Zsv+7VsXXkaGkdK85qxoqhyB9jIzsDDbFH+9bkqNqx+zY+sk1og= X-Proofpoint-GUID: LkWj2pst9LbFVv6vSycUSyjcoe1-0Min X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-13_03,2026-04-13_04,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 clxscore=1030 mlxlogscore=999 adultscore=0 phishscore=0 bulkscore=0 mlxscore=0 suspectscore=0 spamscore=0 lowpriorityscore=0 malwarescore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2604130166 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=lists1p.gnu.org; Received-SPF: pass client-ip=57.103.84.73; envelope-from=mohamed@unpredictable.fr; helo=outbound.qs.icloud.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @unpredictable.fr) X-ZM-MESSAGEID: 1776099398053154100 Content-Type: text/plain; charset="utf-8" From: Gal Horowitz Currently, all handles owned by a win32 tap are leaked on cleanup. This commit ensures that the handles are properly closed upon tap cleanup. A check for the return value of CreateThread is also added. Signed-off-by: Gal Horowitz --- net/tap-win32.c | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/net/tap-win32.c b/net/tap-win32.c index 38baf90e0b..ae25e5a883 100644 --- a/net/tap-win32.c +++ b/net/tap-win32.c @@ -104,6 +104,7 @@ typedef struct tap_win32_overlapped { HANDLE output_queue_semaphore; HANDLE free_list_semaphore; HANDLE tap_semaphore; + HANDLE thread_handle; CRITICAL_SECTION output_queue_cs; CRITICAL_SECTION free_list_cs; OVERLAPPED read_overlapped; @@ -589,6 +590,26 @@ static void tap_win32_free_buffer(tap_win32_overlapped= _t *overlapped, put_buffer_on_free_list(overlapped, buffer); } =20 +static void tap_win32_close(tap_win32_overlapped_t *overlapped) +{ + TerminateThread(overlapped->thread_handle, 0); + CloseHandle(overlapped->thread_handle); + + CloseHandle(overlapped->tap_semaphore); + CloseHandle(overlapped->free_list_semaphore); + CloseHandle(overlapped->output_queue_semaphore); + + DeleteCriticalSection(&overlapped->free_list_cs); + DeleteCriticalSection(&overlapped->output_queue_cs); + + CloseHandle(overlapped->write_event); + CloseHandle(overlapped->read_event); + + CloseHandle(overlapped->handle); + + g_free(overlapped); +} + static int tap_win32_open(tap_win32_overlapped_t **phandle, const char *preferred_name) { @@ -604,7 +625,6 @@ static int tap_win32_open(tap_win32_overlapped_t **phan= dle, unsigned long debug; } version; DWORD version_len; - DWORD idThread; =20 if (preferred_name !=3D NULL) { snprintf(name_buffer, sizeof(name_buffer), "%s", preferred_name); @@ -642,15 +662,22 @@ static int tap_win32_open(tap_win32_overlapped_t **ph= andle, } =20 if (!tap_win32_set_status(handle, TRUE)) { + CloseHandle(handle); return -1; } =20 tap_win32_overlapped_init(&tap_overlapped, handle); =20 - *phandle =3D &tap_overlapped; + tap_overlapped.thread_handle =3D CreateThread(NULL, 0, + tap_win32_thread_entry, (LPVOID)&tap_overlapped, 0, NULL); + + if (tap_overlapped->thread_handle =3D=3D NULL) { + tap_win32_close(tap_overlapped); + return -1; + } + + *phandle =3D tap_overlapped; =20 - CreateThread(NULL, 0, tap_win32_thread_entry, - (LPVOID)&tap_overlapped, 0, &idThread); return 0; } =20 @@ -667,9 +694,8 @@ static void tap_cleanup(NetClientState *nc) =20 qemu_del_wait_object(s->handle->tap_semaphore, NULL, NULL); =20 - /* FIXME: need to kill thread and close file handle: - tap_win32_close(s); - */ + tap_win32_close(s->handle); + s->handle =3D NULL; } =20 static ssize_t tap_receive(NetClientState *nc, const uint8_t *buf, size_t = size) --=20 2.50.1 (Apple Git-155) From nobody Thu Apr 30 00:40:44 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=reject dis=none) header.from=unpredictable.fr ARC-Seal: i=1; a=rsa-sha256; t=1776099388; cv=none; d=zohomail.com; s=zohoarc; b=V9dwRTpYZOwVL7fevKhTn8J6XDNchC4vVXUumehzu0a7xd8x4r0tpPGKCimUX66XOO9sHrFBgRhfs1ZUPt3xbBq+UPvJQodXNb/tPAAoCbprfwri86f+4ZokZVhtN2KbFxt3C0cQelfpQ1QD23s+q1NwWNMmu/X03c9Ke1ELC40= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776099388; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ToEMsnEimqSsQl70dsHQJi59glSBxpGleQUdKNrc4Sg=; b=LIMLZ4jRRFN7SNc0MUWWzRULt/MQ9n1Ts/6eULVGvUtdpP5PTPp3n6m91cyBWn6zIEGGB2ijQMaWMRwrO2ax8aauh2+NIpNizgYCci0DaLTQUagQj0qPgSz1s3BAMyYe1ZCm1E5BA4S2ObRy4dX5rpcKtIy7cJSTwrZnTFnZfww= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776099388285744.8819955889686; Mon, 13 Apr 2026 09:56:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCKa1-0004Kc-Ru; Mon, 13 Apr 2026 12:56:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCKa0-0004KP-27 for qemu-devel@nongnu.org; Mon, 13 Apr 2026 12:56:08 -0400 Received: from qs-2004g-snip4-7.eps.apple.com ([57.103.84.70] helo=outbound.qs.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCKZy-0006Ns-I8 for qemu-devel@nongnu.org; Mon, 13 Apr 2026 12:56:07 -0400 Received: from outbound.qs.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-2d-100-percent-5 (Postfix) with ESMTPS id 0110B1800279; Mon, 13 Apr 2026 16:56:02 +0000 (UTC) Received: from localhost.localdomain (unknown [17.57.155.37]) by p00-icloudmta-asmtp-us-east-2d-100-percent-5 (Postfix) with ESMTPSA id 3E94E180057D; Mon, 13 Apr 2026 16:43:45 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1776099365; x=1778691365; bh=ToEMsnEimqSsQl70dsHQJi59glSBxpGleQUdKNrc4Sg=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=A1WZd7/jNpV6XPtSPQXNrZ/1LPOL7qzxFE/drbXPvN0H9TUKkQgu3T9FWsuItq2quM0cIiIfQB4ZexJfDiovnTsT8AX9OjG1z2PbakqwtjdcoYJEssaxreNGJXFjvrgNTDU56IhSJNpE2kPT1ka4iy0+z0KYUpvnyvPoKvQgl6YlqWnVV3/6nAwRaxGRObZJvRdYYeaIydZ4MzmO7693Pqjk5JNE5qsu7JbViqso0guC84ZjwJ3qKNvNBWM6hnlCdVJC2m35yeYOIEEJAr2Jx/zsNkDgMgrCZNY/hdu3dZDK8UaAA3Y3g27OhqYb1LKgyMVy6VY+C5regAEysb4IFA== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Stefan Weil , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Jason Wang , Gal Horowitz Subject: [PATCH 3/3] tap-win32: allocate separate tap state for each instance Date: Mon, 13 Apr 2026 18:43:38 +0200 Message-ID: <20260413164338.42894-4-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260413164338.42894-1-mohamed@unpredictable.fr> References: <20260413164338.42894-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Info-Out: v=2.4 cv=eKYeTXp1 c=1 sm=1 tr=0 ts=69dd2023 cx=c_apl:c_pps:t_out a=bsP7O+dXZ5uKcj+dsLqiMw==:117 a=bsP7O+dXZ5uKcj+dsLqiMw==:17 a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=pGLkceISAAAA:8 a=UVr0gZAdEIgvgD1kzycA:9 X-Proofpoint-ORIG-GUID: t4_NenBNUQtl75rsT2b_LVfeaU-PQDb_ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDEzMDE2NiBTYWx0ZWRfX5ISTb7o41Yzd 9DxXFLQWZFJtSnGaJZ7yuxgqgCN5ndD1BjAjJDzHtBOXdHXnA6Zei0+rCS2B7lNSN+e6heVTfgz ZFlzfYC3fq2iR/onmegYq2fhpquldLAmgZ+C9Y0jhYDb4EJD/oRIbla+1fKYCqac6vBCSlKLuVL nmVS9+dnudFvceKBIO/QlOrcaR57CYqUydr9QODulUAsKtcvejuXxAZF3gm9OjVcoZMy52EyiaA YGi2PyF84wTs9yf1irbvn3cHpaCQ0pp8MmaWxw5Aa87Xik8i9t1ybMFeL12IslM+tAxnJP6iLIB AWiO2SlIQqJT++Rr2fNqBXZJfiO2ouqCaORq2eW+seUhWcQWyw8H3UMYZj8vN8= X-Proofpoint-GUID: t4_NenBNUQtl75rsT2b_LVfeaU-PQDb_ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-13_03,2026-04-13_04,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0 lowpriorityscore=0 mlxlogscore=999 mlxscore=0 bulkscore=0 adultscore=0 suspectscore=0 phishscore=0 clxscore=1030 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2604130166 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=lists1p.gnu.org; Received-SPF: pass client-ip=57.103.84.70; envelope-from=mohamed@unpredictable.fr; helo=outbound.qs.icloud.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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @unpredictable.fr) X-ZM-MESSAGEID: 1776099390949158501 Content-Type: text/plain; charset="utf-8" From: Gal Horowitz A static global is incorrectly used as the tap state for all win32 taps created. Instead, we now allocate per win32 tap. Signed-off-by: Gal Horowitz --- net/tap-win32.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/net/tap-win32.c b/net/tap-win32.c index ae25e5a883..3d7227fcf4 100644 --- a/net/tap-win32.c +++ b/net/tap-win32.c @@ -115,8 +115,6 @@ typedef struct tap_win32_overlapped { tun_buffer_t* output_queue_back; } tap_win32_overlapped_t; =20 -static tap_win32_overlapped_t tap_overlapped; - static tun_buffer_t* get_buffer_from_free_list(tap_win32_overlapped_t* con= st overlapped) { tun_buffer_t* buffer =3D NULL; @@ -403,8 +401,10 @@ static int tap_win32_set_status(HANDLE handle, int sta= tus) &status, sizeof (status), &len, NULL); } =20 -static void tap_win32_overlapped_init(tap_win32_overlapped_t* const overla= pped, const HANDLE handle) +static tap_win32_overlapped_t *tap_win32_overlapped_new(const HANDLE handl= e) { + tap_win32_overlapped_t *overlapped =3D g_new0(tap_win32_overlapped_t, = 1); + overlapped->handle =3D handle; =20 overlapped->read_event =3D CreateEvent(NULL, FALSE, FALSE, NULL); @@ -455,6 +455,8 @@ static void tap_win32_overlapped_init(tap_win32_overlap= ped_t* const overlapped, overlapped->tap_semaphore =3D CreateSemaphore(NULL, 0, TUN_MAX_BUFFER_= COUNT, NULL); if(!overlapped->tap_semaphore) fprintf(stderr, "error creating tap_semaphore.\n"); + + return overlapped; } =20 static int tap_win32_write(tap_win32_overlapped_t *overlapped, @@ -625,6 +627,7 @@ static int tap_win32_open(tap_win32_overlapped_t **phan= dle, unsigned long debug; } version; DWORD version_len; + tap_win32_overlapped_t *tap_overlapped =3D NULL; =20 if (preferred_name !=3D NULL) { snprintf(name_buffer, sizeof(name_buffer), "%s", preferred_name); @@ -666,10 +669,10 @@ static int tap_win32_open(tap_win32_overlapped_t **ph= andle, return -1; } =20 - tap_win32_overlapped_init(&tap_overlapped, handle); + tap_overlapped =3D tap_win32_overlapped_new(handle); =20 - tap_overlapped.thread_handle =3D CreateThread(NULL, 0, - tap_win32_thread_entry, (LPVOID)&tap_overlapped, 0, NULL); + tap_overlapped->thread_handle =3D CreateThread(NULL, 0, + tap_win32_thread_entry, (LPVOID)tap_overlapped, 0, NULL); =20 if (tap_overlapped->thread_handle =3D=3D NULL) { tap_win32_close(tap_overlapped); --=20 2.50.1 (Apple Git-155)