From nobody Tue Apr 7 21:27:05 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