Imported Upstream version 17.05

[deb_dpdk.git] / test / test / virtual_pmd.c

diff --git a/app/test/virtual_pmd.c b/test/test/virtual_pmd.c
similarity index 96%
rename from app/test/virtual_pmd.c
rename to test/test/virtual_pmd.c
index 65b44c6..e9dd8ac 100644 (file)
--- a/app/test/virtual_pmd.c
+++ b/test/test/virtual_pmd.c
@@ -117,7 +117,6 @@ virtual_ethdev_info_get(struct rte_eth_dev *dev __rte_unused,
        dev_info->max_tx_queues = (uint16_t)512;
 
        dev_info->min_rx_bufsize = 0;
-       dev_info->pci_dev = NULL;
 }
 
 static int
@@ -343,7 +342,7 @@ virtual_ethdev_rx_burst_success(void *queue __rte_unused,
        dev_private = vrtl_eth_dev->data->dev_private;
 
        rx_count = rte_ring_dequeue_burst(dev_private->rx_queue, (void **) bufs,
-                       nb_pkts);
+                       nb_pkts, NULL);
 
        /* increments ipackets count */
        dev_private->eth_stats.ipackets += rx_count;
@@ -367,7 +366,7 @@ static uint16_t
 virtual_ethdev_tx_burst_success(void *queue, struct rte_mbuf **bufs,
                uint16_t nb_pkts)
 {
-       struct virtual_ethdev_queue *tx_q = (struct virtual_ethdev_queue *)queue;
+       struct virtual_ethdev_queue *tx_q = queue;
 
        struct rte_eth_dev *vrtl_eth_dev;
        struct virtual_ethdev_private *dev_private;
@@ -381,7 +380,7 @@ virtual_ethdev_tx_burst_success(void *queue, struct rte_mbuf **bufs,
                nb_pkts = 0;
        else
                nb_pkts = rte_ring_enqueue_burst(dev_private->tx_queue, (void **)bufs,
-                               nb_pkts);
+                               nb_pkts, NULL);
 
        /* increment opacket count */
        dev_private->eth_stats.opackets += nb_pkts;
@@ -403,7 +402,7 @@ virtual_ethdev_tx_burst_fail(void *queue, struct rte_mbuf **bufs,
 
        int i;
 
-       tx_q = (struct virtual_ethdev_queue *)queue;
+       tx_q = queue;
        vrtl_eth_dev = &rte_eth_devices[tx_q->port_id];
        dev_private = vrtl_eth_dev->data->dev_private;
 
@@ -497,7 +496,7 @@ virtual_ethdev_add_mbufs_to_rx_queue(uint8_t port_id,
                        vrtl_eth_dev->data->dev_private;
 
        return rte_ring_enqueue_burst(dev_private->rx_queue, (void **)pkt_burst,
-                       burst_length);
+                       burst_length, NULL);
 }
 
 int
@@ -509,7 +508,7 @@ virtual_ethdev_get_mbufs_from_tx_queue(uint8_t port_id,
 
        dev_private = vrtl_eth_dev->data->dev_private;
        return rte_ring_dequeue_burst(dev_private->tx_queue, (void **)pkt_burst,
-               burst_length);
+               burst_length, NULL);
 }
 
 static uint8_t
@@ -533,7 +532,6 @@ virtual_ethdev_create(const char *name, struct ether_addr *mac_addr,
 {
        struct rte_pci_device *pci_dev = NULL;
        struct rte_eth_dev *eth_dev = NULL;
-       struct eth_driver *eth_drv = NULL;
        struct rte_pci_driver *pci_drv = NULL;
        struct rte_pci_id *id_table = NULL;
        struct virtual_ethdev_private *dev_private = NULL;
@@ -551,10 +549,6 @@ virtual_ethdev_create(const char *name, struct ether_addr *mac_addr,
        if (pci_dev == NULL)
                goto err;
 
-       eth_drv = rte_zmalloc_socket(name, sizeof(*eth_drv), 0, socket_id);
-       if (eth_drv == NULL)
-               goto err;
-
        pci_drv = rte_zmalloc_socket(name, sizeof(*pci_drv), 0, socket_id);
        if (pci_drv == NULL)
                goto err;
@@ -595,14 +589,12 @@ virtual_ethdev_create(const char *name, struct ether_addr *mac_addr,
                pci_drv->drv_flags &= ~RTE_PCI_DRV_INTR_LSC;
 
 
-       eth_drv->pci_drv = (struct rte_pci_driver)(*pci_drv);
-       eth_dev->driver = eth_drv;
+       eth_dev->device = &pci_dev->device;
+       eth_dev->device->driver = &pci_drv->driver;
 
        eth_dev->data->nb_rx_queues = (uint16_t)1;
        eth_dev->data->nb_tx_queues = (uint16_t)1;
 
-       TAILQ_INIT(&(eth_dev->link_intr_cbs));
-
        eth_dev->data->dev_link.link_status = ETH_LINK_DOWN;
        eth_dev->data->dev_link.link_speed = ETH_SPEED_NUM_10G;
        eth_dev->data->dev_link.link_duplex = ETH_LINK_FULL_DUPLEX;
@@ -625,8 +617,8 @@ virtual_ethdev_create(const char *name, struct ether_addr *mac_addr,
        dev_private->dev_ops = virtual_ethdev_default_dev_ops;
        eth_dev->dev_ops = &dev_private->dev_ops;
 
-       eth_dev->pci_dev = pci_dev;
-       eth_dev->pci_dev->device.driver = &eth_drv->pci_drv.driver;
+       pci_dev->device.driver = &pci_drv->driver;
+       eth_dev->device = &pci_dev->device;
 
        eth_dev->rx_pkt_burst = virtual_ethdev_rx_burst_success;
        eth_dev->tx_pkt_burst = virtual_ethdev_tx_burst_success;
@@ -636,7 +628,6 @@ virtual_ethdev_create(const char *name, struct ether_addr *mac_addr,
 err:
        rte_free(pci_dev);
        rte_free(pci_drv);
-       rte_free(eth_drv);
        rte_free(id_table);
        rte_free(dev_private);