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 CCE07A0350 for ; Mon, 28 Feb 2022 22:21:23 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C7A5A40140; Mon, 28 Feb 2022 22:21:23 +0100 (CET) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id 54B8740140 for ; Mon, 28 Feb 2022 22:21:22 +0100 (CET) Received: by mail-wr1-f41.google.com with SMTP id n14so17415116wrq.7 for ; Mon, 28 Feb 2022 13:21:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6pSUecM+XS54e9f6/lHxnLGkE+0vJCcY49qGx3WKj+8=; b=BtbwReQmqj2xI6Nj371fpkoGC7wH+3GQWTiLTfpP9hdDcgpaPmTbM9k5w0hvsBBaKG SuXPI4Un0cocOYBkZpIZSqzPnO1umFGQwKjxc/4yAFs8S+ai63zSAj+sPKUfaCF04bOX xbB35gZkMHYbkam1b1PF3h6jMYLtlypbpG65NSP5HNYhWGas3MLZv31qw3TyhT+38i5x iOgMpurc3jnxLoPkdrc4Lza40JA/q6b27W+9Ieo0dlTuEcIWeKXN9BVFNHMIrxVzsorx phhLb43P1xSVXhDCxQbMlKP7OGt1YHZcxQ/0ajA+zAEveDQfhMR0M7WVX3ZvydXMpsYp /Oaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6pSUecM+XS54e9f6/lHxnLGkE+0vJCcY49qGx3WKj+8=; b=qiVpzoFGybxDTJmSHn9YxG+MN2G96cHIDvr4HMvS4z4Qgt1h/gdUyaTzVKpHXQjTHS Wwfu9w0uTSMtF1kK1AvTBV9b0I8VKKHdwDuhNjcQ5w4JOtGhXP0AVjdSirImrNWEtRpP Tlw+jvXxPuUyIq1tdcR1KbLtf9O5S8abwRjCmdkAhgffzWHjphOgSp+rSULlZMltZ7GL Nxb2HhhPaszc1SoSPqqk9i9sPoPYm5bcsrugaULwSLVYz/R5d/U3Kq1gj8pQDoSfAG+r 7ev4wYqrrmlpSA9VQEXQ67SnaZUpOSivjaql4hFatA5uMa2jDbQ6nto2wOBScTlsYqVM snRw== X-Gm-Message-State: AOAM530Hrcb1+2yaIePpV3xg/EfI0YZw54QQu6dD1zT9mqoytMHeu6Cb 7tJE7AuwaZHjMi1EoBQo3S0= X-Google-Smtp-Source: ABdhPJyyxrBtrMGPNX1xN67mLbn5ntEc6M0vmR4O90Unc61bHoVX4Tr29Q6Ibm+QB/WpVVOJo6mjfQ== X-Received: by 2002:a5d:62c3:0:b0:1ed:e116:39 with SMTP id o3-20020a5d62c3000000b001ede1160039mr16592364wrv.197.1646083282062; Mon, 28 Feb 2022 13:21:22 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id u25-20020a05600c211900b003817667ab55sm515750wml.33.2022.02.28.13.21.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 13:21:21 -0800 (PST) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: Tyler Retzlaff , dpdk stable Subject: patch 'ethdev: fix cast for C++ compatibility' has been queued to stable release 20.11.5 Date: Mon, 28 Feb 2022 21:20:07 +0000 Message-Id: <20220228212047.3341966-11-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220228212047.3341966-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-122-luca.boccassi@gmail.com> <20220228212047.3341966-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.5 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/02/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/26bebaab5557171ceb47582bdc26b43922e5900c Thanks. Luca Boccassi --- >From 26bebaab5557171ceb47582bdc26b43922e5900c 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/librte_ethdev/rte_ethdev_pci.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/librte_ethdev/rte_ethdev_pci.h b/lib/librte_ethdev/rte_ethdev_pci.h index e2c83fd941..d015697e21 100644 --- a/lib/librte_ethdev/rte_ethdev_pci.h +++ b/lib/librte_ethdev/rte_ethdev_pci.h @@ -50,8 +50,9 @@ 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) return -ENODEV; -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-28 21:17:54.871032504 +0000 +++ 0011-ethdev-fix-cast-for-C-compatibility.patch 2022-02-28 21:17:53.816928705 +0000 @@ -1 +1 @@ -From 5ed2a2d4fdb696727b614f881f263851fad8832c Mon Sep 17 00:00:00 2001 +From 26bebaab5557171ceb47582bdc26b43922e5900c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5ed2a2d4fdb696727b614f881f263851fad8832c ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ - lib/ethdev/ethdev_pci.h | 5 +++-- + lib/librte_ethdev/rte_ethdev_pci.h | 5 +++-- @@ -19,4 +20,4 @@ -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 +diff --git a/lib/librte_ethdev/rte_ethdev_pci.h b/lib/librte_ethdev/rte_ethdev_pci.h +index e2c83fd941..d015697e21 100644 +--- a/lib/librte_ethdev/rte_ethdev_pci.h ++++ b/lib/librte_ethdev/rte_ethdev_pci.h