From nobody Tue Feb 10 06:58:01 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17683093758571015.0639304352965; Tue, 13 Jan 2026 05:02:55 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfe2l-00027k-2o; Tue, 13 Jan 2026 08:02:44 -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 1vfe0y-00075U-0X; Tue, 13 Jan 2026 08:00:56 -0500 Received: from isrv.corpit.ru ([212.248.84.144]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfe0w-00018R-IV; Tue, 13 Jan 2026 08:00:51 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id DAFE617D9E5; Tue, 13 Jan 2026 16:00:05 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id D5BFA34C41C; Tue, 13 Jan 2026 16:00:10 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Michael Tokarev Subject: [PATCH trivial 7/7] rename CONFIG_EPOLL_CREATE1 to CONFIG_EPOLL Date: Tue, 13 Jan 2026 16:00:08 +0300 Message-ID: <20260113130008.910240-11-mjt@tls.msk.ru> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260113130008.910240-1-mjt@tls.msk.ru> References: <20260113130008.910240-1-mjt@tls.msk.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 (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=212.248.84.144; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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: 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-ZM-MESSAGEID: 1768309376952158500 Content-Type: text/plain; charset="utf-8" Since CONFIG_EPOLL is now unused, it's okay to perform this rename, to make it less ugly. Since epoll is linux-specific and is always present, we might as well make CONFIG_EPOLL equal to CONFIG_LINUX. Signed-off-by: Michael Tokarev --- meson.build | 2 +- util/aio-posix.h | 4 ++-- util/meson.build | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index f8b4f06049..552b34f34e 100644 --- a/meson.build +++ b/meson.build @@ -2713,7 +2713,7 @@ config_host_data.set('CONFIG_INOTIFY1', have_inotify_= init1) # has_header_symbol config_host_data.set('CONFIG_BLKZONED', cc.has_header_symbol('linux/blkzoned.h', 'BLKOPENZONE= ')) -config_host_data.set('CONFIG_EPOLL_CREATE1', +config_host_data.set('CONFIG_EPOLL', cc.has_header_symbol('sys/epoll.h', 'epoll_create1')) config_host_data.set('CONFIG_FALLOCATE_PUNCH_HOLE', cc.has_header_symbol('linux/falloc.h', 'FALLOC_FL_PUN= CH_HOLE') and diff --git a/util/aio-posix.h b/util/aio-posix.h index 0cedb8d189..ab894a3c0f 100644 --- a/util/aio-posix.h +++ b/util/aio-posix.h @@ -52,7 +52,7 @@ extern const FDMonOps fdmon_poll_ops; /* Switch back to poll(2). list_lock must be held. */ void fdmon_poll_downgrade(AioContext *ctx); =20 -#ifdef CONFIG_EPOLL_CREATE1 +#ifdef CONFIG_EPOLL bool fdmon_epoll_try_upgrade(AioContext *ctx, unsigned npfd); void fdmon_epoll_setup(AioContext *ctx); =20 @@ -71,7 +71,7 @@ static inline void fdmon_epoll_setup(AioContext *ctx) static inline void fdmon_epoll_disable(AioContext *ctx) { } -#endif /* !CONFIG_EPOLL_CREATE1 */ +#endif /* !CONFIG_EPOLL */ =20 #ifdef CONFIG_LINUX_IO_URING bool fdmon_io_uring_setup(AioContext *ctx, Error **errp); diff --git a/util/meson.build b/util/meson.build index 35029380a3..44f0312e8c 100644 --- a/util/meson.build +++ b/util/meson.build @@ -6,7 +6,7 @@ endif if host_os !=3D 'windows' util_ss.add(files('aio-posix.c')) util_ss.add(files('fdmon-poll.c')) - if config_host_data.get('CONFIG_EPOLL_CREATE1') + if config_host_data.get('CONFIG_EPOLL') util_ss.add(files('fdmon-epoll.c')) endif util_ss.add(files('compatfd.c')) --=20 2.47.3