git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
tile: fix build
[dpdk.git] / app / test / virtual_pmd.c
diff --git a/app/test/virtual_pmd.c b/app/test/virtual_pmd.c
index 39ecf80..6e4dcd8 100644 (file)
--- a/app/test/virtual_pmd.c
+++ b/app/test/virtual_pmd.c
@@ -45,6 +45,7 @@
 static const char *virtual_ethdev_driver_name = "Virtual PMD";
 
 struct virtual_ethdev_private {
+       struct eth_dev_ops dev_ops;
        struct rte_eth_stats eth_stats;
 
        struct rte_ring *rx_queue;
@@ -78,7 +79,7 @@ static void  virtual_ethdev_stop(struct rte_eth_dev *eth_dev __rte_unused)
        void *pkt = NULL;
        struct virtual_ethdev_private *prv = eth_dev->data->dev_private;
 
-       eth_dev->data->dev_link.link_status = 0;
+       eth_dev->data->dev_link.link_status = ETH_LINK_DOWN;
        eth_dev->data->dev_started = 0;
        while (rte_ring_dequeue(prv->rx_queue, &pkt) != -ENOENT)
                rte_pktmbuf_free(pkt);
@@ -116,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
@@ -198,7 +198,7 @@ virtual_ethdev_link_update_success(struct rte_eth_dev *bonded_eth_dev,
                int wait_to_complete __rte_unused)
 {
        if (!bonded_eth_dev->data->dev_started)
-               bonded_eth_dev->data->dev_link.link_status = 0;
+               bonded_eth_dev->data->dev_link.link_status = ETH_LINK_DOWN;
 
        return 0;
 }
@@ -241,82 +241,88 @@ virtual_ethdev_promiscuous_mode_disable(struct rte_eth_dev *dev __rte_unused)
 {}
 
 
-static struct eth_dev_ops virtual_ethdev_default_dev_ops = {
-               .dev_configure = virtual_ethdev_configure_success,
-               .dev_start = virtual_ethdev_start_success,
-               .dev_stop = virtual_ethdev_stop,
-               .dev_close = virtual_ethdev_close,
-               .dev_infos_get = virtual_ethdev_info_get,
-               .rx_queue_setup = virtual_ethdev_rx_queue_setup_success,
-               .tx_queue_setup = virtual_ethdev_tx_queue_setup_success,
-               .rx_queue_release = virtual_ethdev_rx_queue_release,
-               .tx_queue_release = virtual_ethdev_tx_queue_release,
-               .link_update = virtual_ethdev_link_update_success,
-               .stats_get = virtual_ethdev_stats_get,
-               .stats_reset = virtual_ethdev_stats_reset,
-               .promiscuous_enable = virtual_ethdev_promiscuous_mode_enable,
-               .promiscuous_disable = virtual_ethdev_promiscuous_mode_disable
+static const struct eth_dev_ops virtual_ethdev_default_dev_ops = {
+       .dev_configure = virtual_ethdev_configure_success,
+       .dev_start = virtual_ethdev_start_success,
+       .dev_stop = virtual_ethdev_stop,
+       .dev_close = virtual_ethdev_close,
+       .dev_infos_get = virtual_ethdev_info_get,
+       .rx_queue_setup = virtual_ethdev_rx_queue_setup_success,
+       .tx_queue_setup = virtual_ethdev_tx_queue_setup_success,
+       .rx_queue_release = virtual_ethdev_rx_queue_release,
+       .tx_queue_release = virtual_ethdev_tx_queue_release,
+       .link_update = virtual_ethdev_link_update_success,
+       .stats_get = virtual_ethdev_stats_get,
+       .stats_reset = virtual_ethdev_stats_reset,
+       .promiscuous_enable = virtual_ethdev_promiscuous_mode_enable,
+       .promiscuous_disable = virtual_ethdev_promiscuous_mode_disable
 };
 
 
 void
 virtual_ethdev_start_fn_set_success(uint8_t port_id, uint8_t success)
 {
-       struct rte_eth_dev *vrtl_eth_dev = &rte_eth_devices[port_id];
+       struct rte_eth_dev *dev = &rte_eth_devices[port_id];
+       struct virtual_ethdev_private *dev_private = dev->data->dev_private;
+       struct eth_dev_ops *dev_ops = &dev_private->dev_ops;
 
        if (success)
-               vrtl_eth_dev->dev_ops->dev_start = virtual_ethdev_start_success;
+               dev_ops->dev_start = virtual_ethdev_start_success;
        else
-               vrtl_eth_dev->dev_ops->dev_start = virtual_ethdev_start_fail;
+               dev_ops->dev_start = virtual_ethdev_start_fail;
 
 }
 
 void
 virtual_ethdev_configure_fn_set_success(uint8_t port_id, uint8_t success)
 {
-       struct rte_eth_dev *vrtl_eth_dev = &rte_eth_devices[port_id];
+       struct rte_eth_dev *dev = &rte_eth_devices[port_id];
+       struct virtual_ethdev_private *dev_private = dev->data->dev_private;
+       struct eth_dev_ops *dev_ops = &dev_private->dev_ops;
 
        if (success)
-               vrtl_eth_dev->dev_ops->dev_configure = virtual_ethdev_configure_success;
+               dev_ops->dev_configure = virtual_ethdev_configure_success;
        else
-               vrtl_eth_dev->dev_ops->dev_configure = virtual_ethdev_configure_fail;
+               dev_ops->dev_configure = virtual_ethdev_configure_fail;
 }
 
 void
 virtual_ethdev_rx_queue_setup_fn_set_success(uint8_t port_id, uint8_t success)
 {
-       struct rte_eth_dev *vrtl_eth_dev = &rte_eth_devices[port_id];
+       struct rte_eth_dev *dev = &rte_eth_devices[port_id];
+       struct virtual_ethdev_private *dev_private = dev->data->dev_private;
+       struct eth_dev_ops *dev_ops = &dev_private->dev_ops;
 
        if (success)
-               vrtl_eth_dev->dev_ops->rx_queue_setup =
-                               virtual_ethdev_rx_queue_setup_success;
+               dev_ops->rx_queue_setup = virtual_ethdev_rx_queue_setup_success;
        else
-               vrtl_eth_dev->dev_ops->rx_queue_setup =
-                               virtual_ethdev_rx_queue_setup_fail;
+               dev_ops->rx_queue_setup = virtual_ethdev_rx_queue_setup_fail;
 }
 
 void
 virtual_ethdev_tx_queue_setup_fn_set_success(uint8_t port_id, uint8_t success)
 {
-       struct rte_eth_dev *vrtl_eth_dev = &rte_eth_devices[port_id];
+       struct rte_eth_dev *dev = &rte_eth_devices[port_id];
+       struct virtual_ethdev_private *dev_private = dev->data->dev_private;
+       struct eth_dev_ops *dev_ops = &dev_private->dev_ops;
 
        if (success)
-               vrtl_eth_dev->dev_ops->tx_queue_setup =
-                               virtual_ethdev_tx_queue_setup_success;
+               dev_ops->tx_queue_setup = virtual_ethdev_tx_queue_setup_success;
        else
-               vrtl_eth_dev->dev_ops->tx_queue_setup =
-                               virtual_ethdev_tx_queue_setup_fail;
+               dev_ops->tx_queue_setup = virtual_ethdev_tx_queue_setup_fail;
 }
 
 void
 virtual_ethdev_link_update_fn_set_success(uint8_t port_id, uint8_t success)
 {
-       struct rte_eth_dev *vrtl_eth_dev = &rte_eth_devices[port_id];
+       struct rte_eth_dev *dev = &rte_eth_devices[port_id];
+       struct virtual_ethdev_private *dev_private = dev->data->dev_private;
+       struct eth_dev_ops *dev_ops = &dev_private->dev_ops;
 
        if (success)
-               vrtl_eth_dev->dev_ops->link_update = virtual_ethdev_link_update_success;
+               dev_ops->link_update = virtual_ethdev_link_update_success;
        else
-               vrtl_eth_dev->dev_ops->link_update = virtual_ethdev_link_update_fail;
+               dev_ops->link_update = virtual_ethdev_link_update_fail;
 }
 
 
@@ -478,7 +484,7 @@ virtual_ethdev_simulate_link_status_interrupt(uint8_t port_id,
 
        vrtl_eth_dev->data->dev_link.link_status = link_status;
 
-       _rte_eth_dev_callback_process(vrtl_eth_dev, RTE_ETH_EVENT_INTR_LSC);
+       _rte_eth_dev_callback_process(vrtl_eth_dev, RTE_ETH_EVENT_INTR_LSC, NULL);
 }
 
 int
@@ -528,7 +534,6 @@ virtual_ethdev_create(const char *name, struct ether_addr *mac_addr,
        struct rte_eth_dev *eth_dev = NULL;
        struct eth_driver *eth_drv = NULL;
        struct rte_pci_driver *pci_drv = NULL;
-       struct eth_dev_ops *dev_ops = NULL;
        struct rte_pci_id *id_table = NULL;
        struct virtual_ethdev_private *dev_private = NULL;
        char name_buf[RTE_RING_NAMESIZE];
@@ -553,13 +558,10 @@ virtual_ethdev_create(const char *name, struct ether_addr *mac_addr,
        if (pci_drv == NULL)
                goto err;
 
-       dev_ops = rte_zmalloc_socket(name, sizeof(*dev_ops), 0, socket_id);
-       if (dev_ops == NULL)
-               goto err;
-
        id_table = rte_zmalloc_socket(name, sizeof(*id_table), 0, socket_id);
        if (id_table == NULL)
                goto err;
+       id_table->device_id = 0xBEEF;
 
        dev_private = rte_zmalloc_socket(name, sizeof(*dev_private), 0, socket_id);
        if (dev_private == NULL)
@@ -578,12 +580,12 @@ virtual_ethdev_create(const char *name, struct ether_addr *mac_addr,
                goto err;
 
        /* reserve an ethdev entry */
-       eth_dev = rte_eth_dev_allocate(name, RTE_ETH_DEV_PCI);
+       eth_dev = rte_eth_dev_allocate(name);
        if (eth_dev == NULL)
                goto err;
 
-       pci_dev->numa_node = socket_id;
-       pci_drv->name = virtual_ethdev_driver_name;
+       pci_dev->device.numa_node = socket_id;
+       pci_drv->driver.name = virtual_ethdev_driver_name;
        pci_drv->id_table = id_table;
 
        if (isr_support)
@@ -598,10 +600,8 @@ virtual_ethdev_create(const char *name, struct ether_addr *mac_addr,
        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 = 0;
-       eth_dev->data->dev_link.link_speed = ETH_LINK_SPEED_10000;
+       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;
 
        eth_dev->data->mac_addrs = rte_zmalloc(name, ETHER_ADDR_LEN, 0);
@@ -618,16 +618,12 @@ virtual_ethdev_create(const char *name, struct ether_addr *mac_addr,
 
        eth_dev->data->dev_private = dev_private;
 
-       eth_dev->dev_ops = dev_ops;
-
        /* Copy default device operation functions */
-       memcpy(eth_dev->dev_ops, &virtual_ethdev_default_dev_ops,
-                       sizeof(*eth_dev->dev_ops));
-
-       eth_dev->pci_dev = pci_dev;
-       eth_dev->pci_dev->driver = &eth_drv->pci_drv;
+       dev_private->dev_ops = virtual_ethdev_default_dev_ops;
+       eth_dev->dev_ops = &dev_private->dev_ops;
 
-       eth_dev->pci_dev->driver->id_table->device_id = 0xBEEF;
+       pci_dev->device.driver = &eth_drv->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;
@@ -635,18 +631,11 @@ virtual_ethdev_create(const char *name, struct ether_addr *mac_addr,
        return eth_dev->data->port_id;
 
 err:
-       if (pci_dev)
-               rte_free(pci_dev);
-       if (pci_drv)
-               rte_free(pci_drv);
-       if (eth_drv)
-               rte_free(eth_drv);
-       if (dev_ops)
-               rte_free(dev_ops);
-       if (id_table)
-               rte_free(id_table);
-       if (dev_private)
-               rte_free(dev_private);
+       rte_free(pci_dev);
+       rte_free(pci_drv);
+       rte_free(eth_drv);
+       rte_free(id_table);
+       rte_free(dev_private);
 
        return -1;
 }
DPDK repo used for reviews