From patchwork Fri Aug 11 22:22:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 130247 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 56D6843038; Sat, 12 Aug 2023 00:26:05 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 38E4A432EB; Sat, 12 Aug 2023 00:23:41 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 9215F43259 for ; Sat, 12 Aug 2023 00:23:05 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1086) id 291B720FD430; Fri, 11 Aug 2023 15:23:03 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 291B720FD430 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1691792584; bh=PEqFiP1X+PRQjXZpXAhkaabdTwED01yUm2I9SpZIneg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KYMCDEWOXjUSVaWNE6aBn645PDaxSBVfaKd0zM3UNHkVfuYRqjcxSkHBtGvT631Uk w52o4Yk+a+jV7efoD5RDs0v84HBGrF9mBGWsfzVLREeslmsdyZw+lP0h7GtwJQhgkL srsrWFEQiW8LJkyBe37ypU7tfLlijTdUXWntec6Q= From: Tyler Retzlaff To: dev@dpdk.org Cc: Akhil Goyal , Anatoly Burakov , Andrew Rybchenko , Bruce Richardson , Chengwen Feng , Cristian Dumitrescu , David Hunt , Erik Gabriel Carrillo , Fan Zhang , Ferruh Yigit , Harman Kalra , Hemant Agrawal , Honnappa Nagarahalli , Jerin Jacob , Junfeng Guo , Kevin Laatz , Kiran Kumar K , Konstantin Ananyev , Matan Azrad , Matt Peters , Naga Harish K S V , Nithin Dabilpuram , Olivier Matz , Ori Kam , Radu Nicolau , Sachin Saxena , Sameh Gobriel , Satha Rao , Simei Su , Srikanth Yalavarthi , Steven Webster , Suanming Mou , Sunil Kumar Kori , Thomas Monjalon , Viacheslav Ovsiienko , Vladimir Medvedkin , Yipeng Wang , Zhirun Yan , Tyler Retzlaff Subject: [PATCH 32/32] eal: remove use and definition of RTE STD C11 macro Date: Fri, 11 Aug 2023 15:22:47 -0700 Message-Id: <1691792567-10805-33-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1691792567-10805-1-git-send-email-roretzla@linux.microsoft.com> References: <1691792567-10805-1-git-send-email-roretzla@linux.microsoft.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org C11 conformant compiler is documented as a minimum requirement to build and consume DPDK. Remove use and definition of RTE_STD_C11 macro. Signed-off-by: Tyler Retzlaff --- lib/eal/common/eal_common_proc.c | 1 - lib/eal/common/eal_interrupts.h | 1 - lib/eal/common/malloc_mp.h | 2 -- lib/eal/include/generic/rte_atomic.h | 2 -- lib/eal/include/rte_common.h | 7 ------- lib/eal/include/rte_devargs.h | 1 - lib/eal/include/rte_memory.h | 2 -- lib/eal/include/rte_memzone.h | 1 - lib/eal/linux/eal_vfio.h | 1 - lib/eal/x86/include/rte_atomic_32.h | 1 - lib/eal/x86/include/rte_cycles.h | 1 - 11 files changed, 20 deletions(-) diff --git a/lib/eal/common/eal_common_proc.c b/lib/eal/common/eal_common_proc.c index 02d4599..c4981f2 100644 --- a/lib/eal/common/eal_common_proc.c +++ b/lib/eal/common/eal_common_proc.c @@ -80,7 +80,6 @@ struct pending_request { struct rte_mp_msg *request; struct rte_mp_msg *reply; int reply_received; - RTE_STD_C11 union { struct { struct async_request_param *param; diff --git a/lib/eal/common/eal_interrupts.h b/lib/eal/common/eal_interrupts.h index 482781b..c9d6744 100644 --- a/lib/eal/common/eal_interrupts.h +++ b/lib/eal/common/eal_interrupts.h @@ -6,7 +6,6 @@ #define EAL_INTERRUPTS_H struct rte_intr_handle { - RTE_STD_C11 union { struct { int dev_fd; /**< VFIO/UIO cfg device file descriptor */ diff --git a/lib/eal/common/malloc_mp.h b/lib/eal/common/malloc_mp.h index 8d14868..43dc2a8 100644 --- a/lib/eal/common/malloc_mp.h +++ b/lib/eal/common/malloc_mp.h @@ -39,7 +39,6 @@ struct malloc_req_alloc { }; struct malloc_req_free { - RTE_STD_C11 union { void *addr; uint64_t addr_64; @@ -49,7 +48,6 @@ struct malloc_req_free { struct malloc_mp_req { enum malloc_req_type t; - RTE_STD_C11 union { struct malloc_req_alloc alloc_req; struct malloc_req_free free_req; diff --git a/lib/eal/include/generic/rte_atomic.h b/lib/eal/include/generic/rte_atomic.h index aef44e2..82b9bfc 100644 --- a/lib/eal/include/generic/rte_atomic.h +++ b/lib/eal/include/generic/rte_atomic.h @@ -1069,9 +1069,7 @@ static inline void rte_atomic64_clear(rte_atomic64_t *v) /** * 128-bit integer structure. */ -RTE_STD_C11 typedef struct { - RTE_STD_C11 union { uint64_t val[2]; #ifdef RTE_ARCH_64 diff --git a/lib/eal/include/rte_common.h b/lib/eal/include/rte_common.h index 15765b4..77f937e 100644 --- a/lib/eal/include/rte_common.h +++ b/lib/eal/include/rte_common.h @@ -34,13 +34,6 @@ #endif #endif -/** C extension macro for environments lacking C11 features. */ -#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 201112L -#define RTE_STD_C11 __extension__ -#else -#define RTE_STD_C11 -#endif - /* * RTE_TOOLCHAIN_GCC is defined if the target is built with GCC, * while a host application (like pmdinfogen) may have another compiler. diff --git a/lib/eal/include/rte_devargs.h b/lib/eal/include/rte_devargs.h index 38dee2f..9126798 100644 --- a/lib/eal/include/rte_devargs.h +++ b/lib/eal/include/rte_devargs.h @@ -78,7 +78,6 @@ struct rte_devargs { enum rte_dev_policy policy; /** Name of the device. */ char name[RTE_DEV_NAME_MAX_LEN]; - RTE_STD_C11 union { const char *args; /**< legacy name. */ const char *drv_str; /**< driver-related part of device string. */ diff --git a/lib/eal/include/rte_memory.h b/lib/eal/include/rte_memory.h index 99a1139..3a1c607 100644 --- a/lib/eal/include/rte_memory.h +++ b/lib/eal/include/rte_memory.h @@ -47,7 +47,6 @@ */ struct rte_memseg { rte_iova_t iova; /**< Start IO address. */ - RTE_STD_C11 union { void *addr; /**< Start virtual address. */ uint64_t addr_64; /**< Makes sure addr is always 64 bits */ @@ -65,7 +64,6 @@ struct rte_memseg { * together with the array itself. */ struct rte_memseg_list { - RTE_STD_C11 union { void *base_va; /**< Base virtual address for this memseg list. */ diff --git a/lib/eal/include/rte_memzone.h b/lib/eal/include/rte_memzone.h index ebcdae9..931497f 100644 --- a/lib/eal/include/rte_memzone.h +++ b/lib/eal/include/rte_memzone.h @@ -51,7 +51,6 @@ struct rte_memzone { char name[RTE_MEMZONE_NAMESIZE]; /**< Name of the memory zone. */ rte_iova_t iova; /**< Start IO address. */ - RTE_STD_C11 union { void *addr; /**< Start virtual address. */ uint64_t addr_64; /**< Makes sure addr is always 64-bits */ diff --git a/lib/eal/linux/eal_vfio.h b/lib/eal/linux/eal_vfio.h index dc8ef32..23a787a 100644 --- a/lib/eal/linux/eal_vfio.h +++ b/lib/eal/linux/eal_vfio.h @@ -148,7 +148,6 @@ struct vfio_iommu_type { struct vfio_mp_param { int req; int result; - RTE_STD_C11 union { int group_num; int iommu_type_id; diff --git a/lib/eal/x86/include/rte_atomic_32.h b/lib/eal/x86/include/rte_atomic_32.h index c885a66..0f25863 100644 --- a/lib/eal/x86/include/rte_atomic_32.h +++ b/lib/eal/x86/include/rte_atomic_32.h @@ -25,7 +25,6 @@ rte_atomic64_cmpset(volatile uint64_t *dst, uint64_t exp, uint64_t src) { uint8_t res; - RTE_STD_C11 union { struct { uint32_t l32; diff --git a/lib/eal/x86/include/rte_cycles.h b/lib/eal/x86/include/rte_cycles.h index a461a4d..23d664b 100644 --- a/lib/eal/x86/include/rte_cycles.h +++ b/lib/eal/x86/include/rte_cycles.h @@ -25,7 +25,6 @@ { union { uint64_t tsc_64; - RTE_STD_C11 struct { uint32_t lo_32; uint32_t hi_32;