From: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Date: Fri, 13 Nov 2015 07:24:09 +0000 (+0800)
Subject: vhost: let SET_VRING_ENABLE message depends on protocol feature
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=923e2d98ede7404882656aeb4364c3964a95db3d;p=qmiga%2Fqemu.git

vhost: let SET_VRING_ENABLE message depends on protocol feature

But not depend on PROTOCOL_F_MQ feature bit. So that we could use
SET_VRING_ENABLE to sign the backend on stop, even if MQ is disabled.

That's reasonable, since we will have one queue pair at least.

Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index c44360219f..3404b81eda 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -338,7 +338,7 @@ static int vhost_user_set_vring_enable(struct vhost_dev *dev, int enable)
         .num   = enable,
     };
 
-    if (!(dev->protocol_features & (1ULL << VHOST_USER_PROTOCOL_F_MQ))) {
+    if (!virtio_has_feature(dev->features, VHOST_USER_F_PROTOCOL_FEATURES)) {
         return -1;
     }