On Fri, 2012-03-30 at 11:03 +0100, Stefan Hajnoczi wrote:
> The following commit originally separated the common vhost feature bits
> from the vhost-net feature bits. At some point this change was lost:
>
> commit 5918c17b052293554f84d747390840ccf3d748d0
> Author: Stefan Hajnoczi <stefanha@xxxxxxxxxxxxxxxxxx>
> Date: Sun May 15 17:28:31 2011 +0100
>
> 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.
>
> Signed-off-by: Stefan Hajnoczi <stefanha@xxxxxxxxxxxxxxxxxx>
> ---
Applied to lio-core.git
Thanks Stefan!
> 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 6b1a9a0..936e5f1 100644
> --- a/drivers/vhost/vhost.h
> +++ b/drivers/vhost/vhost.h
> @@ -204,7 +204,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),
> };
--
To unsubscribe from this list: send the line "unsubscribe target-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
