Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/18404/?format=api
{ "id": 18404, "url": "https://patches.dpdk.org/api/patches/18404/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1482332986-7599-21-git-send-email-jblunck@infradead.org/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1482332986-7599-21-git-send-email-jblunck@infradead.org>", "list_archive_url": "https://inbox.dpdk.org/dev/1482332986-7599-21-git-send-email-jblunck@infradead.org", "date": "2016-12-21T15:09:43", "name": "[dpdk-dev,v4,20/23] drivers: Use rte_eth_dev_to_pci() helper", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "fff11b23abdab22f9f38ebada368e0d8454daa72", "submitter": { "id": 249, "url": "https://patches.dpdk.org/api/people/249/?format=api", "name": "Jan Blunck", "email": "jblunck@infradead.org" }, "delegate": { "id": 1, "url": "https://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1482332986-7599-21-git-send-email-jblunck@infradead.org/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/18404/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/18404/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 08DE610CF3;\n\tWed, 21 Dec 2016 16:11:03 +0100 (CET)", "from mail-wj0-f195.google.com (mail-wj0-f195.google.com\n\t[209.85.210.195]) by dpdk.org (Postfix) with ESMTP id C478810CB4\n\tfor <dev@dpdk.org>; Wed, 21 Dec 2016 16:10:29 +0100 (CET)", "by mail-wj0-f195.google.com with SMTP id xy5so32460992wjc.1\n\tfor <dev@dpdk.org>; Wed, 21 Dec 2016 07:10:29 -0800 (PST)", "from weierstrass.local.net ([91.200.109.169])\n\tby smtp.gmail.com with ESMTPSA id\n\t135sm27627375wmh.14.2016.12.21.07.10.28\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 21 Dec 2016 07:10:28 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=sender:from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=C4c+TLj6+F8aluMWsH5C8xj7OBVJPcQZg+zE3ty8ywY=;\n\tb=SMF/n4wGGx6L6GTHy71bAmPOY+J6Vh/jgkVBNAMslawPxCmL7DDxmArqrdd2mXY5SD\n\taNLFISzqIIaghY3AqsddarNrI0X3AtBUc1r+A2P89yshjP5adbhE4+UoaGy+uDOEgPQl\n\td2yDPL/Sawj18FHCrPvMnTtlyb3Jp5Ef1RIYWrCX8//RrAzdCpH67KAy6BeizGsXxzaM\n\tVsgSxd8NPDAuAiXGoTWXYtNYSAdI3Myk3wAWqQPLWcC12cuqVoADx2Du5UsssOW2oI++\n\tkQgkE3VwlweIn+yMJCyv36wxWgAtGDmd8K2D0nSW/g+Mq6sSFduw33V2g4As+gOJuAMK\n\txtrw==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:sender:from:to:cc:subject:date:message-id\n\t:in-reply-to:references;\n\tbh=C4c+TLj6+F8aluMWsH5C8xj7OBVJPcQZg+zE3ty8ywY=;\n\tb=r8UY/v2MaDNcTnkRxIQLZmEWQbobv2kDOL5nwcUc82uZfmwzS0JOM/RO2biG9Lh8E6\n\tsFZfByYozg/k/2eDCta+WnDsISKsGbirTLgVD8A/Jl4M+eqcw15CannXMotHS4fYlIj4\n\tGJbENpggs7vYpACh+8k/1XHSriSfX9Z6YJ8zKn0kcYw57DBLj32GzyzxMRABHxj8R+am\n\ta/2JnKrBg3c66dRyTlcyAWhuyu08C1eQP9gXLHm22Ya2MJvbycW5tpOClz7ILC+cGQZR\n\tYed80eN5DXUgJyZf8FGZmyOzkMDJIBWBbwuoK1g4VZqDTKpA0gHW8KkBqHlbrIFwatrC\n\t3IiA==", "X-Gm-Message-State": "AIkVDXLnxF79NU6+HTgMH0/asjtMsEqYiFBejJ8hy8BoguKHBuAJqlj8fW6cjV5Q+3lTow==", "X-Received": "by 10.194.56.99 with SMTP id z3mr2809038wjp.55.1482333029367;\n\tWed, 21 Dec 2016 07:10:29 -0800 (PST)", "From": "Jan Blunck <jblunck@infradead.org>", "To": "dev@dpdk.org", "Cc": "shreyansh.jain@nxp.com, david.marchand@6wind.com,\n\tstephen@networkplumber.org", "Date": "Wed, 21 Dec 2016 16:09:43 +0100", "Message-Id": "<1482332986-7599-21-git-send-email-jblunck@infradead.org>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1482332986-7599-1-git-send-email-jblunck@infradead.org>", "References": "<1482332986-7599-1-git-send-email-jblunck@infradead.org>", "Subject": "[dpdk-dev] [PATCH v4 20/23] drivers: Use rte_eth_dev_to_pci() helper", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "The drivers should not directly access the rte_eth_dev->pci_dev but use\na helper instead. This is a preparation for replacing the pci_dev with\na struct rte_device member in the future.\n\nSigned-off-by: Jan Blunck <jblunck@infradead.org>\nAcked-by: Shreyansh Jain <shreyansh.jain@nxp.com>\n---\n drivers/net/bnx2x/bnx2x_ethdev.c | 2 +-\n drivers/net/bnxt/bnxt_ethdev.c | 4 ++--\n drivers/net/cxgbe/cxgbe_ethdev.c | 2 +-\n drivers/net/ena/ena_ethdev.c | 2 +-\n drivers/net/enic/enic_ethdev.c | 2 +-\n drivers/net/fm10k/fm10k_ethdev.c | 16 ++++++++--------\n drivers/net/nfp/nfp_net.c | 8 ++++----\n drivers/net/qede/qede_ethdev.c | 4 ++--\n drivers/net/szedata2/rte_eth_szedata2.c | 4 ++--\n drivers/net/thunderx/nicvf_ethdev.c | 5 +++--\n drivers/net/virtio/virtio_ethdev.c | 2 +-\n drivers/net/vmxnet3/vmxnet3_ethdev.c | 2 +-\n 12 files changed, 27 insertions(+), 26 deletions(-)", "diff": "diff --git a/drivers/net/bnx2x/bnx2x_ethdev.c b/drivers/net/bnx2x/bnx2x_ethdev.c\nindex ef2026a..f59488e 100644\n--- a/drivers/net/bnx2x/bnx2x_ethdev.c\n+++ b/drivers/net/bnx2x/bnx2x_ethdev.c\n@@ -516,7 +516,7 @@ bnx2x_common_dev_init(struct rte_eth_dev *eth_dev, int is_vf)\n \tPMD_INIT_FUNC_TRACE();\n \n \teth_dev->dev_ops = is_vf ? &bnx2xvf_eth_dev_ops : &bnx2x_eth_dev_ops;\n-\tpci_dev = eth_dev->pci_dev;\n+\tpci_dev = rte_eth_dev_to_pci(eth_dev);\n \n \trte_eth_copy_pci_info(eth_dev, pci_dev);\n \ndiff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c\nindex 529b6c8..2864ef3 100644\n--- a/drivers/net/bnxt/bnxt_ethdev.c\n+++ b/drivers/net/bnxt/bnxt_ethdev.c\n@@ -1012,7 +1012,7 @@ static bool bnxt_vf_pciid(uint16_t id)\n static int bnxt_init_board(struct rte_eth_dev *eth_dev)\n {\n \tstruct bnxt *bp = eth_dev->data->dev_private;\n-\tstruct rte_pci_device *pci_dev = eth_dev->pci_dev;\n+\tstruct rte_pci_device *pci_dev = rte_eth_dev_to_pci(eth_dev);\n \tint rc;\n \n \t/* enable device (incl. PCI PM wakeup), and bus-mastering */\n@@ -1046,7 +1046,7 @@ static int bnxt_init_board(struct rte_eth_dev *eth_dev)\n static int\n bnxt_dev_init(struct rte_eth_dev *eth_dev)\n {\n-\tstruct rte_pci_device *pci_dev = eth_dev->pci_dev;\n+\tstruct rte_pci_device *pci_dev = rte_eth_dev_to_pci(eth_dev);\n \tstatic int version_printed;\n \tstruct bnxt *bp;\n \tint rc;\ndiff --git a/drivers/net/cxgbe/cxgbe_ethdev.c b/drivers/net/cxgbe/cxgbe_ethdev.c\nindex b7f28eb..bb1f3b3 100644\n--- a/drivers/net/cxgbe/cxgbe_ethdev.c\n+++ b/drivers/net/cxgbe/cxgbe_ethdev.c\n@@ -1005,7 +1005,7 @@ static int eth_cxgbe_dev_init(struct rte_eth_dev *eth_dev)\n \tif (rte_eal_process_type() != RTE_PROC_PRIMARY)\n \t\treturn 0;\n \n-\tpci_dev = eth_dev->pci_dev;\n+\tpci_dev = rte_eth_dev_to_pci(eth_dev);\n \n \tsnprintf(name, sizeof(name), \"cxgbeadapter%d\", eth_dev->data->port_id);\n \tadapter = rte_zmalloc(name, sizeof(*adapter), 0);\ndiff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c\nindex ab9a178..552d3ed 100644\n--- a/drivers/net/ena/ena_ethdev.c\n+++ b/drivers/net/ena/ena_ethdev.c\n@@ -1278,7 +1278,7 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)\n \tif (rte_eal_process_type() != RTE_PROC_PRIMARY)\n \t\treturn 0;\n \n-\tpci_dev = eth_dev->pci_dev;\n+\tpci_dev = rte_eth_dev_to_pci(eth_dev);\n \tadapter->pdev = pci_dev;\n \n \tPMD_INIT_LOG(INFO, \"Initializing %x:%x:%x.%d\\n\",\ndiff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c\nindex 2b154ec..92df191 100644\n--- a/drivers/net/enic/enic_ethdev.c\n+++ b/drivers/net/enic/enic_ethdev.c\n@@ -621,7 +621,7 @@ static int eth_enicpmd_dev_init(struct rte_eth_dev *eth_dev)\n \teth_dev->rx_pkt_burst = &enic_recv_pkts;\n \teth_dev->tx_pkt_burst = &enic_xmit_pkts;\n \n-\tpdev = eth_dev->pci_dev;\n+\tpdev = rte_eth_dev_to_pci(eth_dev);\n \trte_eth_copy_pci_info(eth_dev, pdev);\n \tenic->pdev = pdev;\n \taddr = &pdev->addr;\ndiff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c\nindex 2f6c628..140e235 100644\n--- a/drivers/net/fm10k/fm10k_ethdev.c\n+++ b/drivers/net/fm10k/fm10k_ethdev.c\n@@ -711,7 +711,7 @@ fm10k_dev_rx_init(struct rte_eth_dev *dev)\n {\n \tstruct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \tstruct fm10k_macvlan_filter_info *macvlan;\n-\tstruct rte_pci_device *pdev = dev->pci_dev;\n+\tstruct rte_pci_device *pdev = rte_eth_dev_to_pci(dev);\n \tstruct rte_intr_handle *intr_handle = &pdev->intr_handle;\n \tint i, ret;\n \tstruct fm10k_rx_queue *rxq;\n@@ -1172,7 +1172,7 @@ static void\n fm10k_dev_stop(struct rte_eth_dev *dev)\n {\n \tstruct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n-\tstruct rte_pci_device *pdev = dev->pci_dev;\n+\tstruct rte_pci_device *pdev = rte_eth_dev_to_pci(dev);\n \tstruct rte_intr_handle *intr_handle = &pdev->intr_handle;\n \tint i;\n \n@@ -1389,7 +1389,7 @@ fm10k_dev_infos_get(struct rte_eth_dev *dev,\n \tstruct rte_eth_dev_info *dev_info)\n {\n \tstruct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n-\tstruct rte_pci_device *pdev = dev->pci_dev;\n+\tstruct rte_pci_device *pdev = rte_eth_dev_to_pci(dev);\n \n \tPMD_INIT_FUNC_TRACE();\n \n@@ -2336,7 +2336,7 @@ static int\n fm10k_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id)\n {\n \tstruct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n-\tstruct rte_pci_device *pdev = dev->pci_dev;\n+\tstruct rte_pci_device *pdev = rte_eth_dev_to_pci(dev);\n \n \t/* Enable ITR */\n \tif (hw->mac.type == fm10k_mac_pf)\n@@ -2353,7 +2353,7 @@ static int\n fm10k_dev_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id)\n {\n \tstruct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n-\tstruct rte_pci_device *pdev = dev->pci_dev;\n+\tstruct rte_pci_device *pdev = rte_eth_dev_to_pci(dev);\n \n \t/* Disable ITR */\n \tif (hw->mac.type == fm10k_mac_pf)\n@@ -2369,7 +2369,7 @@ static int\n fm10k_dev_rxq_interrupt_setup(struct rte_eth_dev *dev)\n {\n \tstruct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n-\tstruct rte_pci_device *pdev = dev->pci_dev;\n+\tstruct rte_pci_device *pdev = rte_eth_dev_to_pci(dev);\n \tstruct rte_intr_handle *intr_handle = &pdev->intr_handle;\n \tuint32_t intr_vector, vec;\n \tuint16_t queue_id;\n@@ -2833,7 +2833,7 @@ static int\n eth_fm10k_dev_init(struct rte_eth_dev *dev)\n {\n \tstruct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n-\tstruct rte_pci_device *pdev = dev->pci_dev;\n+\tstruct rte_pci_device *pdev = rte_eth_dev_to_pci(dev);\n \tstruct rte_intr_handle *intr_handle = &pdev->intr_handle;\n \tint diag, i;\n \tstruct fm10k_macvlan_filter_info *macvlan;\n@@ -3012,7 +3012,7 @@ static int\n eth_fm10k_dev_uninit(struct rte_eth_dev *dev)\n {\n \tstruct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n-\tstruct rte_pci_device *pdev = dev->pci_dev;\n+\tstruct rte_pci_device *pdev = rte_eth_dev_to_pci(dev);\n \tstruct rte_intr_handle *intr_handle = &pdev->intr_handle;\n \tPMD_INIT_FUNC_TRACE();\n \ndiff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c\nindex 2609f97..43bd262 100644\n--- a/drivers/net/nfp/nfp_net.c\n+++ b/drivers/net/nfp/nfp_net.c\n@@ -723,7 +723,7 @@ nfp_net_close(struct rte_eth_dev *dev)\n \tPMD_INIT_LOG(DEBUG, \"Close\\n\");\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n-\tpci_dev = dev->pci_dev;\n+\tpci_dev = rte_eth_dev_to_pci(dev);\n \n \t/*\n \t * We assume that the DPDK application is stopping all the\n@@ -1124,7 +1124,7 @@ nfp_net_rx_queue_count(struct rte_eth_dev *dev, uint16_t queue_idx)\n static void\n nfp_net_dev_link_status_print(struct rte_eth_dev *dev)\n {\n-\tstruct rte_pci_device *pci_dev = dev->pci_dev;\n+\tstruct rte_pci_device *pci_dev = rte_eth_dev_to_pci(dev);\n \tstruct rte_eth_link link;\n \n \tmemset(&link, 0, sizeof(link));\n@@ -1158,7 +1158,7 @@ nfp_net_irq_unmask(struct rte_eth_dev *dev)\n \tstruct rte_pci_device *pci_dev;\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n-\tpci_dev = dev->pci_dev;\n+\tpci_dev = rte_eth_dev_to_pci(dev);\n \n \tif (hw->ctrl & NFP_NET_CFG_CTRL_MSIXAUTO) {\n \t\t/* If MSI-X auto-masking is used, clear the entry */\n@@ -2335,7 +2335,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev)\n \tif (rte_eal_process_type() != RTE_PROC_PRIMARY)\n \t\treturn 0;\n \n-\tpci_dev = eth_dev->pci_dev;\n+\tpci_dev = rte_eth_dev_to_pci(eth_dev);\n \trte_eth_copy_pci_info(eth_dev, pci_dev);\n \n \thw->device_id = pci_dev->id.device_id;\ndiff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c\nindex a50bd5f..ea65895 100644\n--- a/drivers/net/qede/qede_ethdev.c\n+++ b/drivers/net/qede/qede_ethdev.c\n@@ -809,7 +809,7 @@ static void qede_poll_sp_sb_cb(void *param)\n \n static void qede_dev_close(struct rte_eth_dev *eth_dev)\n {\n-\tstruct rte_pci_device *pci_dev = eth_dev->pci_dev;\n+\tstruct rte_pci_device *pci_dev = rte_eth_dev_to_pci(eth_dev);\n \tstruct qede_dev *qdev = QEDE_INIT_QDEV(eth_dev);\n \tstruct ecore_dev *edev = QEDE_INIT_EDEV(qdev);\n \tint rc;\n@@ -1404,7 +1404,7 @@ static int qede_common_dev_init(struct rte_eth_dev *eth_dev, bool is_vf)\n \t/* Extract key data structures */\n \tadapter = eth_dev->data->dev_private;\n \tedev = &adapter->edev;\n-\tpci_dev = eth_dev->pci_dev;\n+\tpci_dev = rte_eth_dev_to_pci(eth_dev);\n \tpci_addr = pci_dev->addr;\n \n \tPMD_INIT_FUNC_TRACE(edev);\ndiff --git a/drivers/net/szedata2/rte_eth_szedata2.c b/drivers/net/szedata2/rte_eth_szedata2.c\nindex 8dc94c5..7f86dc9 100644\n--- a/drivers/net/szedata2/rte_eth_szedata2.c\n+++ b/drivers/net/szedata2/rte_eth_szedata2.c\n@@ -1429,7 +1429,7 @@ rte_szedata2_eth_dev_init(struct rte_eth_dev *dev)\n \tstruct szedata *szedata_temp;\n \tint ret;\n \tuint32_t szedata2_index;\n-\tstruct rte_pci_device *pci_dev = dev->pci_dev;\n+\tstruct rte_pci_device *pci_dev = rte_eth_dev_to_pci(dev);\n \tstruct rte_pci_addr *pci_addr = &pci_dev->addr;\n \tstruct rte_mem_resource *pci_rsc =\n \t\t&pci_dev->mem_resource[PCI_RESOURCE_NUMBER];\n@@ -1552,7 +1552,7 @@ rte_szedata2_eth_dev_init(struct rte_eth_dev *dev)\n static int\n rte_szedata2_eth_dev_uninit(struct rte_eth_dev *dev)\n {\n-\tstruct rte_pci_device *pci_dev = dev->pci_dev;\n+\tstruct rte_pci_device *pci_dev = rte_eth_dev_to_pci(dev);\n \tstruct rte_pci_addr *pci_addr = &pci_dev->addr;\n \n \trte_free(dev->data->mac_addrs);\ndiff --git a/drivers/net/thunderx/nicvf_ethdev.c b/drivers/net/thunderx/nicvf_ethdev.c\nindex 466e49c..113f1e2 100644\n--- a/drivers/net/thunderx/nicvf_ethdev.c\n+++ b/drivers/net/thunderx/nicvf_ethdev.c\n@@ -1335,6 +1335,7 @@ static void\n nicvf_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n {\n \tstruct nicvf *nic = nicvf_pmd_priv(dev);\n+\tstruct rte_pci_device *pci_dev = rte_eth_dev_to_pci(dev);\n \n \tPMD_INIT_FUNC_TRACE();\n \n@@ -1345,7 +1346,7 @@ nicvf_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \tdev_info->max_tx_queues =\n \t\t\t(uint16_t)MAX_SND_QUEUES_PER_QS * (MAX_SQS_PER_VF + 1);\n \tdev_info->max_mac_addrs = 1;\n-\tdev_info->max_vfs = dev->pci_dev->max_vfs;\n+\tdev_info->max_vfs = pci_dev->max_vfs;\n \n \tdev_info->rx_offload_capa = DEV_RX_OFFLOAD_VLAN_STRIP;\n \tdev_info->tx_offload_capa =\n@@ -1975,7 +1976,7 @@ nicvf_eth_dev_init(struct rte_eth_dev *eth_dev)\n \t\t}\n \t}\n \n-\tpci_dev = eth_dev->pci_dev;\n+\tpci_dev = rte_eth_dev_to_pci(eth_dev);\n \trte_eth_copy_pci_info(eth_dev, pci_dev);\n \n \tnic->device_id = pci_dev->id.device_id;\ndiff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c\nindex 58c03d8..251ef07 100644\n--- a/drivers/net/virtio/virtio_ethdev.c\n+++ b/drivers/net/virtio/virtio_ethdev.c\n@@ -1321,7 +1321,7 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)\n \t * virtio_user_eth_dev_alloc() before eth_virtio_dev_init() is called.\n \t */\n \tif (!hw->virtio_user_dev) {\n-\t\tret = vtpci_init(eth_dev->pci_dev, hw, &dev_flags);\n+\t\tret = vtpci_init(rte_eth_dev_to_pci(eth_dev), hw, &dev_flags);\n \t\tif (ret)\n \t\t\treturn ret;\n \t}\ndiff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c\nindex 20a7966..1c51619 100644\n--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c\n+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c\n@@ -237,7 +237,7 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev)\n \teth_dev->dev_ops = &vmxnet3_eth_dev_ops;\n \teth_dev->rx_pkt_burst = &vmxnet3_recv_pkts;\n \teth_dev->tx_pkt_burst = &vmxnet3_xmit_pkts;\n-\tpci_dev = eth_dev->pci_dev;\n+\tpci_dev = rte_eth_dev_to_pci(eth_dev);\n \n \t/*\n \t * for secondary processes, we don't initialize any further as primary\n", "prefixes": [ "dpdk-dev", "v4", "20/23" ] }