vhost-vdpa: prepare for the multiqueue support

jasowang · mstsirkin · commit 353244d8b967 · 2021-10-20T04:44:05.000-04:00
Unlike vhost-kernel, vhost-vdpa adapts a single device multiqueue
model. So we need to simply use virtqueue index as the vhost virtqueue
index. This is a must for multiqueue to work for vhost-vdpa.

Signed-off-by: Jason Wang &lt;jasowang@redhat.com&gt;
Message-Id: &lt;20211020045600.16082-4-jasowang@redhat.com&gt;
Reviewed-by: Michael S. Tsirkin &lt;mst@redhat.com&gt;
Signed-off-by: Michael S. Tsirkin &lt;mst@redhat.com&gt;
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
@@ -546,8 +546,8 @@ static int vhost_vdpa_get_vq_index(struct vhost_dev *dev, int idx)
 {
     assert(idx >= dev->vq_index && idx < dev->vq_index + dev->nvqs);
 
-    trace_vhost_vdpa_get_vq_index(dev, idx, idx - dev->vq_index);
-    return idx - dev->vq_index;
+    trace_vhost_vdpa_get_vq_index(dev, idx, idx);
+    return idx;
 }
 
 static int vhost_vdpa_set_vring_ready(struct vhost_dev *dev)

Original file line number	Diff line number	Diff line change
`@@ -546,8 +546,8 @@ static int vhost_vdpa_get_vq_index(struct vhost_dev *dev, int idx)`
`546`	`546`	`{`
`547`	`547`	`assert(idx >= dev->vq_index && idx < dev->vq_index + dev->nvqs);`
`548`	`548`
`549`		`- trace_vhost_vdpa_get_vq_index(dev, idx, idx - dev->vq_index);`
`550`		`- return idx - dev->vq_index;`
	`549`	`+ trace_vhost_vdpa_get_vq_index(dev, idx, idx);`
	`550`	`+ return idx;`
`551`	`551`	`}`
`552`	`552`
`553`	`553`	`static int vhost_vdpa_set_vring_ready(struct vhost_dev *dev)`