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 1FA38A0093 for ; Wed, 9 Mar 2022 12:01:57 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1A1EC40150; Wed, 9 Mar 2022 12:01:57 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 81CA740150 for ; Wed, 9 Mar 2022 12:01:55 +0100 (CET) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 5E4B33F4C2 for ; Wed, 9 Mar 2022 11:01:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646823715; bh=s0XJZCytjrYRQ6BalJ25QZJ6/ITj9vsg7MiYJbZfy1Q=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dKgDFRlXBEoa5aIIj5n0W2Td3n9StT0og7ji1ewQrAmxMLFqA25vo4RQOpDM1mNk7 NTkCHvTmym8rxBaQrGEedKICBZRqmFzXY8sHZzC6hd99n0VoQ3CAFKnGOwaKcMkZDp GPccW5U//YVTKMeViKOTzr/MbYKpzeLEgyMg8aZPzrHm1eKgLzQsN9sHFnHuvV36mB uPgPS3NXNFdioq3miCb2OUNi8p5iVj54maMIPR4cjR5Vyt5B0UU+B80NsoCpYidTqK sbgd6mqBmdI2DufUb2myH1oAfjVCf3Mj8KtCBTzFMj1EzHwBn2hmlAKzlBOMFPTpzm YxHBA+YaPebRA== Received: by mail-wm1-f69.google.com with SMTP id a26-20020a7bc1da000000b003857205ec7cso835919wmj.2 for ; Wed, 09 Mar 2022 03:01:55 -0800 (PST) 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=s0XJZCytjrYRQ6BalJ25QZJ6/ITj9vsg7MiYJbZfy1Q=; b=v77lU1NmsK8MshzRhXwqDwOsPQPKsNvZn2/fu0FsTlgMY3hRgCRxvECyWX32feSqGL Je2dF5BlqNypJy58U16V6gE4xkas4LyvuhxS/jAtqG9fUb9yTRJVlutPTFI47Y0MelXK 6F5sZsKDi/MF+9CXSM7dCCgJbsAbwLZ+eX0jXyROTpjVqSk9dUqKydE8FQM+px2kaHr7 LV0KxMyMab7LOLv96gWV27oGcy8VaV9EUbSgQ8ccc/VScLr1gbeH/RE9ICba8zI3ZXxj YijGn8h/iUQy12c0C2zTM0CRPKvbltLnQuPjMMj1aNpkDqC2ybY1PoHKDPgqJVtLMU8I lYsA== X-Gm-Message-State: AOAM530EemcQwD7BgnALgZj+Rwd6H0AYKxoQOwIrCbh5D5oHuQFOMOMp C1Gnn1if3K+tv/TEDw8JfSWqUbY625SvjmZCv7JKcxUd8syX9+X5sIcPFsM+Hk1TC7Jj2uDrVfG duw4n0x84/KmoIS6iIzqwP6di X-Received: by 2002:a05:600c:210e:b0:385:d649:b4ca with SMTP id u14-20020a05600c210e00b00385d649b4camr2876197wml.114.1646823714704; Wed, 09 Mar 2022 03:01:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJztGa/RosQ5UFybMkMJAI3LWpaEyPd+JCKHAnBmTzmgJ1sdWG0OHcZlEWeVP/lglO3ynxHIEA== X-Received: by 2002:a05:600c:210e:b0:385:d649:b4ca with SMTP id u14-20020a05600c210e00b00385d649b4camr2876182wml.114.1646823714498; Wed, 09 Mar 2022 03:01:54 -0800 (PST) Received: from localhost.localdomain (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id v14-20020adfd18e000000b0020373e5319asm1467247wrc.103.2022.03.09.03.01.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 03:01:54 -0800 (PST) From: christian.ehrhardt@canonical.com To: Bruce Richardson Cc: Tyler Retzlaff , dpdk stable Subject: patch 'ethdev: fix cast for C++ compatibility' has been queued to stable release 19.11.12 Date: Wed, 9 Mar 2022 12:00:38 +0100 Message-Id: <20220309110116.1295395-7-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220309110116.1295395-1-christian.ehrhardt@canonical.com> References: <20220309110116.1295395-1-christian.ehrhardt@canonical.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 19.11.12 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/11/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/322dd30298356faba004a03503d4e8e1527ddf0a Thanks. Christian Ehrhardt --- >From 322dd30298356faba004a03503d4e8e1527ddf0a 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 7dae0d5a44..9e41220a4a 100644 --- a/lib/librte_ethdev/rte_ethdev_pci.h +++ b/lib/librte_ethdev/rte_ethdev_pci.h @@ -49,8 +49,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.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-09 11:57:43.760890225 +0100 +++ 0007-ethdev-fix-cast-for-C-compatibility.patch 2022-03-09 11:57:43.320937928 +0100 @@ -1 +1 @@ -From 5ed2a2d4fdb696727b614f881f263851fad8832c Mon Sep 17 00:00:00 2001 +From 322dd30298356faba004a03503d4e8e1527ddf0a 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,5 +20,5 @@ -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 -@@ -50,8 +50,9 @@ rte_eth_copy_pci_info(struct rte_eth_dev *eth_dev, +diff --git a/lib/librte_ethdev/rte_ethdev_pci.h b/lib/librte_ethdev/rte_ethdev_pci.h +index 7dae0d5a44..9e41220a4a 100644 +--- a/lib/librte_ethdev/rte_ethdev_pci.h ++++ b/lib/librte_ethdev/rte_ethdev_pci.h +@@ -49,8 +49,9 @@ rte_eth_copy_pci_info(struct rte_eth_dev *eth_dev,