From patchwork Fri Sep 20 07:41:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 1987727 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4X94950ptLz1y27 for ; Fri, 20 Sep 2024 17:42:14 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srYGs-00068z-4d; Fri, 20 Sep 2024 03:41:42 -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 1srYGq-00067E-Vj; Fri, 20 Sep 2024 03:41:40 -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 1srYGo-0000Ay-HB; Fri, 20 Sep 2024 03:41:40 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id ADFCF90857; Fri, 20 Sep 2024 10:41:15 +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 5D32E1409DA; Fri, 20 Sep 2024 10:41:35 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Michael Tokarev , qemu-trivial@nongnu.org Subject: [PULL 01/22] mark with for-crc32 in a consistent manner Date: Fri, 20 Sep 2024 10:41:13 +0300 Message-Id: <20240920074134.664961-2-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20240920074134.664961-1-mjt@tls.msk.ru> References: <20240920074134.664961-1-mjt@tls.msk.ru> MIME-Version: 1.0 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 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- 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 44a5e65b8f..526739887c 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -23,7 +23,7 @@ */ #include "qemu/osdep.h" -#include /* For crc32 */ +#include /* for crc32 */ #include "hw/irq.h" #include "hw/net/cadence_gem.h" diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index 09d708f989..c0977308ba 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" diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c index 178a11675d..478356ee3e 100644 --- a/hw/net/ftgmac100.c +++ b/hw/net/ftgmac100.c @@ -24,8 +24,7 @@ #include "hw/qdev-properties.h" #include "migration/vmstate.h" -/* For crc32 */ -#include +#include /* for crc32 */ /* * 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 */ #if defined(ENABLE_DEBUG) #define DBG(x) x diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c index f9265de18b..6294d29202 100644 --- a/hw/net/imx_fec.c +++ b/hw/net/imx_fec.c @@ -33,8 +33,7 @@ #include "net/eth.h" #include "trace.h" -/* For crc32 */ -#include +#include /* for crc32 */ #define IMX_MAX_DESC 1024 diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c index 5a49601497..db28a0ef30 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" //#define DEBUG_LAN9118 diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c index 2898ad22d8..037cd2028e 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 */ //#define DEBUG_FEC 1 diff --git a/hw/net/npcm7xx_emc.c b/hw/net/npcm7xx_emc.c index 31e488d138..7307a13400 100644 --- a/hw/net/npcm7xx_emc.c +++ b/hw/net/npcm7xx_emc.c @@ -29,8 +29,7 @@ #include "qemu/osdep.h" -/* For crc32 */ -#include +#include /* for crc32 */ #include "hw/irq.h" #include "hw/qdev-clock.h" diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index 1b78deb14c..bc56075c0d 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -48,10 +48,8 @@ * 2011-Mar-22 Benjamin Poirier: Implemented VLAN offloading */ -/* For crc32 */ - #include "qemu/osdep.h" -#include +#include /* for crc32 */ #include "hw/pci/pci_device.h" #include "hw/qdev-properties.h" diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c index c5338dd49e..180ba5c791 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" /* Number of 2k memory pages available. */ diff --git a/hw/net/stellaris_enet.c b/hw/net/stellaris_enet.c index 08e5393151..9ebff296c4 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" //#define DEBUG_STELLARIS_ENET 1 diff --git a/hw/nvram/mac_nvram.c b/hw/nvram/mac_nvram.c index fef34e7f41..e47e52a677 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 */ #define DEF_SYSTEM_SIZE 0xc10 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 */ /* 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_helper.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" /* Exceptions helpers */