From c23432a9c287501071688fe5208078bc6ed371b4 Mon Sep 17 00:00:00 2001 From: Pawel Wodkowski Date: Wed, 12 Aug 2020 15:21:50 +0530 Subject: [PATCH] trace: fix C++ compilation MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit trace_mem is declared as 'void *' which triggers following error: '...invalid conversion from ‘void*’ to ‘__rte_trace_header*’ [-fpermissive]...' Fix this by adding proper typecast to 'struct __rte_trace_header *'. Fixes: ebaee6409702 ("trace: simplify trace point headers") Cc: stable@dpdk.org Signed-off-by: Pawel Wodkowski Signed-off-by: Sunil Kumar Kori Acked-by: Nicolas Chautru --- lib/librte_eal/include/rte_trace_point.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/librte_eal/include/rte_trace_point.h b/lib/librte_eal/include/rte_trace_point.h index b039602772..e226f073f7 100644 --- a/lib/librte_eal/include/rte_trace_point.h +++ b/lib/librte_eal/include/rte_trace_point.h @@ -298,13 +298,14 @@ RTE_DECLARE_PER_LCORE(void *, trace_mem); static __rte_always_inline void * __rte_trace_mem_get(uint64_t in) { - struct __rte_trace_header *trace = RTE_PER_LCORE(trace_mem); + struct __rte_trace_header *trace = + (struct __rte_trace_header *)(RTE_PER_LCORE(trace_mem)); const uint16_t sz = in & __RTE_TRACE_FIELD_SIZE_MASK; /* Trace memory is not initialized for this thread */ if (unlikely(trace == NULL)) { __rte_trace_mem_per_thread_alloc(); - trace = RTE_PER_LCORE(trace_mem); + trace = (struct __rte_trace_header *)(RTE_PER_LCORE(trace_mem)); if (unlikely(trace == NULL)) return NULL; } -- 2.20.1