diff options
author | Michael S. Tsirkin <mst@redhat.com> | 2015-09-09 21:24:56 +0200 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2015-09-16 11:48:07 +0200 |
commit | 4e9fa50c6ccbebef0c4a4aae84090badf81359e6 (patch) | |
tree | 3c0a7132a475b49fb58c155773c114b1e5e18b74 /drivers/vhost/vhost.h | |
parent | tools/virtio: fix build after 4.2 changes (diff) | |
download | linux-4e9fa50c6ccbebef0c4a4aae84090badf81359e6.tar.xz linux-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/vhost.h')
-rw-r--r-- | drivers/vhost/vhost.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h index ce6f6da4b09f..4772862b71a7 100644 --- a/drivers/vhost/vhost.h +++ b/drivers/vhost/vhost.h @@ -173,7 +173,9 @@ enum { VHOST_FEATURES = (1ULL << VIRTIO_F_NOTIFY_ON_EMPTY) | (1ULL << VIRTIO_RING_F_INDIRECT_DESC) | (1ULL << VIRTIO_RING_F_EVENT_IDX) | - (1ULL << VHOST_F_LOG_ALL), + (1ULL << VHOST_F_LOG_ALL) | + (1ULL << VIRTIO_F_ANY_LAYOUT) | + (1ULL << VIRTIO_F_VERSION_1) }; static inline bool vhost_has_feature(struct vhost_virtqueue *vq, int bit) |