The doc of this field points out that last_index is the last vq index.
Since last_index can cause confusion if seen out of context, renaming
to last_vq_index, aligning with vq_index.

Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
 include/hw/virtio/vhost.h | 2 +-
 hw/net/vhost_net.c        | 4 ++--
 hw/virtio/vhost-vdpa.c    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h
index 3fa0b554ef..8a79833b54 100644
--- a/include/hw/virtio/vhost.h
+++ b/include/hw/virtio/vhost.h
@@ -75,7 +75,7 @@ struct vhost_dev {
     /* the first virtqueue which would be used by this vhost dev */
     int vq_index;
     /* the last vq index for the virtio device (not vhost) */
-    int last_index;
+    int last_vq_index;
     /* if non-zero, minimum required value for max_queues */
     int num_queues;
     uint64_t features;
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index 0d888f29a6..081946dc93 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -232,10 +232,10 @@ fail:
 }
 
 static void vhost_net_set_vq_index(struct vhost_net *net, int vq_index,
-                                   int last_index)
+                                   int last_vq_index)
 {
     net->dev.vq_index = vq_index;
-    net->dev.last_index = last_index;
+    net->dev.last_vq_index = last_vq_index;
 }
 
 static int vhost_net_start_one(struct vhost_net *net,
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index 12661fd5b1..a1831b27ca 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -632,7 +632,7 @@ static int vhost_vdpa_dev_start(struct vhost_dev *dev, bool started)
         vhost_vdpa_host_notifiers_uninit(dev, dev->nvqs);
     }
 
-    if (dev->vq_index + dev->nvqs != dev->last_index) {
+    if (dev->vq_index + dev->nvqs != dev->last_vq_index) {
         return 0;
     }
 
-- 
2.27.0

On Wed, Nov 3, 2021 at 6:01 PM Eugenio Pérez <eperezma@redhat.com> wrote:
>
> The doc of this field points out that last_index is the last vq index.
> Since last_index can cause confusion if seen out of context, renaming
> to last_vq_index, aligning with vq_index.
>
> Signed-off-by: Eugenio Pérez <eperezma@redhat.com>

Acked-by: Jason Wang <jasowang@redhat.com>

> ---
>  include/hw/virtio/vhost.h | 2 +-
>  hw/net/vhost_net.c        | 4 ++--
>  hw/virtio/vhost-vdpa.c    | 2 +-
>  3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h
> index 3fa0b554ef..8a79833b54 100644
> --- a/include/hw/virtio/vhost.h
> +++ b/include/hw/virtio/vhost.h
> @@ -75,7 +75,7 @@ struct vhost_dev {
>      /* the first virtqueue which would be used by this vhost dev */
>      int vq_index;
>      /* the last vq index for the virtio device (not vhost) */
> -    int last_index;
> +    int last_vq_index;
>      /* if non-zero, minimum required value for max_queues */
>      int num_queues;
>      uint64_t features;
> diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
> index 0d888f29a6..081946dc93 100644
> --- a/hw/net/vhost_net.c
> +++ b/hw/net/vhost_net.c
> @@ -232,10 +232,10 @@ fail:
>  }
>
>  static void vhost_net_set_vq_index(struct vhost_net *net, int vq_index,
> -                                   int last_index)
> +                                   int last_vq_index)
>  {
>      net->dev.vq_index = vq_index;
> -    net->dev.last_index = last_index;
> +    net->dev.last_vq_index = last_vq_index;
>  }
>
>  static int vhost_net_start_one(struct vhost_net *net,
> diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
> index 12661fd5b1..a1831b27ca 100644
> --- a/hw/virtio/vhost-vdpa.c
> +++ b/hw/virtio/vhost-vdpa.c
> @@ -632,7 +632,7 @@ static int vhost_vdpa_dev_start(struct vhost_dev *dev, bool started)
>          vhost_vdpa_host_notifiers_uninit(dev, dev->nvqs);
>      }
>
> -    if (dev->vq_index + dev->nvqs != dev->last_index) {
> +    if (dev->vq_index + dev->nvqs != dev->last_vq_index) {
>          return 0;
>      }
>
> --
> 2.27.0
>

Eugenio Pérez <eperezma@redhat.com> wrote:
> The doc of this field points out that last_index is the last vq index.
> Since last_index can cause confusion if seen out of context, renaming
> to last_vq_index, aligning with vq_index.
>
> Signed-off-by: Eugenio Pérez <eperezma@redhat.com>

Reviewed-by: Juan Quintela <quintela@redhat.com>