virtio: small cleanups

Some minor cleanups.
  * pass constant to virtio_dev_queue_setup
  * fix message on rx_queue_setup
  * get rid of extra double spaces

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Changchun Ouyang <changchun.ouyang@intel.com>
This commit is contained in:
Stephen Hemminger 2015-07-20 11:40:46 -07:00 committed by Thomas Monjalon
parent 945884f14b
commit 27b31d130e
3 changed files with 5 additions and 6 deletions

View File

@ -254,7 +254,7 @@ virtio_dev_queue_release(struct virtqueue *vq) {
int virtio_dev_queue_setup(struct rte_eth_dev *dev,
int queue_type,
uint16_t queue_idx,
uint16_t vtpci_queue_idx,
uint16_t vtpci_queue_idx,
uint16_t nb_desc,
unsigned int socket_id,
struct virtqueue **pvq)
@ -264,7 +264,7 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev,
uint16_t vq_size;
int size;
struct virtio_hw *hw = dev->data->dev_private;
struct virtqueue *vq = NULL;
struct virtqueue *vq = NULL;
/* Write the virtqueue index to the Queue Select Field */
VIRTIO_WRITE_REG_2(hw, VIRTIO_PCI_QUEUE_SEL, vtpci_queue_idx);
@ -413,13 +413,12 @@ virtio_dev_cq_queue_setup(struct rte_eth_dev *dev, uint16_t vtpci_queue_idx,
uint32_t socket_id)
{
struct virtqueue *vq;
uint16_t nb_desc = 0;
int ret;
struct virtio_hw *hw = dev->data->dev_private;
PMD_INIT_FUNC_TRACE();
ret = virtio_dev_queue_setup(dev, VTNET_CQ, VTNET_SQ_CQ_QUEUE_IDX,
vtpci_queue_idx, nb_desc, socket_id, &vq);
vtpci_queue_idx, 0, socket_id, &vq);
if (ret < 0) {
PMD_INIT_LOG(ERR, "control vq initialization failed");
return ret;

View File

@ -79,7 +79,7 @@ void virtio_dev_rxtx_start(struct rte_eth_dev *dev);
int virtio_dev_queue_setup(struct rte_eth_dev *dev,
int queue_type,
uint16_t queue_idx,
uint16_t vtpci_queue_idx,
uint16_t vtpci_queue_idx,
uint16_t nb_desc,
unsigned int socket_id,
struct virtqueue **pvq);

View File

@ -390,7 +390,7 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev,
ret = virtio_dev_queue_setup(dev, VTNET_RQ, queue_idx, vtpci_queue_idx,
nb_desc, socket_id, &vq);
if (ret < 0) {
PMD_INIT_LOG(ERR, "tvq initialization failed");
PMD_INIT_LOG(ERR, "rvq initialization failed");
return ret;
}