New upstream version 16.11.5

[deb_dpdk.git] / lib / librte_vhost / vhost.c

diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
index e415093..36fdfb5 100644 (file)
--- a/lib/librte_vhost/vhost.c
+++ b/lib/librte_vhost/vhost.c
@@ -56,7 +56,7 @@
                                (1ULL << VIRTIO_NET_F_CTRL_VQ) | \
                                (1ULL << VIRTIO_NET_F_CTRL_RX) | \
                                (1ULL << VIRTIO_NET_F_GUEST_ANNOUNCE) | \
-                               (VHOST_SUPPORTS_MQ)            | \
+                               (1ULL << VIRTIO_NET_F_MQ)      | \
                                (1ULL << VIRTIO_F_VERSION_1)   | \
                                (1ULL << VHOST_F_LOG_ALL)      | \
                                (1ULL << VHOST_USER_F_PROTOCOL_FEATURES) | \
@@ -202,6 +202,8 @@ alloc_vring_queue_pair(struct virtio_net *dev, uint32_t qp_idx)
        dev->virtqueue[virt_tx_q_idx] = virtqueue + VIRTIO_TXQ;
 
        init_vring_queue_pair(dev, qp_idx);
+       rte_spinlock_init(&dev->virtqueue[virt_rx_q_idx]->access_lock);
+       rte_spinlock_init(&dev->virtqueue[virt_tx_q_idx]->access_lock);
 
        dev->virt_qp_nb += 1;