* [PATCH 1/3] vhost: remove the dead branch
@ 2013-11-18 3:19 Zhi Yong Wu
2013-11-18 3:19 ` [PATCH 2/3] vhost: adjust vhost_dev_init() to be void Zhi Yong Wu
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Zhi Yong Wu @ 2013-11-18 3:19 UTC (permalink / raw)
To: netdev; +Cc: mst, rusty, Zhi Yong Wu
From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Since vhost_dev_init() forever return 0, some branches are never run,
therefore need to be removed.
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
drivers/vhost/net.c | 5 -----
drivers/vhost/scsi.c | 5 -----
drivers/vhost/test.c | 5 -----
3 files changed, 0 insertions(+), 15 deletions(-)
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 831eb4f..0554785 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -707,11 +707,6 @@ static int vhost_net_open(struct inode *inode, struct file *f)
n->vqs[i].sock_hlen = 0;
}
r = vhost_dev_init(dev, vqs, VHOST_NET_VQ_MAX);
- if (r < 0) {
- kfree(n);
- kfree(vqs);
- return r;
- }
vhost_poll_init(n->poll + VHOST_NET_VQ_TX, handle_tx_net, POLLOUT, dev);
vhost_poll_init(n->poll + VHOST_NET_VQ_RX, handle_rx_net, POLLIN, dev);
diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
index e663921..9d5e18d 100644
--- a/drivers/vhost/scsi.c
+++ b/drivers/vhost/scsi.c
@@ -1421,14 +1421,9 @@ static int vhost_scsi_open(struct inode *inode, struct file *f)
tcm_vhost_init_inflight(vs, NULL);
- if (r < 0)
- goto err_init;
-
f->private_data = vs;
return 0;
-err_init:
- kfree(vqs);
err_vqs:
vhost_scsi_free(vs);
err_vs:
diff --git a/drivers/vhost/test.c b/drivers/vhost/test.c
index 339eae8..99cb960 100644
--- a/drivers/vhost/test.c
+++ b/drivers/vhost/test.c
@@ -118,11 +118,6 @@ static int vhost_test_open(struct inode *inode, struct file *f)
vqs[VHOST_TEST_VQ] = &n->vqs[VHOST_TEST_VQ];
n->vqs[VHOST_TEST_VQ].handle_kick = handle_vq_kick;
r = vhost_dev_init(dev, vqs, VHOST_TEST_VQ_MAX);
- if (r < 0) {
- kfree(vqs);
- kfree(n);
- return r;
- }
f->private_data = n;
--
1.7.6.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/3] vhost: adjust vhost_dev_init() to be void
2013-11-18 3:19 [PATCH 1/3] vhost: remove the dead branch Zhi Yong Wu
@ 2013-11-18 3:19 ` Zhi Yong Wu
2013-11-18 10:16 ` Michael S. Tsirkin
2013-11-18 3:19 ` [PATCH 3/3] vhost: fix the wrong log descriptions Zhi Yong Wu
2013-11-18 10:16 ` [PATCH 1/3] vhost: remove the dead branch Michael S. Tsirkin
2 siblings, 1 reply; 7+ messages in thread
From: Zhi Yong Wu @ 2013-11-18 3:19 UTC (permalink / raw)
To: netdev; +Cc: mst, rusty, Zhi Yong Wu
From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
drivers/vhost/net.c | 4 ++--
drivers/vhost/scsi.c | 2 +-
drivers/vhost/test.c | 3 +--
drivers/vhost/vhost.c | 4 +---
drivers/vhost/vhost.h | 2 +-
5 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 0554785..9a68409 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -683,7 +683,7 @@ static int vhost_net_open(struct inode *inode, struct file *f)
struct vhost_net *n = kmalloc(sizeof *n, GFP_KERNEL);
struct vhost_dev *dev;
struct vhost_virtqueue **vqs;
- int r, i;
+ int i;
if (!n)
return -ENOMEM;
@@ -706,7 +706,7 @@ static int vhost_net_open(struct inode *inode, struct file *f)
n->vqs[i].vhost_hlen = 0;
n->vqs[i].sock_hlen = 0;
}
- r = vhost_dev_init(dev, vqs, VHOST_NET_VQ_MAX);
+ vhost_dev_init(dev, vqs, VHOST_NET_VQ_MAX);
vhost_poll_init(n->poll + VHOST_NET_VQ_TX, handle_tx_net, POLLOUT, dev);
vhost_poll_init(n->poll + VHOST_NET_VQ_RX, handle_rx_net, POLLIN, dev);
diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
index 9d5e18d..e02b7df 100644
--- a/drivers/vhost/scsi.c
+++ b/drivers/vhost/scsi.c
@@ -1417,7 +1417,7 @@ static int vhost_scsi_open(struct inode *inode, struct file *f)
vqs[i] = &vs->vqs[i].vq;
vs->vqs[i].vq.handle_kick = vhost_scsi_handle_kick;
}
- r = vhost_dev_init(&vs->dev, vqs, VHOST_SCSI_MAX_VQ);
+ vhost_dev_init(&vs->dev, vqs, VHOST_SCSI_MAX_VQ);
tcm_vhost_init_inflight(vs, NULL);
diff --git a/drivers/vhost/test.c b/drivers/vhost/test.c
index 99cb960..c2a54fb 100644
--- a/drivers/vhost/test.c
+++ b/drivers/vhost/test.c
@@ -104,7 +104,6 @@ static int vhost_test_open(struct inode *inode, struct file *f)
struct vhost_test *n = kmalloc(sizeof *n, GFP_KERNEL);
struct vhost_dev *dev;
struct vhost_virtqueue **vqs;
- int r;
if (!n)
return -ENOMEM;
@@ -117,7 +116,7 @@ static int vhost_test_open(struct inode *inode, struct file *f)
dev = &n->dev;
vqs[VHOST_TEST_VQ] = &n->vqs[VHOST_TEST_VQ];
n->vqs[VHOST_TEST_VQ].handle_kick = handle_vq_kick;
- r = vhost_dev_init(dev, vqs, VHOST_TEST_VQ_MAX);
+ vhost_dev_init(dev, vqs, VHOST_TEST_VQ_MAX);
f->private_data = n;
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index 69068e0..78987e4 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -290,7 +290,7 @@ static void vhost_dev_free_iovecs(struct vhost_dev *dev)
vhost_vq_free_iovecs(dev->vqs[i]);
}
-long vhost_dev_init(struct vhost_dev *dev,
+void vhost_dev_init(struct vhost_dev *dev,
struct vhost_virtqueue **vqs, int nvqs)
{
struct vhost_virtqueue *vq;
@@ -319,8 +319,6 @@ long vhost_dev_init(struct vhost_dev *dev,
vhost_poll_init(&vq->poll, vq->handle_kick,
POLLIN, dev);
}
-
- return 0;
}
EXPORT_SYMBOL_GPL(vhost_dev_init);
diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h
index 4465ed5..35eeb2a 100644
--- a/drivers/vhost/vhost.h
+++ b/drivers/vhost/vhost.h
@@ -127,7 +127,7 @@ struct vhost_dev {
struct task_struct *worker;
};
-long vhost_dev_init(struct vhost_dev *, struct vhost_virtqueue **vqs, int nvqs);
+void vhost_dev_init(struct vhost_dev *, struct vhost_virtqueue **vqs, int nvqs);
long vhost_dev_set_owner(struct vhost_dev *dev);
bool vhost_dev_has_owner(struct vhost_dev *dev);
long vhost_dev_check_owner(struct vhost_dev *);
--
1.7.6.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/3] vhost: fix the wrong log descriptions
2013-11-18 3:19 [PATCH 1/3] vhost: remove the dead branch Zhi Yong Wu
2013-11-18 3:19 ` [PATCH 2/3] vhost: adjust vhost_dev_init() to be void Zhi Yong Wu
@ 2013-11-18 3:19 ` Zhi Yong Wu
2013-11-18 10:18 ` Michael S. Tsirkin
2013-11-18 10:16 ` [PATCH 1/3] vhost: remove the dead branch Michael S. Tsirkin
2 siblings, 1 reply; 7+ messages in thread
From: Zhi Yong Wu @ 2013-11-18 3:19 UTC (permalink / raw)
To: netdev; +Cc: mst, rusty, Zhi Yong Wu
From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
drivers/vhost/vhost.c | 2 +-
drivers/vhost/vringh.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index 78987e4..568d20f 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -1241,7 +1241,7 @@ int vhost_get_vq_desc(struct vhost_dev *dev, struct vhost_virtqueue *vq,
/* If their number is silly, that's an error. */
if (unlikely(head >= vq->num)) {
- vq_err(vq, "Guest says index %u > %u is available",
+ vq_err(vq, "Guest says index %u > %u is unavailable",
head, vq->num);
return -EINVAL;
}
diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
index 5174eba..86ef6c4 100644
--- a/drivers/vhost/vringh.c
+++ b/drivers/vhost/vringh.c
@@ -57,7 +57,7 @@ static inline int __vringh_get_head(const struct vringh *vrh,
}
if (head >= vrh->vring.num) {
- vringh_bad("Guest says index %u > %u is available",
+ vringh_bad("Guest says index %u > %u is unavailable",
head, vrh->vring.num);
return -EINVAL;
}
--
1.7.6.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] vhost: remove the dead branch
2013-11-18 3:19 [PATCH 1/3] vhost: remove the dead branch Zhi Yong Wu
2013-11-18 3:19 ` [PATCH 2/3] vhost: adjust vhost_dev_init() to be void Zhi Yong Wu
2013-11-18 3:19 ` [PATCH 3/3] vhost: fix the wrong log descriptions Zhi Yong Wu
@ 2013-11-18 10:16 ` Michael S. Tsirkin
2 siblings, 0 replies; 7+ messages in thread
From: Michael S. Tsirkin @ 2013-11-18 10:16 UTC (permalink / raw)
To: Zhi Yong Wu; +Cc: netdev, rusty, Zhi Yong Wu
On Mon, Nov 18, 2013 at 11:19:21AM +0800, Zhi Yong Wu wrote:
> From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
>
> Since vhost_dev_init() forever return 0, some branches are never run,
> therefore need to be removed.
>
> Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> drivers/vhost/net.c | 5 -----
> drivers/vhost/scsi.c | 5 -----
> drivers/vhost/test.c | 5 -----
> 3 files changed, 0 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
> index 831eb4f..0554785 100644
> --- a/drivers/vhost/net.c
> +++ b/drivers/vhost/net.c
> @@ -707,11 +707,6 @@ static int vhost_net_open(struct inode *inode, struct file *f)
> n->vqs[i].sock_hlen = 0;
> }
> r = vhost_dev_init(dev, vqs, VHOST_NET_VQ_MAX);
> - if (r < 0) {
> - kfree(n);
> - kfree(vqs);
> - return r;
> - }
>
> vhost_poll_init(n->poll + VHOST_NET_VQ_TX, handle_tx_net, POLLOUT, dev);
> vhost_poll_init(n->poll + VHOST_NET_VQ_RX, handle_rx_net, POLLIN, dev);
> diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
> index e663921..9d5e18d 100644
> --- a/drivers/vhost/scsi.c
> +++ b/drivers/vhost/scsi.c
> @@ -1421,14 +1421,9 @@ static int vhost_scsi_open(struct inode *inode, struct file *f)
>
> tcm_vhost_init_inflight(vs, NULL);
>
> - if (r < 0)
> - goto err_init;
> -
> f->private_data = vs;
> return 0;
>
> -err_init:
> - kfree(vqs);
> err_vqs:
> vhost_scsi_free(vs);
> err_vs:
> diff --git a/drivers/vhost/test.c b/drivers/vhost/test.c
> index 339eae8..99cb960 100644
> --- a/drivers/vhost/test.c
> +++ b/drivers/vhost/test.c
> @@ -118,11 +118,6 @@ static int vhost_test_open(struct inode *inode, struct file *f)
> vqs[VHOST_TEST_VQ] = &n->vqs[VHOST_TEST_VQ];
> n->vqs[VHOST_TEST_VQ].handle_kick = handle_vq_kick;
> r = vhost_dev_init(dev, vqs, VHOST_TEST_VQ_MAX);
> - if (r < 0) {
> - kfree(vqs);
> - kfree(n);
> - return r;
> - }
>
> f->private_data = n;
>
> --
> 1.7.6.5
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/3] vhost: adjust vhost_dev_init() to be void
2013-11-18 3:19 ` [PATCH 2/3] vhost: adjust vhost_dev_init() to be void Zhi Yong Wu
@ 2013-11-18 10:16 ` Michael S. Tsirkin
0 siblings, 0 replies; 7+ messages in thread
From: Michael S. Tsirkin @ 2013-11-18 10:16 UTC (permalink / raw)
To: Zhi Yong Wu; +Cc: netdev, rusty, Zhi Yong Wu
On Mon, Nov 18, 2013 at 11:19:22AM +0800, Zhi Yong Wu wrote:
> From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
>
> Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> drivers/vhost/net.c | 4 ++--
> drivers/vhost/scsi.c | 2 +-
> drivers/vhost/test.c | 3 +--
> drivers/vhost/vhost.c | 4 +---
> drivers/vhost/vhost.h | 2 +-
> 5 files changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
> index 0554785..9a68409 100644
> --- a/drivers/vhost/net.c
> +++ b/drivers/vhost/net.c
> @@ -683,7 +683,7 @@ static int vhost_net_open(struct inode *inode, struct file *f)
> struct vhost_net *n = kmalloc(sizeof *n, GFP_KERNEL);
> struct vhost_dev *dev;
> struct vhost_virtqueue **vqs;
> - int r, i;
> + int i;
>
> if (!n)
> return -ENOMEM;
> @@ -706,7 +706,7 @@ static int vhost_net_open(struct inode *inode, struct file *f)
> n->vqs[i].vhost_hlen = 0;
> n->vqs[i].sock_hlen = 0;
> }
> - r = vhost_dev_init(dev, vqs, VHOST_NET_VQ_MAX);
> + vhost_dev_init(dev, vqs, VHOST_NET_VQ_MAX);
>
> vhost_poll_init(n->poll + VHOST_NET_VQ_TX, handle_tx_net, POLLOUT, dev);
> vhost_poll_init(n->poll + VHOST_NET_VQ_RX, handle_rx_net, POLLIN, dev);
> diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
> index 9d5e18d..e02b7df 100644
> --- a/drivers/vhost/scsi.c
> +++ b/drivers/vhost/scsi.c
> @@ -1417,7 +1417,7 @@ static int vhost_scsi_open(struct inode *inode, struct file *f)
> vqs[i] = &vs->vqs[i].vq;
> vs->vqs[i].vq.handle_kick = vhost_scsi_handle_kick;
> }
> - r = vhost_dev_init(&vs->dev, vqs, VHOST_SCSI_MAX_VQ);
> + vhost_dev_init(&vs->dev, vqs, VHOST_SCSI_MAX_VQ);
>
> tcm_vhost_init_inflight(vs, NULL);
>
> diff --git a/drivers/vhost/test.c b/drivers/vhost/test.c
> index 99cb960..c2a54fb 100644
> --- a/drivers/vhost/test.c
> +++ b/drivers/vhost/test.c
> @@ -104,7 +104,6 @@ static int vhost_test_open(struct inode *inode, struct file *f)
> struct vhost_test *n = kmalloc(sizeof *n, GFP_KERNEL);
> struct vhost_dev *dev;
> struct vhost_virtqueue **vqs;
> - int r;
>
> if (!n)
> return -ENOMEM;
> @@ -117,7 +116,7 @@ static int vhost_test_open(struct inode *inode, struct file *f)
> dev = &n->dev;
> vqs[VHOST_TEST_VQ] = &n->vqs[VHOST_TEST_VQ];
> n->vqs[VHOST_TEST_VQ].handle_kick = handle_vq_kick;
> - r = vhost_dev_init(dev, vqs, VHOST_TEST_VQ_MAX);
> + vhost_dev_init(dev, vqs, VHOST_TEST_VQ_MAX);
>
> f->private_data = n;
>
> diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
> index 69068e0..78987e4 100644
> --- a/drivers/vhost/vhost.c
> +++ b/drivers/vhost/vhost.c
> @@ -290,7 +290,7 @@ static void vhost_dev_free_iovecs(struct vhost_dev *dev)
> vhost_vq_free_iovecs(dev->vqs[i]);
> }
>
> -long vhost_dev_init(struct vhost_dev *dev,
> +void vhost_dev_init(struct vhost_dev *dev,
> struct vhost_virtqueue **vqs, int nvqs)
> {
> struct vhost_virtqueue *vq;
> @@ -319,8 +319,6 @@ long vhost_dev_init(struct vhost_dev *dev,
> vhost_poll_init(&vq->poll, vq->handle_kick,
> POLLIN, dev);
> }
> -
> - return 0;
> }
> EXPORT_SYMBOL_GPL(vhost_dev_init);
>
> diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h
> index 4465ed5..35eeb2a 100644
> --- a/drivers/vhost/vhost.h
> +++ b/drivers/vhost/vhost.h
> @@ -127,7 +127,7 @@ struct vhost_dev {
> struct task_struct *worker;
> };
>
> -long vhost_dev_init(struct vhost_dev *, struct vhost_virtqueue **vqs, int nvqs);
> +void vhost_dev_init(struct vhost_dev *, struct vhost_virtqueue **vqs, int nvqs);
> long vhost_dev_set_owner(struct vhost_dev *dev);
> bool vhost_dev_has_owner(struct vhost_dev *dev);
> long vhost_dev_check_owner(struct vhost_dev *);
> --
> 1.7.6.5
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 3/3] vhost: fix the wrong log descriptions
2013-11-18 3:19 ` [PATCH 3/3] vhost: fix the wrong log descriptions Zhi Yong Wu
@ 2013-11-18 10:18 ` Michael S. Tsirkin
2013-11-18 13:12 ` Zhi Yong Wu
0 siblings, 1 reply; 7+ messages in thread
From: Michael S. Tsirkin @ 2013-11-18 10:18 UTC (permalink / raw)
To: Zhi Yong Wu; +Cc: netdev, rusty, Zhi Yong Wu
On Mon, Nov 18, 2013 at 11:19:23AM +0800, Zhi Yong Wu wrote:
> From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
>
> Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
This one does not make sense to me.
Heads in avail ring are heads which according to Guest are available by
definition.
> ---
> drivers/vhost/vhost.c | 2 +-
> drivers/vhost/vringh.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
> index 78987e4..568d20f 100644
> --- a/drivers/vhost/vhost.c
> +++ b/drivers/vhost/vhost.c
> @@ -1241,7 +1241,7 @@ int vhost_get_vq_desc(struct vhost_dev *dev, struct vhost_virtqueue *vq,
>
> /* If their number is silly, that's an error. */
> if (unlikely(head >= vq->num)) {
> - vq_err(vq, "Guest says index %u > %u is available",
> + vq_err(vq, "Guest says index %u > %u is unavailable",
> head, vq->num);
> return -EINVAL;
> }
> diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
> index 5174eba..86ef6c4 100644
> --- a/drivers/vhost/vringh.c
> +++ b/drivers/vhost/vringh.c
> @@ -57,7 +57,7 @@ static inline int __vringh_get_head(const struct vringh *vrh,
> }
>
> if (head >= vrh->vring.num) {
> - vringh_bad("Guest says index %u > %u is available",
> + vringh_bad("Guest says index %u > %u is unavailable",
> head, vrh->vring.num);
> return -EINVAL;
> }
> --
> 1.7.6.5
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 3/3] vhost: fix the wrong log descriptions
2013-11-18 10:18 ` Michael S. Tsirkin
@ 2013-11-18 13:12 ` Zhi Yong Wu
0 siblings, 0 replies; 7+ messages in thread
From: Zhi Yong Wu @ 2013-11-18 13:12 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: netdev, Rusty Russell, Zhi Yong Wu
On Mon, Nov 18, 2013 at 6:18 PM, Michael S. Tsirkin <mst@redhat.com> wrote:
> On Mon, Nov 18, 2013 at 11:19:23AM +0800, Zhi Yong Wu wrote:
>> From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
>>
>> Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
>
> This one does not make sense to me.
> Heads in avail ring are heads which according to Guest are available by
> definition.
ok, please ignore this patch
>
>
>> ---
>> drivers/vhost/vhost.c | 2 +-
>> drivers/vhost/vringh.c | 2 +-
>> 2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
>> index 78987e4..568d20f 100644
>> --- a/drivers/vhost/vhost.c
>> +++ b/drivers/vhost/vhost.c
>> @@ -1241,7 +1241,7 @@ int vhost_get_vq_desc(struct vhost_dev *dev, struct vhost_virtqueue *vq,
>>
>> /* If their number is silly, that's an error. */
>> if (unlikely(head >= vq->num)) {
>> - vq_err(vq, "Guest says index %u > %u is available",
>> + vq_err(vq, "Guest says index %u > %u is unavailable",
>> head, vq->num);
>> return -EINVAL;
>> }
>> diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
>> index 5174eba..86ef6c4 100644
>> --- a/drivers/vhost/vringh.c
>> +++ b/drivers/vhost/vringh.c
>> @@ -57,7 +57,7 @@ static inline int __vringh_get_head(const struct vringh *vrh,
>> }
>>
>> if (head >= vrh->vring.num) {
>> - vringh_bad("Guest says index %u > %u is available",
>> + vringh_bad("Guest says index %u > %u is unavailable",
>> head, vrh->vring.num);
>> return -EINVAL;
>> }
>> --
>> 1.7.6.5
--
Regards,
Zhi Yong Wu
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-11-18 13:12 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-18 3:19 [PATCH 1/3] vhost: remove the dead branch Zhi Yong Wu
2013-11-18 3:19 ` [PATCH 2/3] vhost: adjust vhost_dev_init() to be void Zhi Yong Wu
2013-11-18 10:16 ` Michael S. Tsirkin
2013-11-18 3:19 ` [PATCH 3/3] vhost: fix the wrong log descriptions Zhi Yong Wu
2013-11-18 10:18 ` Michael S. Tsirkin
2013-11-18 13:12 ` Zhi Yong Wu
2013-11-18 10:16 ` [PATCH 1/3] vhost: remove the dead branch Michael S. Tsirkin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).