From patchwork Thu Oct 6 15:11:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 13000491 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 CE930C433F5 for ; Thu, 6 Oct 2022 15:31:43 +0000 (UTC) Received: from localhost ([::1]:59618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ogSqc-0007C6-Hn for qemu-devel@archiver.kernel.org; Thu, 06 Oct 2022 11:31:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43660) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ogSXz-0003gD-6a for qemu-devel@nongnu.org; Thu, 06 Oct 2022 11:12:27 -0400 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]:43549) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ogSXx-0004ZE-Db for qemu-devel@nongnu.org; Thu, 06 Oct 2022 11:12:26 -0400 Received: by mail-pj1-x1031.google.com with SMTP id g1-20020a17090a708100b00203c1c66ae3so2047492pjk.2 for ; Thu, 06 Oct 2022 08:12:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wJ46lPbUundlzLry/XhmGks2ORwcj9XXEHBkBSD1tlY=; b=Rna0mLkdKWhgCJ/ONS7qgZETjRrCNSF0mes0fnT3xScgmTvdcsaWZKimDyemjd/XZm VVjK0YAtUXXdqg9Zbhfyt28k2+Jnr1U0L3kbtgxzBGOprCE1tn6cQoJ7Jfb/P6juvF1e Kura/+LoPsBOYJhvacPp2ezEE3T/OMZkCZLY9nSMSZqdJgNIDLQCc49jUBlThOAvDs3m Ovg3UhdteuopH/8lPINOtRvZkoxG9ue6Pad1QvkjYg6ttgVxR7eOjwJjUDjW2bdj3iWp 3YJoFeG+wDIZjuhPVHoFV9aIgn2bX4qFtbhD6LECm9A6CJJ2F+dOv5BKHtZbXNBQ4ai1 Embg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wJ46lPbUundlzLry/XhmGks2ORwcj9XXEHBkBSD1tlY=; b=WZ/KtYq0qCtvyCswak39oViJM0nMQFnsB6YHwZDvyPHyoag8/R1sRoBhEcq10MLWt+ sSaRDFAsrYtCfyZXVdm+gfqbSfeW583XLEX7URB2fjNvVpVkYTyxKTYAkdxlx5AjtRum PanNd/6StFKVxJmlSbx+RPkqqgwzSrkGPDsj1qkCOemFc4N96SXEKYuz0My6YqXb4NbU SXu/o8UvfMYmov0BCbq9CWL0mTIHkUsk7PD/0HeOC9OKDIt0MOE/4P6GLgeGgJK1cuub GkK5aRpM/1lLnUp0QkF/sd3AX543cLxsuH6io7WrEGG9m5sASlaOSi0kiHzqf2WOhADs qA2Q== X-Gm-Message-State: ACrzQf16K/EzYElVSzX/AbXffkgx2kQyB2ubY/lvfGyVDZe/cy2QWVaz pRaaGtEf6OXmujOgWEL7+WRb3+T2eXA= X-Google-Smtp-Source: AMsMyM5pH0SKJ9BQvbGqcZ7pdz46nmFYY0yZsgSgVi04VaBCJyIRP3c/p+5AH3T2R202+oueYq2ahA== X-Received: by 2002:a17:90b:3b47:b0:202:d9d4:23f7 with SMTP id ot7-20020a17090b3b4700b00202d9d423f7mr11030675pjb.56.1665069144081; Thu, 06 Oct 2022 08:12:24 -0700 (PDT) Received: from ubuntu.. (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id 135-20020a62148d000000b00540c8ed61ddsm8589067pfu.150.2022.10.06.08.12.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Oct 2022 08:12:23 -0700 (PDT) From: Bin Meng To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Bin Meng , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PATCH 14/18] io/channel-watch: Drop a superfluous '#ifdef WIN32' Date: Thu, 6 Oct 2022 23:11:31 +0800 Message-Id: <20221006151135.2078908-15-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221006151135.2078908-1-bmeng.cn@gmail.com> References: <20221006151135.2078908-1-bmeng.cn@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=bmeng.cn@gmail.com; helo=mail-pj1-x1031.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 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 In the win32 version qio_channel_create_socket_watch() body there is no need to do a '#ifdef WIN32'. Signed-off-by: Bin Meng Reviewed-by: Marc-André Lureau --- (no changes since v1) io/channel-watch.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/io/channel-watch.c b/io/channel-watch.c index 0289b3647c..89f3c8a88a 100644 --- a/io/channel-watch.c +++ b/io/channel-watch.c @@ -285,11 +285,9 @@ GSource *qio_channel_create_socket_watch(QIOChannel *ioc, GSource *source; QIOChannelSocketSource *ssource; -#ifdef WIN32 WSAEventSelect(socket, ioc->event, FD_READ | FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_WRITE | FD_OOB); -#endif source = g_source_new(&qio_channel_socket_source_funcs, sizeof(QIOChannelSocketSource));