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 69320A034F for ; Tue, 1 Mar 2022 11:43:39 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6590F426E2; Tue, 1 Mar 2022 11:43:39 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 891B9407FF for ; Tue, 1 Mar 2022 11:43:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131418; 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=GEK16W9M8MWeG8E2n8aEaPr3d+vEGUov2OkyNy1UnjU=; b=UvlSVP33YGDsiqHU63+jQ/kWo246QwX9qp2fpJeFfT5NBvYHOUnurzcyvn2KcAYxFSxZ2E pNXISR4CZYr1TEbq3R9vQiZP122pIQjZSq0m71CwuDQ5YKjL2l59lPiP4D7xuVdtO9wrp5 60GnCbe13t892B1xmfkkqRyxnLCDr44= 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-502-mrL2rGI1NZ2eKV08hjQPMA-1; Tue, 01 Mar 2022 05:43:35 -0500 X-MC-Unique: mrL2rGI1NZ2eKV08hjQPMA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A679C824FA7; Tue, 1 Mar 2022 10:43:34 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6AAF6752BE; Tue, 1 Mar 2022 10:43:33 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Tyler Retzlaff , dpdk stable Subject: patch 'ethdev: fix cast for C++ compatibility' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:41:29 +0000 Message-Id: <20220301104300.334382-13-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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 03/06/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/56d6e5b091b3dff4c9b1471fe2310b7e60dfebfa Thanks. Kevin --- >From 56d6e5b091b3dff4c9b1471fe2310b7e60dfebfa Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Tue, 15 Feb 2022 17:30:27 +0000 Subject: [PATCH] ethdev: fix cast for C++ compatibility [ upstream commit 5ed2a2d4fdb696727b614f881f263851fad8832c ] C++ does not allow implicit conversion to/from void*, so we need an explicit cast to allow the driver SDK header to be included from C++ code. Fixes: e489007a411c ("ethdev: add generic create/destroy ethdev APIs") Signed-off-by: Bruce Richardson Acked-by: Tyler Retzlaff --- lib/ethdev/ethdev_pci.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/ethdev/ethdev_pci.h b/lib/ethdev/ethdev_pci.h index 6130bcbd1f..0549842709 100644 --- a/lib/ethdev/ethdev_pci.h +++ b/lib/ethdev/ethdev_pci.h @@ -51,6 +51,7 @@ rte_eth_copy_pci_info(struct rte_eth_dev *eth_dev, static inline int -eth_dev_pci_specific_init(struct rte_eth_dev *eth_dev, void *bus_device) { - struct rte_pci_device *pci_dev = bus_device; +eth_dev_pci_specific_init(struct rte_eth_dev *eth_dev, void *bus_device) +{ + struct rte_pci_device *pci_dev = (struct rte_pci_device *)bus_device; if (!pci_dev) -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:01.774394531 +0000 +++ 0013-ethdev-fix-cast-for-C-compatibility.patch 2022-03-01 10:41:01.248244086 +0000 @@ -1 +1 @@ -From 5ed2a2d4fdb696727b614f881f263851fad8832c Mon Sep 17 00:00:00 2001 +From 56d6e5b091b3dff4c9b1471fe2310b7e60dfebfa Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5ed2a2d4fdb696727b614f881f263851fad8832c ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org