From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:49707)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1ZKhcS-0007GM-1t
	for qemu-devel@nongnu.org; Thu, 30 Jul 2015 02:47:09 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1ZKhcR-0004Hq-5R
	for qemu-devel@nongnu.org; Thu, 30 Jul 2015 02:47:07 -0400
Received: from mx1.redhat.com ([209.132.183.28]:34812)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1ZKhcR-0004Hk-07
	for qemu-devel@nongnu.org; Thu, 30 Jul 2015 02:47:07 -0400
Received: from int-mx11.intmail.prod.int.phx2.redhat.com
	(int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24])
	by mx1.redhat.com (Postfix) with ESMTPS id 55470B0CEF
	for <qemu-devel@nongnu.org>; Thu, 30 Jul 2015 06:47:06 +0000 (UTC)
Date: Thu, 30 Jul 2015 09:47:03 +0300
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20150730094612-mutt-send-email-mst@redhat.com>
References: <1438200409-27381-1-git-send-email-marcel@redhat.com>
	<1438200409-27381-2-git-send-email-marcel@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1438200409-27381-2-git-send-email-marcel@redhat.com>
Subject: Re: [Qemu-devel] [PATCH V2 1/2] vhost-user: sync backend features
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Marcel Apfelbaum <marcel@redhat.com>
Cc: jasowang@redhat.com, famz@redhat.com, qemu-devel@nongnu.org

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 <marcel@redhat.com>
> ---
>  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