Re: [Qemu-devel] [PATCH V2 1/2] vhost-user: sync backend features

[Michael S. Tsirkin]

On Wed, Jul 29, 2015 at 11:06:48PM +0300, Marcel Apfelbaum wrote:
> Complete vhost-user negotiation by syncing

synching.

> the features
> supported by the backend.
> 
> Signed-off-by: Marcel Apfelbaum <address@hidden>
> ---
>  hw/virtio/vhost-user.c | 17 +++++++++++++++++
>  1 file changed, 17 insertions(+)
> 
> diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
> index c4428a1..b522437 100644
> --- a/hw/virtio/vhost-user.c
> +++ b/hw/virtio/vhost-user.c
> @@ -22,6 +22,7 @@
>  #include <sys/socket.h>
>  #include <sys/un.h>
>  #include <linux/vhost.h>
> +#include <linux/virtio_net.h>
>  
>  #define VHOST_MEMORY_MAX_NREGIONS    8
>  
> @@ -358,6 +359,22 @@ static int vhost_user_init(struct vhost_dev *dev, void 
> *opaque)
>          return err;
>      }
>  
> +    if (__virtio_has_feature(msg.u64, VIRTIO_F_ANY_LAYOUT)) {
> +        dev->backend_features |= 1ULL << VIRTIO_F_ANY_LAYOUT;
> +    }
> +
> +    if (__virtio_has_feature(msg.u64, VIRTIO_F_VERSION_1)) {
> +        dev->backend_features |= 1ULL << VIRTIO_F_VERSION_1;
> +    }
> +
> +    if (__virtio_has_feature(msg.u64, VIRTIO_NET_F_MRG_RXBUF)) {
> +        dev->backend_features |= 1ULL << VIRTIO_NET_F_MRG_RXBUF;
> +    }
> +
> +    if (__virtio_has_feature(msg.u64, VIRTIO_NET_F_MQ)) {
> +        dev->backend_features |= 1ULL << VIRTIO_NET_F_MQ;
> +    }
> +

A bit too early for MQ, isn't it?

>      if (__virtio_has_feature(msg.u64, VHOST_USER_F_PROTOCOL_FEATURES)) {
>          dev->backend_features |= 1ULL << VHOST_USER_F_PROTOCOL_FEATURES;
>  
> -- 
> 2.1.0