[dpdk-dev,v2] vhost: Fix wrong handling of virtqueue array index

Message ID 1446001179-27443-1-git-send-email-mukawa@igel.co.jp (mailing list archive)
State Changes Requested, archived
Headers

Commit Message

Tetsuya Mukawa Oct. 28, 2015, 2:59 a.m. UTC
  The patch fixes wrong handling of virtqueue array index when
GET_VRING_BASE message comes.
---
 lib/librte_vhost/vhost_user/virtio-net-user.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
  

Comments

Huawei Xie Oct. 28, 2015, 3:35 a.m. UTC | #1
Missed signoff?
On 10/28/2015 11:00 AM, Tetsuya Mukawa wrote:
> The patch fixes wrong handling of virtqueue array index when
> GET_VRING_BASE message comes.
> ---
>  lib/librte_vhost/vhost_user/virtio-net-user.c | 10 +++-------
>  1 file changed, 3 insertions(+), 7 deletions(-)
>
>
  
Tetsuya Mukawa Oct. 28, 2015, 3:45 a.m. UTC | #2
On 2015/10/28 12:35, Xie, Huawei wrote:
> Missed signoff?
> On 10/28/2015 11:00 AM, Tetsuya Mukawa wrote:
>> The patch fixes wrong handling of virtqueue array index when
>> GET_VRING_BASE message comes.
>> ---
>>  lib/librte_vhost/vhost_user/virtio-net-user.c | 10 +++-------
>>  1 file changed, 3 insertions(+), 7 deletions(-)
>>
>>
Oops, I forgot it.
  

Patch

diff --git a/lib/librte_vhost/vhost_user/virtio-net-user.c b/lib/librte_vhost/vhost_user/virtio-net-user.c
index a998ad8..d07452a 100644
--- a/lib/librte_vhost/vhost_user/virtio-net-user.c
+++ b/lib/librte_vhost/vhost_user/virtio-net-user.c
@@ -300,13 +300,9 @@  user_get_vring_base(struct vhost_device_ctx ctx,
 	 * sent and only sent in vhost_vring_stop.
 	 * TODO: cleanup the vring, it isn't usable since here.
 	 */
-	if (dev->virtqueue[state->index + VIRTIO_RXQ]->kickfd >= 0) {
-		close(dev->virtqueue[state->index + VIRTIO_RXQ]->kickfd);
-		dev->virtqueue[state->index + VIRTIO_RXQ]->kickfd = -1;
-	}
-	if (dev->virtqueue[state->index + VIRTIO_TXQ]->kickfd >= 0) {
-		close(dev->virtqueue[state->index + VIRTIO_TXQ]->kickfd);
-		dev->virtqueue[state->index + VIRTIO_TXQ]->kickfd = -1;
+	if (dev->virtqueue[state->index]->kickfd >= 0) {
+		close(dev->virtqueue[state->index]->kickfd);
+		dev->virtqueue[state->index]->kickfd = -1;
 	}
 
 	return 0;