From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3A133A0350 for ; Mon, 21 Feb 2022 16:41:46 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 34F3F410E0; Mon, 21 Feb 2022 16:41:46 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 6DE7A410E0 for ; Mon, 21 Feb 2022 16:41:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pXs7Ohqaimh7gFjPXmLBR1OocviVS+r0jmjxJpriLCg=; b=NfYIzZCi2e4TdcI/NwNA9zbFqC4JtkoDALDQINVsfhJfj6u4nmFK2QScmGfGFeeczyv0Dr xvoaPXlTEYKy2FRQaEPtVWESExapbNZ7e/Hs+HpLpejAo4FoeDynkxHoedMlVYUshGqk2y 679bZOvcypRdJjKoRKeFz5PycfL1tME= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-27-aGM_ClNKO0-p8dpAUzuCmA-1; Mon, 21 Feb 2022 10:41:40 -0500 X-MC-Unique: aGM_ClNKO0-p8dpAUzuCmA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D1036801B04; Mon, 21 Feb 2022 15:41:39 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id C5C507E2E8; Mon, 21 Feb 2022 15:41:38 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Jerin Jacob , dpdk stable Subject: patch 'eventdev: fix C++ include' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:35:38 +0000 Message-Id: <20220221153625.152324-149-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/26/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/3668e548281723fefea3f0fbabf8805033ec4555 Thanks. Kevin --- >From 3668e548281723fefea3f0fbabf8805033ec4555 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 10 Feb 2022 15:42:34 +0000 Subject: [PATCH] eventdev: fix C++ include [ upstream commit 153e7d88133cf30e6a042e92dcc6a8a0acfe7a62 ] The eventdev headers had issues when used from C++ * Missing closing "}" for the extern "C" block * No automatic casting to/from void * Fixes: a6562f6d6f8e ("eventdev: introduce event timer adapter") Fixes: 32e326869ed6 ("eventdev: add tracepoints") Signed-off-by: Bruce Richardson Acked-by: Jerin Jacob --- lib/eventdev/rte_event_timer_adapter.h | 4 ++++ lib/eventdev/rte_eventdev.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/eventdev/rte_event_timer_adapter.h b/lib/eventdev/rte_event_timer_adapter.h index 1551741820..e68d02da72 100644 --- a/lib/eventdev/rte_event_timer_adapter.h +++ b/lib/eventdev/rte_event_timer_adapter.h @@ -679,3 +679,7 @@ rte_event_timer_cancel_burst(const struct rte_event_timer_adapter *adapter, } +#ifdef __cplusplus +} +#endif + #endif /* __RTE_EVENT_TIMER_ADAPTER_H__ */ diff --git a/lib/eventdev/rte_eventdev.h b/lib/eventdev/rte_eventdev.h index eef47d8acc..25fb7c89dd 100644 --- a/lib/eventdev/rte_eventdev.h +++ b/lib/eventdev/rte_eventdev.h @@ -1806,5 +1806,5 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id, } #endif - rte_eventdev_trace_enq_burst(dev_id, port_id, ev, nb_events, fn); + rte_eventdev_trace_enq_burst(dev_id, port_id, ev, nb_events, (void *)fn); /* * Allow zero cost non burst mode routine invocation if application -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:47.809131620 +0000 +++ 0149-eventdev-fix-C-include.patch 2022-02-21 15:22:44.302704601 +0000 @@ -1 +1 @@ -From 153e7d88133cf30e6a042e92dcc6a8a0acfe7a62 Mon Sep 17 00:00:00 2001 +From 3668e548281723fefea3f0fbabf8805033ec4555 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 153e7d88133cf30e6a042e92dcc6a8a0acfe7a62 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org