From nobody Tue Feb 10 02:55:12 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 1767994975158220.32491978652854; Fri, 9 Jan 2026 13:42:55 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1veKFU-0007PZ-5s; Fri, 09 Jan 2026 16:42:24 -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 1veKFQ-0007Ot-0Z for qemu-devel@nongnu.org; Fri, 09 Jan 2026 16:42:20 -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 1veKFO-0005jo-7K for qemu-devel@nongnu.org; Fri, 09 Jan 2026 16:42:19 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 456E917C4A3 for ; Sat, 10 Jan 2026 00:40:59 +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 CD5C2348DB4; Sat, 10 Jan 2026 00:42:01 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Michael Tokarev Subject: [PATCH RFC 3/3] linux-user/syscall.c: consolidate statfs calls further Date: Sat, 10 Jan 2026 00:41:53 +0300 Message-ID: <20260109214158.726916-4-mjt@tls.msk.ru> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260109214158.726916-1-mjt@tls.msk.ru> References: <20260109214158.726916-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: 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: 1767994983232158500 Content-Type: text/plain; charset="utf-8" Since statfs & statfs64 implementations are exactly the same, differs only in "64" suffix, merge them into one using a common macro. Signed-off-by: Michael Tokarev --- linux-user/syscall.c | 110 ++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 70 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 1f84c296d5..1b888bccfc 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -10972,80 +10972,50 @@ static abi_long do_syscall1(CPUArchState *cpu_env= , int num, abi_long arg1, return ret; case TARGET_NR_setpriority: return get_errno(setpriority(arg1, arg2, arg3)); -#ifdef TARGET_NR_statfs - case TARGET_NR_statfs: - case TARGET_NR_fstatfs: - { - struct statf stfs; - struct target_statfs *target_stfs; - if (num =3D=3D TARGET_NR_statfs) { - if (!(p =3D lock_user_string(arg1))) { - return -TARGET_EFAULT; - } - ret =3D get_errno(statfs(path(p), &stfs)); - unlock_user(p, arg1, 0); - } else /* if (num =3D=3D TARGET_NR_fstatfs) */ { - ret =3D get_errno(fstatfs(arg1, &stfs)); - } - if (is_error(ret)) { - return ret; - } - if (!lock_user_struct(VERIFY_WRITE, target_stfs, arg2, 0)) - return -TARGET_EFAULT; - __put_user(stfs.f_type, &target_stfs->f_type); - __put_user(stfs.f_bsize, &target_stfs->f_bsize); - __put_user(stfs.f_blocks, &target_stfs->f_blocks); - __put_user(stfs.f_bfree, &target_stfs->f_bfree); - __put_user(stfs.f_bavail, &target_stfs->f_bavail); - __put_user(stfs.f_files, &target_stfs->f_files); - __put_user(stfs.f_ffree, &target_stfs->f_ffree); - __put_user(stfs.f_fsid.__val[0], &target_stfs->f_fsid.val[0]); - __put_user(stfs.f_fsid.__val[1], &target_stfs->f_fsid.val[1]); - __put_user(stfs.f_namelen, &target_stfs->f_namelen); - __put_user(stfs.f_frsize, &target_stfs->f_frsize); - __put_user(stfs.f_flags, &target_stfs->f_flags); - memset(target_stfs->f_spare, 0, sizeof(target_stfs->f_spare)); - unlock_user_struct(target_stfs, arg2, 1); - return ret; + +#define statfs_fstatfs_impl(variant) /* variant is statfs or statfs64 */ \ + case TARGET_NR_##variant: \ + case TARGET_NR_f##variant: \ + { \ + struct statfs stfs; \ + struct target_##variant *target_stfs; \ + if (num =3D=3D TARGET_NR_##variant) { \ + if (!(p =3D lock_user_string(arg1))) { \ + return -TARGET_EFAULT; \ + } \ + ret =3D get_errno(statfs(path(p), &stfs)); \ + unlock_user(p, arg1, 0); \ + } else /* if (num =3D=3D TARGET_NR_f##variant) */ { \ + ret =3D get_errno(fstatfs(arg1, &stfs)); \ + } \ + if (is_error(ret)) { \ + return ret; \ + } \ + if (!lock_user_struct(VERIFY_WRITE, target_stfs, arg2, 0)) \ + return -TARGET_EFAULT; \ + __put_user(stfs.f_type, &target_stfs->f_type); \ + __put_user(stfs.f_bsize, &target_stfs->f_bsize); \ + __put_user(stfs.f_blocks, &target_stfs->f_blocks); \ + __put_user(stfs.f_bfree, &target_stfs->f_bfree); \ + __put_user(stfs.f_bavail, &target_stfs->f_bavail); \ + __put_user(stfs.f_files, &target_stfs->f_files); \ + __put_user(stfs.f_ffree, &target_stfs->f_ffree); \ + __put_user(stfs.f_fsid.__val[0], &target_stfs->f_fsid.val[0]);= \ + __put_user(stfs.f_fsid.__val[1], &target_stfs->f_fsid.val[1]);= \ + __put_user(stfs.f_namelen, &target_stfs->f_namelen); \ + __put_user(stfs.f_frsize, &target_stfs->f_frsize); \ + __put_user(stfs.f_flags, &target_stfs->f_flags); \ + memset(target_stfs->f_spare, 0, sizeof(target_stfs->f_spare));= \ + unlock_user_struct(target_stfs, arg2, 1); \ + return ret; \ } +#ifdef TARGET_NR_statfs + statfs_fstatfs_impl(statfs); #endif #ifdef TARGET_NR_statfs64 - case TARGET_NR_statfs64: - case TARGET_NR_fstatfs64: - { - struct statfs stfs; - struct target_statfs64 *target_stfs; - if (num =3D=3D TARGET_NR_statfs64) { - if (!(p =3D lock_user_string(arg1))) { - return -TARGET_EFAULT; - } - ret =3D get_errno(statfs(path(p), &stfs)); - unlock_user(p, arg1, 0); - } else /* if (num =3D=3D TARGET_NR_fstatfs64) */ { - ret =3D get_errno(fstatfs(arg1, &stfs)); - } - if (is_error(ret)) { - return ret; - } - if (!lock_user_struct(VERIFY_WRITE, target_stfs, arg3, 0)) - return -TARGET_EFAULT; - __put_user(stfs.f_type, &target_stfs->f_type); - __put_user(stfs.f_bsize, &target_stfs->f_bsize); - __put_user(stfs.f_blocks, &target_stfs->f_blocks); - __put_user(stfs.f_bfree, &target_stfs->f_bfree); - __put_user(stfs.f_bavail, &target_stfs->f_bavail); - __put_user(stfs.f_files, &target_stfs->f_files); - __put_user(stfs.f_ffree, &target_stfs->f_ffree); - __put_user(stfs.f_fsid.__val[0], &target_stfs->f_fsid.val[0]); - __put_user(stfs.f_fsid.__val[1], &target_stfs->f_fsid.val[1]); - __put_user(stfs.f_namelen, &target_stfs->f_namelen); - __put_user(stfs.f_frsize, &target_stfs->f_frsize); - __put_user(stfs.f_flags, &target_stfs->f_flags); - memset(target_stfs->f_spare, 0, sizeof(target_stfs->f_spare)); - unlock_user_struct(target_stfs, arg3, 1); - return ret; - } + statfs_fstatfs_impl(statfs64); #endif + #ifdef TARGET_NR_socketcall case TARGET_NR_socketcall: return do_socketcall(arg1, arg2); --=20 2.47.3