#include <rte_ether.h>
#include <rte_ethdev.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
#include <rte_lcore.h>
#include <rte_memory.h>
#include <rte_bus_vmbus.h>
return port;
}
- PMD_DRV_LOG(NOTICE, "found matching VF port %d\n", port);
+ PMD_DRV_LOG(NOTICE, "found matching VF port %d", port);
ret = rte_eth_dev_owner_get(port, &owner);
if (ret < 0) {
PMD_DRV_LOG(ERR, "Can not find owner for port %d", port);
/* Tell VSP to switch data path to synthentic */
hn_vf_remove(hv);
- PMD_DRV_LOG(NOTICE, "Start to remove port %d\n", port_id);
+ PMD_DRV_LOG(NOTICE, "Start to remove port %d", port_id);
rte_rwlock_write_lock(&hv->vf_lock);
/* Give back ownership */
ret = rte_eth_dev_owner_unset(port_id, hv->owner.id);
if (ret)
- PMD_DRV_LOG(ERR, "rte_eth_dev_owner_unset failed ret=%d\n",
+ PMD_DRV_LOG(ERR, "rte_eth_dev_owner_unset failed ret=%d",
ret);
hv->vf_ctx.vf_attached = false;
hn_eth_rmv_event_callback, hv);
if (ret)
PMD_DRV_LOG(ERR,
- "rte_eth_dev_callback_unregister failed ret=%d\n",
+ "rte_eth_dev_callback_unregister failed ret=%d",
ret);
/* Detach and release port_id from system */
ret = rte_eth_dev_stop(port_id);
if (ret)
- PMD_DRV_LOG(ERR, "rte_eth_dev_stop failed port_id=%u ret=%d\n",
+ PMD_DRV_LOG(ERR, "rte_eth_dev_stop failed port_id=%u ret=%d",
port_id, ret);
ret = rte_eth_dev_close(port_id);
if (ret)
- PMD_DRV_LOG(ERR, "rte_eth_dev_close failed port_id=%u ret=%d\n",
+ PMD_DRV_LOG(ERR, "rte_eth_dev_close failed port_id=%u ret=%d",
port_id, ret);
ret = rte_dev_remove(dev);
{
struct hn_data *hv = cb_arg;
- PMD_DRV_LOG(NOTICE, "Removing VF portid %d\n", port_id);
+ PMD_DRV_LOG(NOTICE, "Removing VF portid %d", port_id);
rte_eal_alarm_set(1, hn_remove_delayed, hv);
return 0;
ret = rte_eth_tx_queue_info_get(dev->data->port_id, i, &txinfo);
if (ret) {
PMD_DRV_LOG(ERR,
- "rte_eth_tx_queue_info_get failed ret=%d\n",
+ "rte_eth_tx_queue_info_get failed ret=%d",
ret);
return ret;
}
&txinfo.conf);
if (ret) {
PMD_DRV_LOG(ERR,
- "rte_eth_tx_queue_setup failed ret=%d\n",
+ "rte_eth_tx_queue_setup failed ret=%d",
ret);
return ret;
}
ret = rte_eth_rx_queue_info_get(dev->data->port_id, i, &rxinfo);
if (ret) {
PMD_DRV_LOG(ERR,
- "rte_eth_rx_queue_info_get failed ret=%d\n",
+ "rte_eth_rx_queue_info_get failed ret=%d",
ret);
return ret;
}
&rxinfo.conf, rx_queue->mb_pool);
if (ret) {
PMD_DRV_LOG(ERR,
- "rte_eth_rx_queue_setup failed ret=%d\n",
+ "rte_eth_rx_queue_setup failed ret=%d",
ret);
return ret;
}
goto exit;
}
- PMD_DRV_LOG(NOTICE, "configuring VF port %d\n", port);
+ PMD_DRV_LOG(NOTICE, "configuring VF port %d", port);
ret = hn_vf_configure(dev, &dev->data->dev_conf);
if (ret) {
- PMD_DRV_LOG(ERR, "Failed to configure VF port %d\n",
+ PMD_DRV_LOG(ERR, "Failed to configure VF port %d",
port);
goto exit;
}
ret = hn_setup_vf_queues(port, dev);
if (ret) {
PMD_DRV_LOG(ERR,
- "Failed to configure VF queues port %d\n",
+ "Failed to configure VF queues port %d",
port);
goto exit;
}
- PMD_DRV_LOG(NOTICE, "Starting VF port %d\n", port);
+ PMD_DRV_LOG(NOTICE, "Starting VF port %d", port);
ret = rte_eth_dev_start(port);
if (ret) {
- PMD_DRV_LOG(ERR, "rte_eth_dev_start failed ret=%d\n",
+ PMD_DRV_LOG(ERR, "rte_eth_dev_start failed ret=%d",
ret);
goto exit;
}
hv);
if (ret) {
PMD_DRV_LOG(ERR,
- "Registering callback failed for "
- "vf port %d ret %d\n",
+ "Registering callback failed for vf port %d ret %d",
hv->vf_ctx.vf_port, ret);
return ret;
}
rte_rwlock_read_lock(&hv->vf_lock);
vf_dev = hn_get_vf_dev(hv);
- if (vf_dev && vf_dev->dev_ops->tx_queue_release) {
- void *subq = vf_dev->data->tx_queues[queue_id];
-
- (*vf_dev->dev_ops->tx_queue_release)(subq);
- }
+ if (vf_dev && vf_dev->dev_ops->tx_queue_release)
+ (*vf_dev->dev_ops->tx_queue_release)(vf_dev, queue_id);
rte_rwlock_read_unlock(&hv->vf_lock);
}
rte_rwlock_read_lock(&hv->vf_lock);
vf_dev = hn_get_vf_dev(hv);
- if (vf_dev && vf_dev->dev_ops->rx_queue_release) {
- void *subq = vf_dev->data->rx_queues[queue_id];
-
- (*vf_dev->dev_ops->rx_queue_release)(subq);
- }
+ if (vf_dev && vf_dev->dev_ops->rx_queue_release)
+ (*vf_dev->dev_ops->rx_queue_release)(vf_dev, queue_id);
rte_rwlock_read_unlock(&hv->vf_lock);
}