aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/vhost/scsi.c
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2015-09-09 22:24:56 +0300
committerMichael S. Tsirkin <mst@redhat.com>2015-09-16 12:48:07 +0300
commit4e9fa50c6ccbebef0c4a4aae84090badf81359e6 (patch)
tree3c0a7132a475b49fb58c155773c114b1e5e18b74 /drivers/vhost/scsi.c
parenttools/virtio: fix build after 4.2 changes (diff)
downloadlinux-dev-4e9fa50c6ccbebef0c4a4aae84090badf81359e6.tar.xz
linux-dev-4e9fa50c6ccbebef0c4a4aae84090badf81359e6.zip
vhost: move features to core
virtio 1 and any layout are core features, move them there. This fixes vhost test. Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'drivers/vhost/scsi.c')
-rw-r--r--drivers/vhost/scsi.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
index dfcc02c93648..0a5b404b316a 100644
--- a/drivers/vhost/scsi.c
+++ b/drivers/vhost/scsi.c
@@ -166,9 +166,7 @@ enum {
/* Note: can't set VIRTIO_F_VERSION_1 yet, since that implies ANY_LAYOUT. */
enum {
VHOST_SCSI_FEATURES = VHOST_FEATURES | (1ULL << VIRTIO_SCSI_F_HOTPLUG) |
- (1ULL << VIRTIO_SCSI_F_T10_PI) |
- (1ULL << VIRTIO_F_ANY_LAYOUT) |
- (1ULL << VIRTIO_F_VERSION_1)
+ (1ULL << VIRTIO_SCSI_F_T10_PI)
};
#define VHOST_SCSI_MAX_TARGET 256