diff options
| author |   Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> | 2012-07-21 06:55:36 +0000 |
|---|---|---|
| committer |   Michael S. Tsirkin <mst@redhat.com> | 2012-07-22 01:21:53 +0300 |
| commit | 0dd05a3b60ddf0e216fbd9e5116a5273966fd9db (patch) | |
| tree | 43ff17c3511b5cdbb3c8ccc00d24005c3e07aaf5 /drivers/vhost/vhost.h | |
| parent | forcedeth: spin_unlock_irq in interrupt handler fix (diff) | |
| download | linux-dev-0dd05a3b60ddf0e216fbd9e5116a5273966fd9db.tar.xz linux-dev-0dd05a3b60ddf0e216fbd9e5116a5273966fd9db.zip | |
vhost: Separate vhost-net features from vhost features
In order for other vhost devices to use the VHOST_FEATURES bits the
vhost-net specific bits need to be moved to their own VHOST_NET_FEATURES
constant.
(Asias: Update drivers/vhost/test.c to use VHOST_NET_FEATURES)
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Cc: Zhi Yong Wu <wuzhy@cn.ibm.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Asias He <asias@redhat.com>
Signed-off-by: Nicholas A. Bellinger <nab@risingtidesystems.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'drivers/vhost/vhost.h')
| -rw-r--r-- | drivers/vhost/vhost.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h index 8de1fd5b8efb..07b97631fd34 100644 --- a/drivers/vhost/vhost.h +++ b/drivers/vhost/vhost.h @@ -201,7 +201,8 @@ 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), + VHOST_NET_FEATURES = VHOST_FEATURES | (1ULL << VHOST_NET_F_VIRTIO_NET_HDR) | (1ULL << VIRTIO_NET_F_MRG_RXBUF), }; |