diff options
| author | Eugenio Pérez <eperezma@redhat.com> | 2021-11-04 09:56:24 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2021-11-11 03:13:05 -0500 |
| commit | 245cf2c24eb0d5a4fe75151e1794aa5cd53b130d (patch) | |
| tree | ea4a73d3b5fff36ab56f167309941663fe095aa0 | |
| parent | b66cecb238d065628b85a18357d28d21618a4580 (diff) | |
| download | focaccia-qemu-245cf2c24eb0d5a4fe75151e1794aa5cd53b130d.tar.gz focaccia-qemu-245cf2c24eb0d5a4fe75151e1794aa5cd53b130d.zip | |
vhost: Rename last_index to vq_index_end
The doc of this field pointed out that last_index is the last vq index. This is misleading, since it's actually one past the end of the vqs. Renaming and modifying comment. Signed-off-by: Eugenio Pérez <eperezma@redhat.com> Acked-by: Jason Wang <jasowang@redhat.com> Message-Id: <20211104085625.2054959-2-eperezma@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | hw/net/vhost_net.c | 4 | ||||
| -rw-r--r-- | hw/virtio/vhost-vdpa.c | 2 | ||||
| -rw-r--r-- | include/hw/virtio/vhost.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index 0d888f29a6..29f2c4212f 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 vq_index_end) { net->dev.vq_index = vq_index; - net->dev.last_index = last_index; + net->dev.vq_index_end = vq_index_end; } 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 0d8051426c..bcaf00e09f 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -645,7 +645,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->vq_index_end) { return 0; } diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h index 3fa0b554ef..58a73e7b7a 100644 --- a/include/hw/virtio/vhost.h +++ b/include/hw/virtio/vhost.h @@ -74,8 +74,8 @@ struct vhost_dev { unsigned int nvqs; /* 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; + /* one past the last vq index for the virtio device (not vhost) */ + int vq_index_end; /* if non-zero, minimum required value for max_queues */ int num_queues; uint64_t features; |