aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Richardson <arichardson@FreeBSD.org>2025-12-16 18:09:57 +0000
committerAlex Richardson <arichardson@FreeBSD.org>2025-12-16 20:21:45 +0000
commit2ed21f90906b230476d3f12ff9dce0e2c4642af2 (patch)
tree153ace00803925a13174823e48cbcd679c7192bf
parent86f325711c07b723b85c031d581d0a5c1a0964f3 (diff)
netmap: silence -Wdefault-const-init-field-unsafe warning
The netmap_ring struct starts with various const members and rencent clang warns about leaving them uninitialized. Having them const in the first place is highly suspicious since they are updated with various macros but using hand-coded __DECONST(). But fixing that is a more invasive change that I am unable to test. ``` .../freebsd/sys/dev/netmap/netmap_kloop.c:320:21: error: default initialization of an object of type 'struct netmap_ring' with const member leaves the object uninitialized [-Werror,-Wdefault-const-init-field-unsafe] 320 | struct netmap_ring shadow_ring; /* shadow copy of the netmap_ring */ | ^ .../freebsd/sys/net/netmap.h:290:16: note: member 'buf_ofs' declared 'const' here 290 | const int64_t buf_ofs; | ^ ``` Test Plan: Compiles Reviewed by: vmaffione, jhb MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52568
-rw-r--r--sys/dev/netmap/netmap_kloop.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/netmap/netmap_kloop.c b/sys/dev/netmap/netmap_kloop.c
index ba9e67076e72..ac3ca2d8d21f 100644
--- a/sys/dev/netmap/netmap_kloop.c
+++ b/sys/dev/netmap/netmap_kloop.c
@@ -161,7 +161,8 @@ netmap_sync_kloop_tx_ring(const struct sync_kloop_ring_args *a)
struct netmap_kring *kring = a->kring;
struct nm_csb_atok *csb_atok = a->csb_atok;
struct nm_csb_ktoa *csb_ktoa = a->csb_ktoa;
- struct netmap_ring shadow_ring; /* shadow copy of the netmap_ring */
+ /* shadow copy of the netmap_ring */
+ struct netmap_ring shadow_ring = {0};
#ifdef SYNC_KLOOP_POLL
bool more_txspace = false;
#endif /* SYNC_KLOOP_POLL */
@@ -317,7 +318,8 @@ netmap_sync_kloop_rx_ring(const struct sync_kloop_ring_args *a)
struct netmap_kring *kring = a->kring;
struct nm_csb_atok *csb_atok = a->csb_atok;
struct nm_csb_ktoa *csb_ktoa = a->csb_ktoa;
- struct netmap_ring shadow_ring; /* shadow copy of the netmap_ring */
+ /* shadow copy of the netmap_ring */
+ struct netmap_ring shadow_ring = {0};
int dry_cycles = 0;
#ifdef SYNC_KLOOP_POLL
bool some_recvd = false;