[PATCH v6 8/8] vhost: improve vDPA blk device configure condition

[Andy Pei]

To support multi-queue, configure device
after call fd of all queues are set.

Signed-off-by: Andy Pei <andy....@intel.com>
Signed-off-by: Huang Wei <wei.hu...@intel.com>
Reviewed-by: Chenbo Xia <chenbo....@intel.com>
---
 lib/vhost/vhost_user.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
index 53806fa..2c50d13 100644
--- a/lib/vhost/vhost_user.c
+++ b/lib/vhost/vhost_user.c
@@ -2973,6 +2973,7 @@ static int is_vring_iotlb(struct virtio_net *dev,
        uint32_t vdpa_type = -1;
        uint32_t request;
        uint32_t i;
+       uint16_t blk_call_fd;
 
        dev = get_device(vid);
        if (dev == NULL)
@@ -3201,9 +3202,15 @@ static int is_vring_iotlb(struct virtio_net *dev,
        if (!vdpa_dev)
                goto out;
 
-       if (vdpa_type == RTE_VHOST_VDPA_DEVICE_TYPE_BLK
-               && request != VHOST_USER_SET_VRING_CALL)
-               goto out;
+       if (vdpa_type == RTE_VHOST_VDPA_DEVICE_TYPE_BLK) {
+               if (request == VHOST_USER_SET_VRING_CALL) {
+                       blk_call_fd = ctx.msg.payload.u64 & 
VHOST_USER_VRING_IDX_MASK;
+                       if (blk_call_fd != dev->nr_vring - 1)
+                               goto out;
+               } else {
+                       goto out;
+               }
+       }
 
        if (!(dev->flags & VIRTIO_DEV_VDPA_CONFIGURED)) {
                if (vdpa_dev->ops->dev_conf(dev->vid))
-- 
1.8.3.1