[dpdk-dev] [PATCH 0/5] lib: Windows compatibility renaming

Dmitry Kozlyuk dmitry.kozliuk at gmail.com
Wed Sep 15 23:40:47 CEST 2021


Windows SDK headers define `s_addr`, `min`, and `max` macros.
When Windows SDK and DPDK headers are used in the same file,
these macros break definitions of some DPDK structures and inline
functions. Rename the problematic fields and local variables
per the deprecation notice:
https://mails.dpdk.org/archives/dev/2021-July/215270.html
Also remove a workaround in lib/net.

Some checkpatch warnings about long lines are left:
- when they existed before;
- when it's one extra symbol and the fix is not helpful;
- in performance-thread app.

Dmitry Kozlyuk (5):
  compressdev: rename fields for Windows compatibility
  cryptodev: rename fields for Windows compatibility
  table: rename local variable for Windows compatibility
  ring: rename local variables for Windows compatibility
  net: rename Ethernet header fields

 .../comp_perf_test_common.c                   |   6 +-
 app/test-compress-perf/main.c                 |   2 +-
 app/test-pmd/5tswap.c                         |   6 +-
 app/test-pmd/csumonly.c                       |   4 +-
 app/test-pmd/flowgen.c                        |   4 +-
 app/test-pmd/icmpecho.c                       |  16 +-
 app/test-pmd/ieee1588fwd.c                    |   6 +-
 app/test-pmd/macfwd.c                         |   4 +-
 app/test-pmd/macswap.h                        |   4 +-
 app/test-pmd/txonly.c                         |   4 +-
 app/test-pmd/util.c                           |   4 +-
 app/test/packet_burst_generator.c             |   4 +-
 app/test/test_bpf.c                           |   4 +-
 app/test/test_cryptodev_asym.c                |   4 +-
 app/test/test_link_bonding_mode4.c            |  15 +-
 doc/guides/rel_notes/deprecation.rst          |   9 -
 doc/guides/rel_notes/release_20_11.rst        |   9 +
 drivers/compress/isal/isal_compress_pmd_ops.c |   4 +-
 drivers/compress/mlx5/mlx5_compress.c         |   2 +-
 drivers/compress/octeontx/otx_zip_pmd.c       |   4 +-
 drivers/compress/qat/qat_comp_pmd.c           |   2 +-
 drivers/compress/zlib/zlib_pmd_ops.c          |   4 +-
 drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c  |  28 +-
 .../crypto/aesni_mb/rte_aesni_mb_pmd_ops.c    | 284 +++++-----
 drivers/crypto/armv8/rte_armv8_pmd_ops.c      |  24 +-
 drivers/crypto/bcmfs/bcmfs_sym_capabilities.c | 288 +++++-----
 drivers/crypto/caam_jr/caam_jr_capabilities.c |  88 +--
 drivers/crypto/ccp/ccp_pmd_ops.c              | 208 ++++----
 .../crypto/cnxk/cnxk_cryptodev_capabilities.c | 300 +++++------
 drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h     | 280 +++++-----
 drivers/crypto/dpaa_sec/dpaa_sec.h            | 208 ++++----
 drivers/crypto/kasumi/rte_kasumi_pmd_ops.c    |  16 +-
 drivers/crypto/mlx5/mlx5_crypto.c             |   8 +-
 drivers/crypto/mvsam/rte_mrvl_pmd_ops.c       | 192 +++----
 .../crypto/nitrox/nitrox_sym_capabilities.c   |  56 +-
 drivers/crypto/null/null_crypto_pmd_ops.c     |  12 +-
 .../octeontx/otx_cryptodev_capabilities.c     | 252 ++++-----
 .../octeontx2/otx2_cryptodev_capabilities.c   | 284 +++++-----
 drivers/crypto/openssl/rte_openssl_pmd_ops.c  | 208 ++++----
 drivers/crypto/qat/qat_asym_capabilities.h    |  12 +-
 drivers/crypto/qat/qat_sym_capabilities.h     | 504 +++++++++---------
 .../scheduler/rte_cryptodev_scheduler.c       |  20 +-
 drivers/crypto/snow3g/rte_snow3g_pmd_ops.c    |  20 +-
 .../virtio/virtio_crypto_capabilities.h       |  16 +-
 drivers/crypto/zuc/rte_zuc_pmd_ops.c          |  20 +-
 drivers/net/avp/avp_ethdev.c                  |   6 +-
 drivers/net/bnx2x/bnx2x.c                     |  16 +-
 drivers/net/bonding/rte_eth_bond_8023ad.c     |   6 +-
 drivers/net/bonding/rte_eth_bond_alb.c        |   4 +-
 drivers/net/bonding/rte_eth_bond_pmd.c        |  22 +-
 drivers/net/enic/enic_flow.c                  |   8 +-
 drivers/net/ixgbe/ixgbe_ipsec.c               |  28 +-
 drivers/net/mlx5/mlx5_txpp.c                  |   4 +-
 drivers/net/octeontx2/otx2_ethdev_sec.c       |  32 +-
 drivers/net/txgbe/txgbe_ipsec.c               |  28 +-
 examples/bond/main.c                          |  14 +-
 examples/ethtool/ethtool-app/main.c           |   4 +-
 examples/eventdev_pipeline/pipeline_common.h  |   4 +-
 examples/flow_filtering/main.c                |   4 +-
 examples/ioat/ioatfwd.c                       |   4 +-
 examples/ip_fragmentation/main.c              |   4 +-
 examples/ip_reassembly/main.c                 |   4 +-
 examples/ipsec-secgw/ipsec-secgw.c            |   4 +-
 examples/ipsec-secgw/ipsec_worker.c           |   4 +-
 examples/ipv4_multicast/main.c                |   4 +-
 examples/l2fwd-crypto/main.c                  |  70 +--
 examples/l2fwd-event/l2fwd_common.h           |   4 +-
 examples/l2fwd-jobstats/main.c                |   4 +-
 examples/l2fwd-keepalive/main.c               |   4 +-
 examples/l2fwd/main.c                         |   4 +-
 examples/l3fwd-acl/main.c                     |  19 +-
 examples/l3fwd-power/main.c                   |   6 +-
 examples/l3fwd/l3fwd_em.h                     |   4 +-
 examples/l3fwd/l3fwd_fib.c                    |   2 +-
 examples/l3fwd/l3fwd_lpm.c                    |   2 +-
 examples/l3fwd/l3fwd_lpm.h                    |   4 +-
 examples/link_status_interrupt/main.c         |   4 +-
 .../performance-thread/l3fwd-thread/main.c    |  40 +-
 examples/ptpclient/ptpclient.c                |  16 +-
 examples/vhost/main.c                         |  10 +-
 examples/vmdq/main.c                          |   4 +-
 examples/vmdq_dcb/main.c                      |   4 +-
 lib/compressdev/rte_compressdev.h             |   4 +-
 lib/cryptodev/rte_cryptodev.c                 |  14 +-
 lib/cryptodev/rte_cryptodev.h                 |   4 +-
 lib/ethdev/rte_flow.h                         |   4 +-
 lib/gro/gro_tcp4.c                            |   4 +-
 lib/gro/gro_udp4.c                            |   4 +-
 lib/gro/gro_vxlan_tcp4.c                      |   8 +-
 lib/gro/gro_vxlan_udp4.c                      |   8 +-
 lib/net/rte_arp.c                             |   4 +-
 lib/net/rte_ether.h                           |  22 +-
 lib/pipeline/rte_table_action.c               |  40 +-
 lib/ring/rte_ring_c11_pvt.h                   |   8 +-
 lib/ring/rte_ring_generic_pvt.h               |   8 +-
 lib/ring/rte_ring_rts_elem_pvt.h              |   6 +-
 lib/table/rte_lru_x86.h                       |   4 +-
 97 files changed, 1992 insertions(+), 2004 deletions(-)

-- 
2.29.3



More information about the dev mailing list