From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stephen@networkplumber.org>
Received: from mail-pa0-f44.google.com (mail-pa0-f44.google.com
[209.85.220.44]) by dpdk.org (Postfix) with ESMTP id 78FEDCE7
for <dev@dpdk.org>; Mon, 20 Jul 2015 20:40:39 +0200 (CEST)
Received: by pabkd10 with SMTP id kd10so33165850pab.2
for <dev@dpdk.org>; Mon, 20 Jul 2015 11:40:39 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20130820;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references;
bh=1qUmWqG5lEeOPbKBeRAkzBU8ZaFjY1nq/I8Up7s06F4=;
b=H2llJ49v1eyfeWB4n78m7d3gYDe9GvUbEB9Z0rCxHYJHeuT6ml1MHlU5ebBlNEw7Yg
nWCj8fJE8p7e7YqCyN4NGLeOk0WkCUeGZ0OWwzemG7ee14yiTMaQClXjb1MLOPmcL6Au
Ih3wr3rk1wcj8IUfHCzlQ+kYh8pk+Lb+mY2o52ggwSyKraTT/3YbxxpO9ZwrwU7nyKs5
lqes9+YaiTft+XkydArhqbMj0vG19WW01tN8KTxyeanGHpwMhWa5WbbTcyHoFPU+SjPQ
z8lersdLr5zdauxbr+W/r2nw4r+N6pZfNGB8VhXFxf3b3qtQ6FoVqWRHlPgrlXjvHqHH
PoSw==
X-Gm-Message-State: ALoCoQkIPq0gIIg0KEM5gPZZjkOiWqsA+RkLkWlMtMmRVL4rSLbatemedx3OhpwiVqKHqbgsgHGB
X-Received: by 10.70.119.41 with SMTP id kr9mr17193968pdb.0.1437417638899;
Mon, 20 Jul 2015 11:40:38 -0700 (PDT)
Received: from urahara.home.lan (static-50-53-82-155.bvtn.or.frontiernet.net.
[50.53.82.155])
by smtp.gmail.com with ESMTPSA id j4sm23105650pdg.64.2015.07.20.11.40.37
(version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
Mon, 20 Jul 2015 11:40:37 -0700 (PDT)
From: Stephen Hemminger <stephen@networkplumber.org>
To: changchun.ouyang@intel.com
Date: Mon, 20 Jul 2015 11:40:46 -0700
Message-Id: <1437417646-11221-3-git-send-email-stephen@networkplumber.org>
X-Mailer: git-send-email 2.1.4
In-Reply-To: <1437417646-11221-1-git-send-email-stephen@networkplumber.org>
References: <1437417646-11221-1-git-send-email-stephen@networkplumber.org>
Cc: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v2 2/2] virtio: small cleanups
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<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>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Jul 2015 18:40:40 -0000
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>
---
drivers/net/virtio/virtio_ethdev.c | 7 +++----
drivers/net/virtio/virtio_ethdev.h | 2 +-
drivers/net/virtio/virtio_rxtx.c | 2 +-
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index d460d89..465d3cd 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -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;
diff --git a/drivers/net/virtio/virtio_ethdev.h b/drivers/net/virtio/virtio_ethdev.h
index 3858b00..9026d42 100644
--- a/drivers/net/virtio/virtio_ethdev.h
+++ b/drivers/net/virtio/virtio_ethdev.h
@@ -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);
diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index 5388caa..c5b53bb 100644
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -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;
}
--
2.1.4