OSDN Git Service

vhost: let SET_VRING_ENABLE message depends on protocol feature
authorYuanhan Liu <yuanhan.liu@linux.intel.com>
Fri, 13 Nov 2015 07:24:09 +0000 (15:24 +0800)
committerMichael S. Tsirkin <mst@redhat.com>
Mon, 16 Nov 2015 10:02:54 +0000 (12:02 +0200)
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>
hw/virtio/vhost-user.c

index c443602..3404b81 100644 (file)
@@ -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;
     }