From nobody Sun Nov 24 08:07:12 2024 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 1724918045094226.73388948239722; Thu, 29 Aug 2024 00:54:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sjZxg-0006H7-M9; Thu, 29 Aug 2024 03:52:56 -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 1sjZxc-00067r-Rh for qemu-devel@nongnu.org; Thu, 29 Aug 2024 03:52:52 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sjZxa-00038T-AY for qemu-devel@nongnu.org; Thu, 29 Aug 2024 03:52:52 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id C9D6989ADE for ; Thu, 29 Aug 2024 10:51:40 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 4DFD312ED26; Thu, 29 Aug 2024 10:52:46 +0300 (MSK) Received: (nullmailer pid 511562 invoked by uid 1000); Thu, 29 Aug 2024 07:52:46 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Michael Tokarev Subject: [PATCH 1/2] linux-user/syscall.c: drop 64 suffix from flock64 &Co Date: Thu, 29 Aug 2024 10:52:40 +0300 Message-Id: <20240829075242.511534-2-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240829075242.511534-1-mjt@tls.msk.ru> References: <20240829075242.511534-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=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 1724918046810116600 Content-Type: text/plain; charset="utf-8" Since we are always building with LFS enabled, in particular with -D_FILE_OFFSET_BITS=3D64, we should always have struct flock mapped to the 64bit variant (with off64_t), and F_GETLK mapped to F_GETLK64 etc, automatically. So there should be no need to explicitly use the "64" suffix for these things anymore. Also fix a misleading comment near safe_fcntl telling us to always use flock64 (since v2.6.0-1311-g435da5e7092a "linux-user: Use safe_syscall wrapper for fcntl"). Reference: https://gitlab.com/qemu-project/qemu/-/issues/2215 Signed-off-by: Michael Tokarev Reviewed-by: Richard Henderson --- linux-user/syscall.c | 62 +++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 9d5415674d..7ae4980e27 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -759,10 +759,8 @@ safe_syscall6(ssize_t, copy_file_range, int, infd, lof= f_t *, pinoff, * the libc function. */ #define safe_ioctl(...) safe_syscall(__NR_ioctl, __VA_ARGS__) -/* Similarly for fcntl. Note that callers must always: - * pass the F_GETLK64 etc constants rather than the unsuffixed F_GETLK - * use the flock64 struct rather than unsuffixed flock - * This will then work and use a 64-bit offset for both 32-bit and 64-bit = hosts. +/* Similarly for fcntl. Since we always build with LFS enabled, + * we should be using the 64-bit structures automatically. */ #ifdef __NR_fcntl64 #define safe_fcntl(...) safe_syscall(__NR_fcntl64, __VA_ARGS__) @@ -6722,13 +6720,13 @@ static int target_to_host_fcntl_cmd(int cmd) ret =3D cmd; break; case TARGET_F_GETLK: - ret =3D F_GETLK64; + ret =3D F_GETLK; break; case TARGET_F_SETLK: - ret =3D F_SETLK64; + ret =3D F_SETLK; break; case TARGET_F_SETLKW: - ret =3D F_SETLKW64; + ret =3D F_SETLKW; break; case TARGET_F_GETOWN: ret =3D F_GETOWN; @@ -6744,13 +6742,13 @@ static int target_to_host_fcntl_cmd(int cmd) break; #if TARGET_ABI_BITS =3D=3D 32 case TARGET_F_GETLK64: - ret =3D F_GETLK64; + ret =3D F_GETLK; break; case TARGET_F_SETLK64: - ret =3D F_SETLK64; + ret =3D F_SETLK; break; case TARGET_F_SETLKW64: - ret =3D F_SETLKW64; + ret =3D F_SETLKW; break; #endif case TARGET_F_SETLEASE: @@ -6804,8 +6802,8 @@ static int target_to_host_fcntl_cmd(int cmd) * them to 5, 6 and 7 before making the syscall(). Since we make the * syscall directly, adjust to what is supported by the kernel. */ - if (ret >=3D F_GETLK64 && ret <=3D F_SETLKW64) { - ret -=3D F_GETLK64 - 5; + if (ret >=3D F_GETLK && ret <=3D F_SETLKW) { + ret -=3D F_GETLK - 5; } #endif =20 @@ -6838,7 +6836,7 @@ static int host_to_target_flock(int type) return type; } =20 -static inline abi_long copy_from_user_flock(struct flock64 *fl, +static inline abi_long copy_from_user_flock(struct flock *fl, abi_ulong target_flock_addr) { struct target_flock *target_fl; @@ -6863,7 +6861,7 @@ static inline abi_long copy_from_user_flock(struct fl= ock64 *fl, } =20 static inline abi_long copy_to_user_flock(abi_ulong target_flock_addr, - const struct flock64 *fl) + const struct flock *fl) { struct target_flock *target_fl; short l_type; @@ -6882,8 +6880,8 @@ static inline abi_long copy_to_user_flock(abi_ulong t= arget_flock_addr, return 0; } =20 -typedef abi_long from_flock64_fn(struct flock64 *fl, abi_ulong target_addr= ); -typedef abi_long to_flock64_fn(abi_ulong target_addr, const struct flock64= *fl); +typedef abi_long from_flock64_fn(struct flock *fl, abi_ulong target_addr); +typedef abi_long to_flock64_fn(abi_ulong target_addr, const struct flock *= fl); =20 #if defined(TARGET_ARM) && TARGET_ABI_BITS =3D=3D 32 struct target_oabi_flock64 { @@ -6894,7 +6892,7 @@ struct target_oabi_flock64 { abi_int l_pid; } QEMU_PACKED; =20 -static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl, +static inline abi_long copy_from_user_oabi_flock64(struct flock *fl, abi_ulong target_flock_= addr) { struct target_oabi_flock64 *target_fl; @@ -6919,7 +6917,7 @@ static inline abi_long copy_from_user_oabi_flock64(st= ruct flock64 *fl, } =20 static inline abi_long copy_to_user_oabi_flock64(abi_ulong target_flock_ad= dr, - const struct flock64 *fl) + const struct flock *fl) { struct target_oabi_flock64 *target_fl; short l_type; @@ -6939,7 +6937,7 @@ static inline abi_long copy_to_user_oabi_flock64(abi_= ulong target_flock_addr, } #endif =20 -static inline abi_long copy_from_user_flock64(struct flock64 *fl, +static inline abi_long copy_from_user_flock64(struct flock *fl, abi_ulong target_flock_addr) { struct target_flock64 *target_fl; @@ -6964,7 +6962,7 @@ static inline abi_long copy_from_user_flock64(struct = flock64 *fl, } =20 static inline abi_long copy_to_user_flock64(abi_ulong target_flock_addr, - const struct flock64 *fl) + const struct flock *fl) { struct target_flock64 *target_fl; short l_type; @@ -6985,7 +6983,7 @@ static inline abi_long copy_to_user_flock64(abi_ulong= target_flock_addr, =20 static abi_long do_fcntl(int fd, int cmd, abi_ulong arg) { - struct flock64 fl64; + struct flock fl; #ifdef F_GETOWN_EX struct f_owner_ex fox; struct target_f_owner_ex *target_fox; @@ -6998,45 +6996,45 @@ static abi_long do_fcntl(int fd, int cmd, abi_ulong= arg) =20 switch(cmd) { case TARGET_F_GETLK: - ret =3D copy_from_user_flock(&fl64, arg); + ret =3D copy_from_user_flock(&fl, arg); if (ret) { return ret; } - ret =3D get_errno(safe_fcntl(fd, host_cmd, &fl64)); + ret =3D get_errno(safe_fcntl(fd, host_cmd, &fl)); if (ret =3D=3D 0) { - ret =3D copy_to_user_flock(arg, &fl64); + ret =3D copy_to_user_flock(arg, &fl); } break; =20 case TARGET_F_SETLK: case TARGET_F_SETLKW: - ret =3D copy_from_user_flock(&fl64, arg); + ret =3D copy_from_user_flock(&fl, arg); if (ret) { return ret; } - ret =3D get_errno(safe_fcntl(fd, host_cmd, &fl64)); + ret =3D get_errno(safe_fcntl(fd, host_cmd, &fl)); break; =20 case TARGET_F_GETLK64: case TARGET_F_OFD_GETLK: - ret =3D copy_from_user_flock64(&fl64, arg); + ret =3D copy_from_user_flock64(&fl, arg); if (ret) { return ret; } - ret =3D get_errno(safe_fcntl(fd, host_cmd, &fl64)); + ret =3D get_errno(safe_fcntl(fd, host_cmd, &fl)); if (ret =3D=3D 0) { - ret =3D copy_to_user_flock64(arg, &fl64); + ret =3D copy_to_user_flock64(arg, &fl); } break; case TARGET_F_SETLK64: case TARGET_F_SETLKW64: case TARGET_F_OFD_SETLK: case TARGET_F_OFD_SETLKW: - ret =3D copy_from_user_flock64(&fl64, arg); + ret =3D copy_from_user_flock64(&fl, arg); if (ret) { return ret; } - ret =3D get_errno(safe_fcntl(fd, host_cmd, &fl64)); + ret =3D get_errno(safe_fcntl(fd, host_cmd, &fl)); break; =20 case TARGET_F_GETFL: @@ -12403,7 +12401,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, = int num, abi_long arg1, case TARGET_NR_fcntl64: { int cmd; - struct flock64 fl; + struct flock fl; from_flock64_fn *copyfrom =3D copy_from_user_flock64; to_flock64_fn *copyto =3D copy_to_user_flock64; =20 --=20 2.39.2 From nobody Sun Nov 24 08:07:12 2024 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 1724918027504852.1989478739073; Thu, 29 Aug 2024 00:53:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sjZxl-0006bM-U2; Thu, 29 Aug 2024 03:53:02 -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 1sjZxj-0006Tu-SD for qemu-devel@nongnu.org; Thu, 29 Aug 2024 03:52:59 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sjZxh-000391-Ut for qemu-devel@nongnu.org; Thu, 29 Aug 2024 03:52:59 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 34E9989AE0 for ; Thu, 29 Aug 2024 10:51:51 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id A2C8B12ED28; Thu, 29 Aug 2024 10:52:56 +0300 (MSK) Received: (nullmailer pid 511572 invoked by uid 1000); Thu, 29 Aug 2024 07:52:56 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Michael Tokarev Subject: [PATCH 2/2] linux-user/syscall.c: eliminate other explicit LFS usages Date: Thu, 29 Aug 2024 10:52:42 +0300 Message-Id: <20240829075242.511534-4-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240829075242.511534-1-mjt@tls.msk.ru> References: <20240829075242.511534-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=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 1724918033291116600 Content-Type: text/plain; charset="utf-8" Since we alwasy build with LFS enabled, and with -D_FILE_OFFSET_BITS=3D64 in particular, there is no need to use 64bit versions of various system calls and constants, regular ones will do just fine. Eliminate a few last uses of the following constructs in linux-user/syscall.c: off64_t ftruncate64() lseek64() pread64() pwrite64() This way it can be built on systems where the 64bit variants of everything is not defined (since the system always uses 64bit variants), such as on recent MUSL. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2215 Signed-off-by: Michael Tokarev Reviewed-by: Richard Henderson --- linux-user/syscall.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 7ae4980e27..d418e2864a 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -7265,7 +7265,7 @@ static inline abi_long target_truncate64(CPUArchState= *cpu_env, const char *arg1 arg2 =3D arg3; arg3 =3D arg4; } - return get_errno(truncate64(arg1, target_offset64(arg2, arg3))); + return get_errno(truncate(arg1, target_offset64(arg2, arg3))); } #endif =20 @@ -7279,7 +7279,7 @@ static inline abi_long target_ftruncate64(CPUArchStat= e *cpu_env, abi_long arg1, arg2 =3D arg3; arg3 =3D arg4; } - return get_errno(ftruncate64(arg1, target_offset64(arg2, arg3))); + return get_errno(ftruncate(arg1, target_offset64(arg2, arg3))); } #endif =20 @@ -8664,7 +8664,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2,= abi_long count) void *tdirp; int hlen, hoff, toff; int hreclen, treclen; - off64_t prev_diroff =3D 0; + off_t prev_diroff =3D 0; =20 hdirp =3D g_try_malloc(count); if (!hdirp) { @@ -8717,7 +8717,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2,= abi_long count) * Return what we have, resetting the file pointer to the * location of the first record not returned. */ - lseek64(dirfd, prev_diroff, SEEK_SET); + lseek(dirfd, prev_diroff, SEEK_SET); break; } =20 @@ -8751,7 +8751,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg= 2, abi_long count) void *tdirp; int hlen, hoff, toff; int hreclen, treclen; - off64_t prev_diroff =3D 0; + off_t prev_diroff =3D 0; =20 hdirp =3D g_try_malloc(count); if (!hdirp) { @@ -8793,7 +8793,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg= 2, abi_long count) * Return what we have, resetting the file pointer to the * location of the first record not returned. */ - lseek64(dirfd, prev_diroff, SEEK_SET); + lseek(dirfd, prev_diroff, SEEK_SET); break; } =20 @@ -11524,7 +11524,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, = int num, abi_long arg1, return -TARGET_EFAULT; } } - ret =3D get_errno(pread64(arg1, p, arg3, target_offset64(arg4, arg= 5))); + ret =3D get_errno(pread(arg1, p, arg3, target_offset64(arg4, arg5)= )); unlock_user(p, arg2, ret); return ret; case TARGET_NR_pwrite64: @@ -11541,7 +11541,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, = int num, abi_long arg1, return -TARGET_EFAULT; } } - ret =3D get_errno(pwrite64(arg1, p, arg3, target_offset64(arg4, ar= g5))); + ret =3D get_errno(pwrite(arg1, p, arg3, target_offset64(arg4, arg5= ))); unlock_user(p, arg2, 0); return ret; #endif --=20 2.39.2 From nobody Sun Nov 24 08:07:12 2024 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 1724918049286743.0095300995291; Thu, 29 Aug 2024 00:54:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sjZxh-0006Kw-Mt; Thu, 29 Aug 2024 03:52:57 -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 1sjZxf-0006DN-KQ for qemu-devel@nongnu.org; Thu, 29 Aug 2024 03:52:55 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sjZxd-00038j-HM for qemu-devel@nongnu.org; Thu, 29 Aug 2024 03:52:55 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 2C5DD89ADF for ; Thu, 29 Aug 2024 10:51:41 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id A497212ED27; Thu, 29 Aug 2024 10:52:46 +0300 (MSK) Received: (nullmailer pid 511566 invoked by uid 1000); Thu, 29 Aug 2024 07:52:46 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Michael Tokarev Subject: [PATCH] mark with for-crc32 in a consistent manner Date: Thu, 29 Aug 2024 10:52:41 +0300 Message-Id: <20240829075242.511534-3-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240829075242.511534-1-mjt@tls.msk.ru> References: <20240829075242.511534-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=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 1724918050392116600 Content-Type: text/plain; charset="utf-8" in many cases, is only included for crc32 function, and in some of them, there's a comment saying that, but in a different way. In one place (hw/net/rtl8139.c), there was another #include added between the comment and include. Make all such comments to be on the same line as #include, make it consistent, and also add a few missing comments, including hw/nvram/mac_nvram.c which uses adler32 instead. There's no code changes. Signed-off-by: Michael Tokarev Reviewed-by: Richard Henderson --- hw/net/cadence_gem.c | 2 +- hw/net/dp8393x.c | 2 +- hw/net/ftgmac100.c | 3 +-- hw/net/i82596.c | 2 +- hw/net/imx_fec.c | 3 +-- hw/net/lan9118.c | 3 +-- hw/net/mcf_fec.c | 3 +-- hw/net/npcm7xx_emc.c | 3 +-- hw/net/rtl8139.c | 4 +--- hw/net/smc91c111.c | 3 +-- hw/net/stellaris_enet.c | 2 +- hw/nvram/mac_nvram.c | 2 +- target/arm/helper.c | 2 +- target/arm/tcg/helper-a64.c | 2 +- target/loongarch/tcg/op_helper.c | 2 +- 15 files changed, 15 insertions(+), 23 deletions(-) diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index ec7bf562e5..12857d9d7d 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -23,7 +23,7 @@ */ =20 #include "qemu/osdep.h" -#include /* For crc32 */ +#include /* for crc32 */ =20 #include "hw/irq.h" #include "hw/net/cadence_gem.h" diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index bf0652da1b..6d143bac5c 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -27,7 +27,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "qemu/timer.h" -#include +#include /* for crc32 */ #include "qom/object.h" #include "trace.h" =20 diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c index 80f9cd56d5..c68db4e15f 100644 --- a/hw/net/ftgmac100.c +++ b/hw/net/ftgmac100.c @@ -24,8 +24,7 @@ #include "hw/qdev-properties.h" #include "migration/vmstate.h" =20 -/* For crc32 */ -#include +#include /* for crc32 */ =20 /* * FTGMAC100 registers diff --git a/hw/net/i82596.c b/hw/net/i82596.c index 6cc8292a65..d786086a51 100644 --- a/hw/net/i82596.c +++ b/hw/net/i82596.c @@ -19,7 +19,7 @@ #include "qemu/module.h" #include "trace.h" #include "i82596.h" -#include /* For crc32 */ +#include /* for crc32 */ =20 #if defined(ENABLE_DEBUG) #define DBG(x) x diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c index 8c91d20d44..dfc3fb0d9a 100644 --- a/hw/net/imx_fec.c +++ b/hw/net/imx_fec.c @@ -33,8 +33,7 @@ #include "net/eth.h" #include "trace.h" =20 -/* For crc32 */ -#include +#include /* for crc32 */ =20 #define IMX_MAX_DESC 1024 =20 diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c index 91d81b410b..c38ea40ada 100644 --- a/hw/net/lan9118.c +++ b/hw/net/lan9118.c @@ -22,8 +22,7 @@ #include "qapi/error.h" #include "qemu/log.h" #include "qemu/module.h" -/* For crc32 */ -#include +#include /* for crc32 */ #include "qom/object.h" =20 //#define DEBUG_LAN9118 diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c index e6902716bd..9db64f08c5 100644 --- a/hw/net/mcf_fec.c +++ b/hw/net/mcf_fec.c @@ -16,8 +16,7 @@ #include "hw/net/mii.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" -/* For crc32 */ -#include +#include /* for crc32 */ =20 //#define DEBUG_FEC 1 =20 diff --git a/hw/net/npcm7xx_emc.c b/hw/net/npcm7xx_emc.c index d1583b6f9b..7f25bca448 100644 --- a/hw/net/npcm7xx_emc.c +++ b/hw/net/npcm7xx_emc.c @@ -29,8 +29,7 @@ =20 #include "qemu/osdep.h" =20 -/* For crc32 */ -#include +#include /* for crc32 */ =20 #include "hw/irq.h" #include "hw/qdev-clock.h" diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index 03a204ef8a..69a78ad677 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -48,10 +48,8 @@ * 2011-Mar-22 Benjamin Poirier: Implemented VLAN offloading */ =20 -/* For crc32 */ - #include "qemu/osdep.h" -#include +#include /* for crc32 */ =20 #include "hw/pci/pci_device.h" #include "hw/qdev-properties.h" diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c index 702d0e8e83..a00a76009e 100644 --- a/hw/net/smc91c111.c +++ b/hw/net/smc91c111.c @@ -17,8 +17,7 @@ #include "qapi/error.h" #include "qemu/log.h" #include "qemu/module.h" -/* For crc32 */ -#include +#include /* for crc32 */ #include "qom/object.h" =20 /* Number of 2k memory pages available. */ diff --git a/hw/net/stellaris_enet.c b/hw/net/stellaris_enet.c index db95766e29..8e2ce3bf29 100644 --- a/hw/net/stellaris_enet.c +++ b/hw/net/stellaris_enet.c @@ -15,7 +15,7 @@ #include "net/net.h" #include "qemu/log.h" #include "qemu/module.h" -#include +#include /* for crc32 */ #include "qom/object.h" =20 //#define DEBUG_STELLARIS_ENET 1 diff --git a/hw/nvram/mac_nvram.c b/hw/nvram/mac_nvram.c index fe9df9fa35..83c6724c0a 100644 --- a/hw/nvram/mac_nvram.c +++ b/hw/nvram/mac_nvram.c @@ -35,7 +35,7 @@ #include "qemu/module.h" #include "qemu/error-report.h" #include "trace.h" -#include +#include /* for adler32 */ =20 #define DEF_SYSTEM_SIZE 0xc10 =20 diff --git a/target/arm/helper.c b/target/arm/helper.c index 0a582c1cd3..3f77b40734 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -19,7 +19,7 @@ #include "qemu/crc32c.h" #include "qemu/qemu-print.h" #include "exec/exec-all.h" -#include /* For crc32 */ +#include /* for crc32 */ #include "hw/irq.h" #include "sysemu/cpu-timers.h" #include "sysemu/kvm.h" diff --git a/target/arm/tcg/helper-a64.c b/target/arm/tcg/helper-a64.c index 21a9abd90a..56b431faf5 100644 --- a/target/arm/tcg/helper-a64.c +++ b/target/arm/tcg/helper-a64.c @@ -33,7 +33,7 @@ #include "qemu/int128.h" #include "qemu/atomic128.h" #include "fpu/softfloat.h" -#include /* For crc32 */ +#include /* for crc32 */ =20 /* C2.4.7 Multiply and divide */ /* special cases for 0 and LLONG_MIN are mandated by the standard */ diff --git a/target/loongarch/tcg/op_helper.c b/target/loongarch/tcg/op_hel= per.c index fe79c62fa4..b17208e5b9 100644 --- a/target/loongarch/tcg/op_helper.c +++ b/target/loongarch/tcg/op_helper.c @@ -14,7 +14,7 @@ #include "exec/cpu_ldst.h" #include "internals.h" #include "qemu/crc32c.h" -#include +#include /* for crc32 */ #include "cpu-csr.h" =20 /* Exceptions helpers */ --=20 2.39.2