From nobody Tue Apr 7 19:51:16 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 ARC-Seal: i=1; a=rsa-sha256; t=1773262555; cv=none; d=zohomail.com; s=zohoarc; b=T4GBVA3Rzw3odXwxh2F+NhzkQf2MvEG4evsN3WsxVh3dMGu18cWcav0OFtEzVtqMVJ/5GwFZrKCVgApmiJ8SaKTxbmiSBbpZJn4/qQXROgoO6ykAZMBKOiL16e1/3qtSxcX9uQMdoYvtx4sB5fTpJTykW8RCupri53K+Xvrxqkc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773262555; 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=cPyzakDRHEn9oerst7QGZsFSOtnRE5S4XRQvz5D+uaY=; b=Z5vGB1JA2+iBgRfcGJ6qT4XzYckW59SX4dZhO+RIUDOQgXxvxFnHXhMIm/vvbQU78+h0+20elZRtpJWFGYN7I2cNSvyc73yuAW1uOGi5zwimuwdAf+VscQemWS1fVmTm8tOhcUmO4VCsVJ3u4AXvfDZNWSVX/txR0/EYYI7YR9A= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773262554035822.5800771396656; Wed, 11 Mar 2026 13:55:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0Qan-0003jW-NZ; Wed, 11 Mar 2026 16:55:45 -0400 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 1w0QaS-0003cp-Ox; Wed, 11 Mar 2026 16:55:26 -0400 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 1w0QaE-0007qX-Qk; Wed, 11 Mar 2026 16:55:15 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id C9EAC1921EE; Wed, 11 Mar 2026 23:54:28 +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 1E6AB37C4D3; Wed, 11 Mar 2026 23:55:07 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tls.msk.ru; s=202602; t=1773262468; bh=OypHeseeUnisNWsxoYu0ufPJCoq2DAtpiWgkXRZ3XeU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=VXjvXZ//4wfYNelsmaneSuwqPpaBTCNbE8L6ywjbBSGxAsPkNbp5lOWatXL2tMWts lIX7NE6Ykjd+QZEbXYXA758z1k8T8ZG03UKqq7ElzOCtkOhul+b2k0vPeSG7yaeH27 mc9mNpdlKZ09T6XYRmYLyr13HSyIyDQZ9Q8IBnKdleeKbD/xt5Zo/D7PQydEvXOJLG DpiPZPluaiKnXeW6BnYaJ8BbqduikMYlCnpw30YHYgI9nGIkSBt6ALmxTFWdWEe9U5 aabyFX1urxChf9sdF+wOHUuHT9mpFVeShhJ81zD5B7PiPZ+PZ7UJEiIPGfrARkNzOv KEy34kqA+n0jw== From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Michael Tokarev , qemu-trivial@nongnu.org, Peter Maydell , Richard Henderson Subject: [PATCH trivial v2 1/7] linux-user/syscall.c: assume splice is always present Date: Wed, 11 Mar 2026 23:54:49 +0300 Message-ID: <20260311205459.1101023-2-mjt@tls.msk.ru> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260311205459.1101023-1-mjt@tls.msk.ru> References: <20260311205459.1101023-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 client-ip=212.248.84.144; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 @tls.msk.ru) X-ZM-MESSAGEID: 1773262566729158500 Content-Type: text/plain; charset="utf-8" splice() &Co are defined since linux 2.6.17 (glibc 2.5). Assume it is always present. Reviewed-by: Peter Maydell Reviewed-by: Richard Henderson Signed-off-by: Michael Tokarev --- linux-user/syscall.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 064bc604c9..87f9c22b68 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -13624,15 +13624,9 @@ static abi_long do_syscall1(CPUArchState *cpu_env,= int num, abi_long arg1, return ret; #endif =20 -#ifdef CONFIG_SPLICE -#ifdef TARGET_NR_tee case TARGET_NR_tee: - { - ret =3D get_errno(tee(arg1,arg2,arg3,arg4)); - } + ret =3D get_errno(tee(arg1, arg2, arg3, arg4)); return ret; -#endif -#ifdef TARGET_NR_splice case TARGET_NR_splice: { loff_t loff_in, loff_out; @@ -13662,9 +13656,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, = int num, abi_long arg1, } } return ret; -#endif -#ifdef TARGET_NR_vmsplice - case TARGET_NR_vmsplice: + case TARGET_NR_vmsplice: { struct iovec *vec =3D lock_iovec(VERIFY_READ, arg2, arg3, 1); if (vec !=3D NULL) { @@ -13675,8 +13667,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, = int num, abi_long arg1, } } return ret; -#endif -#endif /* CONFIG_SPLICE */ + #ifdef CONFIG_EVENTFD #if defined(TARGET_NR_eventfd) case TARGET_NR_eventfd: --=20 2.47.3 From nobody Tue Apr 7 19:51:16 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 ARC-Seal: i=1; a=rsa-sha256; t=1773262577; cv=none; d=zohomail.com; s=zohoarc; b=P1zYy/rxLvnzgMaosysnCF4+JtEHyzEp5hLSSw4oud+B3f4gd+24VS/LDOhkq3uoJltrsSPHSkp3fjbOQv5oL+RIZFyDA9zhJi/95nMb0QUo7s4d+OELFoO6A4kg3oAsiu9Ex5M2l0tvW7037ES+Vm4kpHwGIoWa3DGCyhEfg+4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773262577; 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=c5IpVMfh9hMR7Ow1hDxq1RGZsS95CYqjx9/itjr69+Y=; b=NAjE0WFkzfuTV9C8RIvAa2j52Ly7yqqpcmZGD9/Lwu9RR7WAPZ4yIa2X8pUjnX8NxmlcDKauIf0BgMHRNACPrIRaTRxlYyb/xjXHgy4sJzn0pNzoPY6+v7bFlIeB77FlPDSbbLimYCZmefankxWIPJaFf9eKMAs+gQ8DecL9qdw= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773262577892614.9495380237349; Wed, 11 Mar 2026 13:56:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0Qao-0003lw-S5; Wed, 11 Mar 2026 16:55:47 -0400 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 1w0Qaj-0003gk-Ax; Wed, 11 Mar 2026 16:55:41 -0400 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 1w0Qab-00082n-9w; Wed, 11 Mar 2026 16:55:36 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id D075F1921EF; Wed, 11 Mar 2026 23:54:28 +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 2E6CD37C4D4; Wed, 11 Mar 2026 23:55:07 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tls.msk.ru; s=202602; t=1773262468; bh=cbFwEQUAlt45RFRT5FJ2dSzJA7pXHrfL/Flm+6+wv5I=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=aZXY9P22VF/WrO101+e8u0Ks/udEiHmkfFwKDREg/1YkXBeO2iOWCWuF2TbfvwrU2 r5EcsihX7Tgo64fV3Np6tM868/PWMJcUX4gWQ2fBbRKCy6FgS4K6gOGKl4mFcjG94z P96CRnx1urnVnGctD0boUyrGraLxGpQWNF9zwB5VQbSuAnnPpXGOk2P7tO7V5SvVy3 U/CpdKPimFbK3TaVKVVGTT/jkrffSMqeTHu7wylP5yXzbz6uVnGhuWXXRHkZKvVGVO gb6OfesxCNqD0D3FKSh+udLUAGft543lO5lafCElfKA/Y5Ae2kJunXpyABzYDt0ciH qTN/AFX9d7rOQ== From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Michael Tokarev , qemu-trivial@nongnu.org, Richard Henderson Subject: [PATCH trivial v2 2/7] meson.build: stop checking for splice() Date: Wed, 11 Mar 2026 23:54:50 +0300 Message-ID: <20260311205459.1101023-3-mjt@tls.msk.ru> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260311205459.1101023-1-mjt@tls.msk.ru> References: <20260311205459.1101023-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 client-ip=212.248.84.144; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 @tls.msk.ru) X-ZM-MESSAGEID: 1773262581237154100 Content-Type: text/plain; charset="utf-8" CONFIG_SPLICE was only needed for linux-user/, where it is not used anymore (assuming splice &Co is always present) Reviewed-by: Richard Henderson Signed-off-by: Michael Tokarev --- meson.build | 8 -------- 1 file changed, 8 deletions(-) diff --git a/meson.build b/meson.build index ed82247111..97af137f3f 100644 --- a/meson.build +++ b/meson.build @@ -2908,14 +2908,6 @@ config_host_data.set('CONFIG_PTHREAD_AFFINITY_NP', c= c.links(osdep_prefix + ''' config_host_data.set('CONFIG_SIGNALFD', cc.links(osdep_prefix + ''' #include int main(void) { return signalfd(-1, NULL, SFD_CLOEXEC); }''')) -config_host_data.set('CONFIG_SPLICE', cc.links(osdep_prefix + ''' - int main(void) - { - int len, fd =3D 0; - len =3D tee(STDIN_FILENO, STDOUT_FILENO, INT_MAX, SPLICE_F_NONBLOCK); - splice(STDIN_FILENO, NULL, fd, NULL, len, SPLICE_F_MOVE); - return 0; - }''')) =20 config_host_data.set('HAVE_MLOCKALL', cc.links(osdep_prefix + ''' #include --=20 2.47.3 From nobody Tue Apr 7 19:51:16 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 ARC-Seal: i=1; a=rsa-sha256; t=1773262572; cv=none; d=zohomail.com; s=zohoarc; b=Pl0DxKTlw+KhiGUf+rHAO45+SBU3GudFjXdAZR8GP1GXZpBkP6rD9NjKm2Kxh6wlxXPWX+O/QpFcd//f31bI3I69Y7Z8GhN7+luOjDyOykAZ+o0aIZWr0ArXJyJ1o4yAn4ZV81X8Y722SB5CorEaW0uiz6nxQd18nAfegy07noc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773262572; 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=F3wR57gaMw+IFUFOgElQaNFDyzCf6PH1hNChKFRh7Ko=; b=a/Z740OMHW7eh4VFOPcHG5pusGjsy2OSC2KYP2NwREK7Os/ZgwJo9p7aZQSTpu8vTpGPssq/jE4uyZLXCZu1COPvB95r8RRszk3xC5x6EefWu5Clw2TzRsP6Rdhqgwz9G7muuzHR+9cVVBbmL8n/myNBWvRcBKfRg7OTvsKgMnw= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773262572234614.840971669078; Wed, 11 Mar 2026 13:56:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0Qan-0003ix-Bm; Wed, 11 Mar 2026 16:55:45 -0400 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 1w0Qaj-0003gj-At; Wed, 11 Mar 2026 16:55:41 -0400 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 1w0QaX-00082u-R6; Wed, 11 Mar 2026 16:55:36 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id DC1AF1921F0; Wed, 11 Mar 2026 23:54:28 +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 47BA537C4D5; Wed, 11 Mar 2026 23:55:07 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tls.msk.ru; s=202602; t=1773262468; bh=2ZQAMKNvsoITqJfmAT8LBeZf1cS/n75aHcbFq2pkSWs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=W62Dd+x3Q0ZX34W/x60hv1Ya0+/mdk208PL7pfZdTAMLHn1GiHigDmH4bkoNo6M28 r7BlDF9zir3+GmCvBjqYLLhJcMIMk9d+rTxbKQB/7MxL2AeZMGhAUg5XTlv7+vXnZx EM5v3NfYcC7UMydARiqqc3oBh3wuK9vOxiAuM0pOBRxeOG/5l4j2LV7Z1AIgfaizmW Q46yN068e7q+eQoc69mgWHW8+zcQD/EB+qLPWiq7f9/DrE8VKe/obwuoDFOJX4N/UB Z0qqMwQsLnAFwB9JOS7h2b8K6IpleF1NexSFXTmX3/XqX3HX8bexLdPGv6xg6mG895 oIb7KrtcEBKyQ== From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Michael Tokarev , qemu-trivial@nongnu.org Subject: [PATCH trivial v2 3/7] linux-user: assume inotify sycalls are always present Date: Wed, 11 Mar 2026 23:54:51 +0300 Message-ID: <20260311205459.1101023-4-mjt@tls.msk.ru> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260311205459.1101023-1-mjt@tls.msk.ru> References: <20260311205459.1101023-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 client-ip=212.248.84.144; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 @tls.msk.ru) X-ZM-MESSAGEID: 1773262578636154100 Content-Type: text/plain; charset="utf-8" inotify_init() and other syscalls appeared in linux 2.6.13, inotify_init1() - in linux 2.6.27. There's no need to check their presence on linux anymore. Keep condition on TARGET_NR_inotify_init because modern architectures have only more generic inotify_init1(). Other, not linux-specific, places of the code checks for inotify_init1() syscall only. Signed-off-by: Michael Tokarev --- linux-user/fd-trans.c | 5 ----- linux-user/fd-trans.h | 4 ---- linux-user/syscall.c | 19 ++----------------- 3 files changed, 2 insertions(+), 26 deletions(-) diff --git a/linux-user/fd-trans.c b/linux-user/fd-trans.c index f83d1f79d5..64dd0745d2 100644 --- a/linux-user/fd-trans.c +++ b/linux-user/fd-trans.c @@ -18,9 +18,7 @@ #include #include #include -#ifdef CONFIG_INOTIFY #include -#endif #include #ifdef CONFIG_RTNETLINK #include @@ -1861,8 +1859,6 @@ TargetFdTrans target_timerfd_trans =3D { .host_to_target_data =3D swap_data_u64, }; =20 -#if defined(CONFIG_INOTIFY) && (defined(TARGET_NR_inotify_init) || \ - defined(TARGET_NR_inotify_init1)) static abi_long host_to_target_data_inotify(void *buf, size_t len) { struct inotify_event *ev; @@ -1885,4 +1881,3 @@ static abi_long host_to_target_data_inotify(void *buf= , size_t len) TargetFdTrans target_inotify_trans =3D { .host_to_target_data =3D host_to_target_data_inotify, }; -#endif diff --git a/linux-user/fd-trans.h b/linux-user/fd-trans.h index e14f96059c..3bbc15fa1f 100644 --- a/linux-user/fd-trans.h +++ b/linux-user/fd-trans.h @@ -141,9 +141,5 @@ extern TargetFdTrans target_netlink_audit_trans; extern TargetFdTrans target_signalfd_trans; extern TargetFdTrans target_eventfd_trans; extern TargetFdTrans target_timerfd_trans; -#if (defined(TARGET_NR_inotify_init) && defined(__NR_inotify_init)) || \ - (defined(CONFIG_INOTIFY1) && defined(TARGET_NR_inotify_init1) && \ - defined(__NR_inotify_init1)) extern TargetFdTrans target_inotify_trans; #endif -#endif diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 87f9c22b68..1f28e7e93f 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -514,15 +514,7 @@ static int sys_renameat2(int oldfd, const char *old, #endif #endif /* TARGET_NR_renameat2 */ =20 -#ifdef CONFIG_INOTIFY #include -#else -/* Userspace can usually survive runtime without inotify */ -#undef TARGET_NR_inotify_init -#undef TARGET_NR_inotify_init1 -#undef TARGET_NR_inotify_add_watch -#undef TARGET_NR_inotify_rm_watch -#endif /* CONFIG_INOTIFY */ =20 #if defined(TARGET_NR_prlimit64) #ifndef __NR_prlimit64 @@ -13441,8 +13433,8 @@ static abi_long do_syscall1(CPUArchState *cpu_env, = int num, abi_long arg1, case TARGET_NR_futex_time64: return do_futex(cpu, true, arg1, arg2, arg3, arg4, arg5, arg6); #endif -#ifdef CONFIG_INOTIFY -#if defined(TARGET_NR_inotify_init) + +#ifdef TARGET_NR_inotify_init case TARGET_NR_inotify_init: ret =3D get_errno(inotify_init()); if (ret >=3D 0) { @@ -13450,7 +13442,6 @@ static abi_long do_syscall1(CPUArchState *cpu_env, = int num, abi_long arg1, } return ret; #endif -#if defined(TARGET_NR_inotify_init1) && defined(CONFIG_INOTIFY1) case TARGET_NR_inotify_init1: ret =3D get_errno(inotify_init1(target_to_host_bitmask(arg1, fcntl_flags_tbl))); @@ -13458,19 +13449,13 @@ static abi_long do_syscall1(CPUArchState *cpu_env= , int num, abi_long arg1, fd_trans_register(ret, &target_inotify_trans); } return ret; -#endif -#if defined(TARGET_NR_inotify_add_watch) case TARGET_NR_inotify_add_watch: p =3D lock_user_string(arg2); ret =3D get_errno(inotify_add_watch(arg1, path(p), arg3)); unlock_user(p, arg2, 0); return ret; -#endif -#if defined(TARGET_NR_inotify_rm_watch) case TARGET_NR_inotify_rm_watch: return get_errno(inotify_rm_watch(arg1, arg2)); -#endif -#endif =20 #if defined(TARGET_NR_mq_open) && defined(__NR_mq_open) case TARGET_NR_mq_open: --=20 2.47.3 From nobody Tue Apr 7 19:51:16 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 ARC-Seal: i=1; a=rsa-sha256; t=1773262603; cv=none; d=zohomail.com; s=zohoarc; b=KKeBm53PjYnGunmEgFyQJzGmtGiyfUyiL9sAFDjOflVbNnQY3MnaWWBaqIV/lw7SIm+KEw5L+Yf1wsYPVLNCzCKE1pawcochJLw+kJSjx+04GiA8cHz+bSojxUwxzv3tPm2R/pDnBgZo8GT5jUSUqTT5Ib/iOAQINu/j/4Exkvo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773262603; 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=9buD4q9LWcZBPBFB48SYttwENafRmmn3Cs0CAV2dkaY=; b=YWInoGySxkrzIOzv53fUFoJqkf5ZOsXq7ryLiKJeX/GocFRZKQyxZAuhTOBohcveHc9O2ZNv+XIdU8dmp/jIDuDo8OhtiLmio3r0f+aPMPdQ8O0YATVEumwC2CsKR+xbyaPeVf/IBV1fxAjSJIE01oADDlr/+1YMg/OSvYZ1ePk= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773262603835953.3911118143983; Wed, 11 Mar 2026 13:56:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0Qar-0003qQ-W4; Wed, 11 Mar 2026 16:55:50 -0400 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 1w0Qao-0003kk-9m; Wed, 11 Mar 2026 16:55:46 -0400 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 1w0Qal-0008FH-Bf; Wed, 11 Mar 2026 16:55:45 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id F35661921F1; Wed, 11 Mar 2026 23:54:28 +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 5452D37C4D6; Wed, 11 Mar 2026 23:55:07 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tls.msk.ru; s=202602; t=1773262468; bh=f6Nx+HWByGmnQmKv2UQgmEd4UeKnLT2KP2r/nzZ06NM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=mDGLgadHZsf3KuyOl/VyviKs7TiWi7kLJtdR/xMDMFel41ViypF87XZT1CkqHupsW B4vYH1Nx1q2jNgAxrBKipUHB7QimlzT8vE5ugJJ8JQd4fonrM4Dj9ZRZlw38Hgmyze zSJpLFlN1H4EbiVcamTzCqVWmYme+7XpkIZHTImk9V9es2MHxIdTMhRMzJPR1Wd672 PIrHdBpJvQu8aHfMGvS9mFrmwMGu7sFfDxT1zBKaLnsBEplClPqlGlzEHgQeU7jEJz LbA5sV77Ygq4aZSUoCunhZ7rMxtByVYkkU4KfHp5/veSdM5jpF3i80JB5OxU3HLgHA tKsX0X1sR720Q== From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Michael Tokarev , qemu-trivial@nongnu.org Subject: [PATCH trivial v2 4/7] meson.build: stop checking for inotify_init() Date: Wed, 11 Mar 2026 23:54:52 +0300 Message-ID: <20260311205459.1101023-5-mjt@tls.msk.ru> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260311205459.1101023-1-mjt@tls.msk.ru> References: <20260311205459.1101023-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 client-ip=212.248.84.144; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 @tls.msk.ru) X-ZM-MESSAGEID: 1773262605825158500 Content-Type: text/plain; charset="utf-8" the only place in qemu which used the check for inotify_init() was linux-user, which now assumes inotify_init() is always present. There's no need to check for this function anymore. Signed-off-by: Michael Tokarev --- meson.build | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 97af137f3f..bc60f71825 100644 --- a/meson.build +++ b/meson.build @@ -2675,15 +2675,12 @@ endif config_host_data.set('CONFIG_ASAN_IFACE_FIBER', have_asan_fiber) =20 inotify =3D not_found -have_inotify_init =3D cc.has_header_symbol('sys/inotify.h', 'inotify_init') have_inotify_init1 =3D cc.has_header_symbol('sys/inotify.h', 'inotify_init= 1') -if (have_inotify_init or have_inotify_init1) and not cc.has_function('inot= ify_init1') +if have_inotify_init1 and not cc.has_function('inotify_init1') # FreeBSD 14 and older need libinotify-kqueue wrapper inotify =3D cc.find_library('inotify') - have_inotify_init =3D have_inotify_init and inotify.found() - have_inotify_init1 =3D have_inotify_init1 and inotify.found() + have_inotify_init1 =3D inotify.found() endif -config_host_data.set('CONFIG_INOTIFY', have_inotify_init) config_host_data.set('CONFIG_INOTIFY1', have_inotify_init1) =20 # has_header_symbol --=20 2.47.3 From nobody Tue Apr 7 19:51:16 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 ARC-Seal: i=1; a=rsa-sha256; t=1773262627; cv=none; d=zohomail.com; s=zohoarc; b=n5HS9nc+tsCkWdQLGzB772K1LH07pojbTDMqhnO8xnz/lsqE3jAc21gfb4jVg5p1FwQIx/Q8kyapQiQX/vLKMsLCuu9+YMldYC1k7if5ChfzQ4zHAs96sMHJxHH4s6WpaxHYK8XpPh5psfZ82MSer3Lr76NlLrfEnfqGxay0LsE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773262627; 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=2qVl7QEYj/cG67w4WMpHzKvP3d45+BfryP7DmZUj8Wk=; b=TqAJGj0xyBk/Iw5ZLvLAJZp7SAQ/yDW+tqGEjH0ylEXpNyFFVNre7wI51i/W40eogRsK1x2eQDjbjC+srFhpL6k3t0zRLbqFlz1PPElH6RnQ25AGjucj9y0eBfbVbfftJRXyCKjc+FTJsERGjfjQ5P61/8FeKJvz2yuHCeoaLd8= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773262626628936.6520558184648; Wed, 11 Mar 2026 13:57:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0Qat-0003r6-IE; Wed, 11 Mar 2026 16:55:51 -0400 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 1w0Qao-0003lD-FE; Wed, 11 Mar 2026 16:55:46 -0400 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 1w0Qal-0008FI-CF; Wed, 11 Mar 2026 16:55:46 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 0E7561921F2; Wed, 11 Mar 2026 23:54:29 +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 6B59637C4D7; Wed, 11 Mar 2026 23:55:07 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tls.msk.ru; s=202602; t=1773262469; bh=AcNMYIFDrEN54FI0tN/yss+Qg87nVMQ2Wyhg1uY/8v4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=R/RpijkIDUEzvztXohHh74cU22bDDulRaPK5OTLZtkswPXyz7UD4D0W31/KyLmVNw KYMxca1VodUoo5OaSODRmwDlfwQdO94FOzLQNuHnAIyi18ZTLtSz3BRe9d6KjyRRZv 5iVKPt3shNIPb2wZOq4l9imSIsA5MbuRZ8II7RSvGPwBlL+p3TTI2OwzvliTITX09U 5Yim/H0PV1xqPx0k7bR3QbutuJHfQfFXcrF0+h91IqZTNIRtH12U9hW011gAQhuA+V lI0cuWqfgxsWjWZE6AH6/aNiRGZB6dMKxiksTZTO7vXnAoUfs4fvK56TR4jmFGxv/d bapG7oELG7gsw== From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Michael Tokarev , qemu-trivial@nongnu.org, Richard Henderson Subject: [PATCH trivial v2 5/7] linux-user: assume epoll is always present Date: Wed, 11 Mar 2026 23:54:53 +0300 Message-ID: <20260311205459.1101023-6-mjt@tls.msk.ru> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260311205459.1101023-1-mjt@tls.msk.ru> References: <20260311205459.1101023-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 client-ip=212.248.84.144; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 @tls.msk.ru) X-ZM-MESSAGEID: 1773262627911158500 Content-Type: text/plain; charset="utf-8" epoll is in linux since 2.6 (glibc 2.3.2). epoll_init1 has been added in 2.6.27 (glibc 2.9). There's no need to check for its presence, including all other epoll-related syscalls. Modern architectures don't have epoll_create(), only epoll_create1(), so keep conditional around the former. Reviewed-by: Richard Henderson Signed-off-by: Michael Tokarev --- linux-user/syscall.c | 10 ++-------- linux-user/syscall_defs.h | 3 --- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 1f28e7e93f..7832a1aba5 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -73,9 +73,7 @@ #ifdef CONFIG_EVENTFD #include #endif -#ifdef CONFIG_EPOLL #include -#endif #ifdef CONFIG_ATTR #include "qemu/xattr.h" #endif @@ -13732,16 +13730,13 @@ static abi_long do_syscall1(CPUArchState *cpu_env= , int num, abi_long arg1, case TARGET_NR_signalfd: return do_signalfd4(arg1, arg2, 0); #endif -#if defined(CONFIG_EPOLL) + #if defined(TARGET_NR_epoll_create) case TARGET_NR_epoll_create: return get_errno(epoll_create(arg1)); #endif -#if defined(TARGET_NR_epoll_create1) && defined(CONFIG_EPOLL_CREATE1) case TARGET_NR_epoll_create1: return get_errno(epoll_create1(target_to_host_bitmask(arg1, fcntl_= flags_tbl))); -#endif -#if defined(TARGET_NR_epoll_ctl) case TARGET_NR_epoll_ctl: { struct epoll_event ep; @@ -13770,7 +13765,6 @@ static abi_long do_syscall1(CPUArchState *cpu_env, = int num, abi_long arg1, } return get_errno(epoll_ctl(arg1, arg2, arg3, epp)); } -#endif =20 #if defined(TARGET_NR_epoll_wait) case TARGET_NR_epoll_wait: @@ -13856,7 +13850,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, = int num, abi_long arg1, g_free(ep); return ret; } -#endif /* CONFIG_EPOLL */ + #ifdef TARGET_NR_prlimit64 case TARGET_NR_prlimit64: { diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index 20d862fd8b..aac8b0c574 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -2595,7 +2595,6 @@ struct target_drm_i915_getparam { #define FUTEX_CLOCK_REALTIME 256 #define FUTEX_CMD_MASK ~(FUTEX_PRIVATE_FLAG | FUTEX_CLOCK_REALTIM= E) =20 -#ifdef CONFIG_EPOLL #if defined(TARGET_X86_64) #define TARGET_EPOLL_PACKED QEMU_PACKED #else @@ -2616,8 +2615,6 @@ struct target_epoll_event { =20 #define TARGET_EP_MAX_EVENTS (INT_MAX / sizeof(struct target_epoll_event)) =20 -#endif - struct target_ucred { abi_uint pid; abi_uint uid; --=20 2.47.3 From nobody Tue Apr 7 19:51:16 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 ARC-Seal: i=1; a=rsa-sha256; t=1773262626; cv=none; d=zohomail.com; s=zohoarc; b=PSnLCHh323fto26X6+9v72CXv9vX8AzKaA3fxJKTggSywv5agoCwcLuxyQie0lPbmkvIe9Q9f/pZTyiq7UP3cV+/UikB4jvSFRQKB46/S2HqT6GWzYZ4N8zeR36OXyty00YwF9yaN+km2ogyGpSjcTFjG2ACzWWtZxegZavHAms= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773262626; 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=umHx6QlKYHuHUXWLe+IUMn1AbmTkMyj9ThaI1ih2gvc=; b=h5+efLy+nncv+19dhIP+z6fH0RZ8aIRQI9rpWHyz+nbuy9Vk1eIrUM940OjCW3+q3eWDrrFx5wpTV4eRdakLL9F5KEcKzUgZFCRlgF+7pTXx1VD/z5GXrvduNTTZr3q68HbQIdDtRgRqy02fs7KnX9bOqp3aa+BPOMsPUms0oxs= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17732626265331010.1812521867945; Wed, 11 Mar 2026 13:57:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0Qat-0003rF-Nj; Wed, 11 Mar 2026 16:55:51 -0400 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 1w0Qar-0003qB-Ec; Wed, 11 Mar 2026 16:55:49 -0400 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 1w0Qap-0008Lg-Ro; Wed, 11 Mar 2026 16:55:49 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 255831921F3; Wed, 11 Mar 2026 23:54:29 +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 7A2D237C4D8; Wed, 11 Mar 2026 23:55:07 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tls.msk.ru; s=202602; t=1773262469; bh=cTT613g5HzlQM/E39xOdKTWxKJgyF5lgrqDVQ55Gxe0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=O8G1JCp30j8bK0kupLjpCBz69/yOuGlZ+C8hgRtJ6NkKLP//mANt3EDUSzYqkq2rh usiwj2coexvb7OCNP8F84kk0JcC+RkgYWHuf7pqC8G2KXYL3VXOoqMYrxYqnj4wNJD x1hysbJ6rxI1DvysFbyw/bQjx/daDae1j/vO5o3z6KnVaTj0oys7ji1XowmZ6cYk2s jbf2JsPOxG8ZIO38MraTcNFnD1yQMoGVM8VmYrOwLUvzKEqOI79Gi7e85Ifl+VO+85 XaMQTFHtkTN8rol+1y2M8XczUfeJCFoM6iZs6Xu6wm1sYJkzJhvYUs3d+oloObng7G YNvbBw2loZ+hw== From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Michael Tokarev , qemu-trivial@nongnu.org, Richard Henderson Subject: [PATCH trivial v2 6/7] meson.build: do not check for epoll.h (CONFIG_EPOLL) Date: Wed, 11 Mar 2026 23:54:54 +0300 Message-ID: <20260311205459.1101023-7-mjt@tls.msk.ru> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260311205459.1101023-1-mjt@tls.msk.ru> References: <20260311205459.1101023-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 client-ip=212.248.84.144; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 @tls.msk.ru) X-ZM-MESSAGEID: 1773262629459154100 Content-Type: text/plain; charset="utf-8" The only place where we used CONFIG_EPOLL was linux-user, which now enables it unconditionally. Reviewed-by: Richard Henderson Signed-off-by: Michael Tokarev --- meson.build | 1 - 1 file changed, 1 deletion(-) diff --git a/meson.build b/meson.build index bc60f71825..6e67d33afe 100644 --- a/meson.build +++ b/meson.build @@ -2595,7 +2595,6 @@ config_host_data.set('CONFIG_FSFREEZE', qga_fsfreeze) config_host_data.set('CONFIG_FSTRIM', qga_fstrim) =20 # has_header -config_host_data.set('CONFIG_EPOLL', cc.has_header('sys/epoll.h')) config_host_data.set('CONFIG_LINUX_MAGIC_H', cc.has_header('linux/magic.h'= )) valgrind =3D false if get_option('valgrind').allowed() --=20 2.47.3 From nobody Tue Apr 7 19:51:16 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 ARC-Seal: i=1; a=rsa-sha256; t=1773262627; cv=none; d=zohomail.com; s=zohoarc; b=Ayo0iU+dYHgYraNad4YUgrYVdL58LBpHmBXX4vTzUSP85G30xYVYL2e+YVGxRswwu4azZuHvjfGc6BtYqzVd0WNOR7aj8MZvBhnmfAOspYvdfSng3vhnQEP1xmVcJxhupPwt3pf/3/g4AMjadcVPtvmRL6BCJi6YbtQ+Qx8I9AY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773262627; 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=I2taiwieyvoRFFENw//dbanT3qOf2eLlSj6p3f77K1U=; b=kNs+9iLp6Cwy1Kj3TTwruZy/wLt1sV0pENv1bMmohZKJoOjRVVK/QFIpgv64UTcWc8XaNVhAtK5ST3YR5PGwRnLXCuAr7onNGxqinQowy+phQLuYtBCvf6UEfHIhwrcRE/M4IT6oFBnpr5Qx0ZQTUyfCb77JmmrvTdQi+r7SjW4= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773262627921611.293869560968; Wed, 11 Mar 2026 13:57:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0Qat-0003rC-KI; Wed, 11 Mar 2026 16:55:51 -0400 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 1w0Qar-0003qI-Kq; Wed, 11 Mar 2026 16:55:49 -0400 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 1w0Qap-0008Lq-Ui; Wed, 11 Mar 2026 16:55:49 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 31FC31921F4; Wed, 11 Mar 2026 23:54:29 +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 916DB37C4D9; Wed, 11 Mar 2026 23:55:07 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tls.msk.ru; s=202602; t=1773262469; bh=bslug+hjUMk/1iGficQGKTE+AvApFb+TGdFFJJqgEgo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=pNwLzvcWtbULEX+hdeFiQcAmoWdC8pXOB0ahXe8TfzG6Q+GdGqQUhXY77v4PT5a9x NIEV4IEf+OuVtl+VlQHURYOe9EHi9MfwxLSaC0HgGpIxRpzhHMyLbuoTVtHvFZhZEK WhiytzEODYvmZbqC0KneoebyTMfFDG0h+Vbz0WGzI+kA4zkCpMlp37yH9hWdHcv0at +th5MMAVV8Q6jFaY6DYTq/KliB9QdpvMcbICyGTLXagtsIm7bHBHK1PD76FoR6caCD FWd8Y3iqjX26YPac4KiVM0kJdEShEXCChej8+tlYI5n7RmzdGLzuPsjOqldam5/65p gnKd9AmU53jeg== From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Michael Tokarev , qemu-trivial@nongnu.org Subject: [PATCH trivial v2 7/7] rename CONFIG_EPOLL_CREATE1 to CONFIG_EPOLL, and stop checking for epoll in meson.build Date: Wed, 11 Mar 2026 23:54:55 +0300 Message-ID: <20260311205459.1101023-8-mjt@tls.msk.ru> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260311205459.1101023-1-mjt@tls.msk.ru> References: <20260311205459.1101023-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 client-ip=212.248.84.144; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 @tls.msk.ru) X-ZM-MESSAGEID: 1773262629922158500 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 on linux, define CONFIG_EPOLL to 1 on linux, without compile-time test. Signed-off-by: Michael Tokarev --- meson.build | 3 +-- util/aio-posix.h | 4 ++-- util/meson.build | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 6e67d33afe..fd09b333e3 100644 --- a/meson.build +++ b/meson.build @@ -2685,8 +2685,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', - cc.has_header_symbol('sys/epoll.h', 'epoll_create1')) +config_host_data.set('CONFIG_EPOLL', host_os =3D=3D 'linux') config_host_data.set('CONFIG_FALLOCATE_PUNCH_HOLE', cc.has_header_symbol('linux/falloc.h', 'FALLOC_FL_PUN= CH_HOLE') and cc.has_header_symbol('linux/falloc.h', 'FALLOC_FL_KEE= P_SIZE')) 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 e7a2a2a64c..33132c04ad 100644 --- a/util/meson.build +++ b/util/meson.build @@ -3,7 +3,7 @@ util_ss.add(files('thread-context.c'), numa) 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