From patchwork Tue Aug 4 17:51:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pawel Wodkowski X-Patchwork-Id: 75197 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7B1ABA053A; Tue, 4 Aug 2020 19:52:11 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C5F6BF04; Tue, 4 Aug 2020 19:52:10 +0200 (CEST) Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) by dpdk.org (Postfix) with ESMTP id 9FA602AB for ; Tue, 4 Aug 2020 19:52:08 +0200 (CEST) Received: by mail-lj1-f175.google.com with SMTP id w14so14743895ljj.4 for ; Tue, 04 Aug 2020 10:52:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ovWOth0mJw07wNdKug4U+Xq5zzmTnR7cn3CWVz/vkcE=; b=BX9/4ME4UniRu6rRhhcl2Y5e18eiaj/VtCH6i8fuOUr0wu1FVRhxMJK4SBlIoin7oR IkHmA49qBwJ0VDgtOcT2ecy0dJLTZFPO+BdTjENJrvqXvSuvmpM5fbobeoYI4QKjPORC k+xQu2G5CBrYLGlk8JwYcUyouc4JFO3J8b1LIhzMEMpcGb5BHjOz2w4eN1rmu0AvYziT W2EG2Jg7B1RgaSgQ1po3g0zn+ABlHuaeUzRt1E320omICnETpdfoW/9Zg+luDV6hSi/i fCOxESbgdwIJAirGOkJEwG7rSZpuANAn3ejFKAnERtCFbG+nrkatBG+Z7HbV29gDW4u/ +9IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ovWOth0mJw07wNdKug4U+Xq5zzmTnR7cn3CWVz/vkcE=; b=e6jd5Ola0jdv9me7gcVwbkVUNQmofnV4amyfl3VdEZxXOO+DGybYG8/v/1GRDmBWad cCwSLwf2GPCKtA9K2EyUmbszSvlXtbRT8vIYqUkD4o/fOkPdQtdYsGMtd+VsD29aVrGx zQJE9zl5jVMLu+DU4dpg3e6r9pP76jnbfVTQmQhfPtLjyPtBcmnSt7uE+qjO4elt+tON yilVYg1+oJx3/t42SMvy3vo7qqbXzty920SjXxZG64/TO8fUWPg2t+IDA7yu8D/XUS6+ PbMpk0qPKTtp4hK/1xYT39vQZOS0cRo+e6j+yIeqXasn9JOxIH/fKtuoJoQV31Smrk75 J2qg== X-Gm-Message-State: AOAM530sKpD8IHZNE51pRi0esA2wAmNCABnQOW2PU1wrMIXW5Bxc1G1f AtedtRVKhZ7tKE1RGopipntrxciG11ezrw== X-Google-Smtp-Source: ABdhPJzq1A836A1EjoXGJMohHNXAAlbZ/ETROxzPtqn5RwoxpSSP1muIwBk9G8nNwMS7EmyNdQEYwg== X-Received: by 2002:a2e:6804:: with SMTP id c4mr3212635lja.216.1596563527874; Tue, 04 Aug 2020 10:52:07 -0700 (PDT) Received: from machina.creanord.lan ([194.100.60.111]) by smtp.gmail.com with ESMTPSA id h21sm5733557ljk.31.2020.08.04.10.52.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Aug 2020 10:52:07 -0700 (PDT) From: Pawel Wodkowski To: dev@dpdk.org Cc: Pawel Wodkowski Date: Tue, 4 Aug 2020 19:51:38 +0200 Message-Id: <20200804175138.18543-1-pawelwod@gmail.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH] tracepoint: fix compilation with C++ X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" trace_mem is declared as 'void *' which triggers following error: '...invalid conversion from ‘void*’ to ‘__rte_trace_header*’ [-fpermissive]...' Fix this by changing void to struct __rte_trace_header --- lib/librte_eal/common/eal_common_trace.c | 2 +- lib/librte_eal/include/rte_trace_point.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_eal/common/eal_common_trace.c b/lib/librte_eal/common/eal_common_trace.c index 875553d7e..18e5e64be 100644 --- a/lib/librte_eal/common/eal_common_trace.c +++ b/lib/librte_eal/common/eal_common_trace.c @@ -16,7 +16,7 @@ #include "eal_trace.h" RTE_DEFINE_PER_LCORE(volatile int, trace_point_sz); -RTE_DEFINE_PER_LCORE(void *, trace_mem); +RTE_DEFINE_PER_LCORE(struct __rte_trace_header *, trace_mem); static RTE_DEFINE_PER_LCORE(char, ctf_field[TRACE_CTF_FIELD_SIZE]); static RTE_DEFINE_PER_LCORE(int, ctf_count); diff --git a/lib/librte_eal/include/rte_trace_point.h b/lib/librte_eal/include/rte_trace_point.h index b45171275..587f600ec 100644 --- a/lib/librte_eal/include/rte_trace_point.h +++ b/lib/librte_eal/include/rte_trace_point.h @@ -295,7 +295,7 @@ struct __rte_trace_header { uint8_t mem[]; }; -RTE_DECLARE_PER_LCORE(void *, trace_mem); +RTE_DECLARE_PER_LCORE(struct __rte_trace_header *, trace_mem); static __rte_always_inline void * __rte_trace_mem_get(uint64_t in)