From nobody Wed Feb 11 02:10:06 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=1676929929; cv=none; d=zohomail.com; s=zohoarc; b=CxWcEciQLOMmx8i4jVGqDSGPu8ePcr8iITGKu4dxh6xXB5DRBswDilSeozuPTo0u3cGMKnXxN9+6HmxIKxVIlwtNMwMAJxwo29tV1YMq0DNCmfHFbLtBDIFtu/F6UKJ4Br/gLhGJvpK92CF3GKcboAgWyL59Bo1SqFoWaHPxe9c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676929929; 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=yhViJ0OHr5jGtHO67wWfbPRObY3fGOXAVcHvOoIgnys=; b=IUsXSM5+ThzxNPtJJuY2FgfTKOAAcmUHlf5rFSXoJ4RIUY3ssmmcclMsNwS7an0OYvk2Tft/BLjruncNeiRUViEEm1L8x3+HVu0E4T3+SbGa1hcSrDaiL6IavlMph/7Q91TQbG+pmTdTnjO3D1/R8++rMA6ETZQbWteXymeA6fI= 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 1676929929531757.0657043583694; Mon, 20 Feb 2023 13:52:09 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pUE2v-0003cv-OE; Mon, 20 Feb 2023 16:50:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pUE2u-0003bd-8c for qemu-devel@nongnu.org; Mon, 20 Feb 2023 16:50:04 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pUE2o-00080w-DG for qemu-devel@nongnu.org; Mon, 20 Feb 2023 16:50:03 -0500 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-372-pvWp0RBOPAi-_9TAwxzb5A-1; Mon, 20 Feb 2023 16:49:52 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 518A5101A521; Mon, 20 Feb 2023 21:49:52 +0000 (UTC) Received: from localhost (unknown [10.39.208.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id 492B718EC6; Mon, 20 Feb 2023 21:49:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676929797; 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=yhViJ0OHr5jGtHO67wWfbPRObY3fGOXAVcHvOoIgnys=; b=GIHezvC765rDMzIUY9lXAcvvKbKtpk74Itp+TO5697HCBMb+CzhA5ns0xYcYqcpoFkBOdC 1ArQWgY5bU5Yx2yyLN0W4mThfig73dZrLathBzFN+aUgwbmM8zIwLesOzSQylKR97JvR+5 ZHP2sN8W3enWKxMEEMPmNHIgxZtVbME= X-MC-Unique: pvWp0RBOPAi-_9TAwxzb5A-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Michael Roth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Joel Stanley , Jason Wang , qemu-block@nongnu.org, Markus Armbruster , Thomas Huth , qemu-arm@nongnu.org, Stefan Berger , Laurent Vivier , Samuel Thibault , Stefan Weil , Fam Zheng , Paolo Bonzini , Kevin Wolf , Hanna Reitz , Stefan Hajnoczi , Peter Maydell , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v2 12/15] slirp: open-code qemu_socket_(un)select() Date: Tue, 21 Feb 2023 01:48:56 +0400 Message-Id: <20230220214859.3792171-13-marcandre.lureau@redhat.com> In-Reply-To: <20230220214859.3792171-1-marcandre.lureau@redhat.com> References: <20230220214859.3792171-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 3.1 on 10.11.54.5 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.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.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, 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_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=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: 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 @redhat.com) X-ZM-MESSAGEID: 1676929931123100001 From: Marc-Andr=C3=A9 Lureau We are about to make the QEMU socket API use file-descriptor space only, but libslirp gives us SOCKET as fd, still. Signed-off-by: Marc-Andr=C3=A9 Lureau --- net/slirp.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/net/slirp.c b/net/slirp.c index a7c35778a6..c33b3e02e7 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -251,16 +251,20 @@ static void net_slirp_register_poll_fd(int fd, void *= opaque) #ifdef WIN32 AioContext *ctxt =3D qemu_get_aio_context(); =20 - qemu_socket_select(fd, event_notifier_get_handle(&ctxt->notifier), + if (WSAEventSelect(fd, event_notifier_get_handle(&ctxt->notifier), FD_READ | FD_ACCEPT | FD_CLOSE | - FD_CONNECT | FD_WRITE | FD_OOB, NULL); + FD_CONNECT | FD_WRITE | FD_OOB) !=3D 0) { + error_setg_win32(&error_warn, WSAGetLastError(), "failed to WSAEve= ntSelect()"); + } #endif } =20 static void net_slirp_unregister_poll_fd(int fd, void *opaque) { #ifdef WIN32 - qemu_socket_unselect(fd, NULL); + if (WSAEventSelect(fd, NULL, 0) !=3D 0) { + error_setg_win32(&error_warn, WSAGetLastError(), "failed to WSAEve= ntSelect()"); + } #endif } =20 --=20 2.39.1