net/virtio-user: fix multiple queue for vhost-kernel

The multiple queue support in vhost-kernel is broken because
the dev->vhostfd is only available for vhost-user. We should
always try to enable queue pairs when it's not in server mode.

Fixes: 201a41651715 ("net/virtio-user: fix multiple queues fail in server mode")
Cc: stable@dpdk.org
Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>

diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
index 869e96f..55a82e4 100644 (file)
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -549,13 +549,11 @@ virtio_user_handle_mq(struct virtio_user_dev *dev, uint16_t q_pairs)
        /* Server mode can't enable queue pairs if vhostfd is invalid,
         * always return 0 in this case.
         */
-       if (dev->vhostfd >= 0) {
+       if (!dev->is_server || dev->vhostfd >= 0) {
                for (i = 0; i < q_pairs; ++i)
                        ret |= dev->ops->enable_qp(dev, i, 1);
                for (i = q_pairs; i < dev->max_queue_pairs; ++i)
                        ret |= dev->ops->enable_qp(dev, i, 0);
-       } else if (!dev->is_server) {
-               ret = ~0;
        }
        dev->queue_pairs = q_pairs;