From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50869) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZKXcv-0004tq-UI for qemu-devel@nongnu.org; Wed, 29 Jul 2015 16:07:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZKXcs-000298-Tx for qemu-devel@nongnu.org; Wed, 29 Jul 2015 16:06:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45257) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZKXcs-000293-Oi for qemu-devel@nongnu.org; Wed, 29 Jul 2015 16:06:54 -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 7FC22225 for ; Wed, 29 Jul 2015 20:06:54 +0000 (UTC) From: Marcel Apfelbaum Date: Wed, 29 Jul 2015 23:06:48 +0300 Message-Id: <1438200409-27381-2-git-send-email-marcel@redhat.com> In-Reply-To: <1438200409-27381-1-git-send-email-marcel@redhat.com> References: <1438200409-27381-1-git-send-email-marcel@redhat.com> Subject: [Qemu-devel] [PATCH V2 1/2] vhost-user: sync backend features List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: marcel@redhat.com, jasowang@redhat.com, famz@redhat.com, mst@redhat.com Complete vhost-user negotiation by syncing the features supported by the backend. Signed-off-by: Marcel Apfelbaum --- 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 #include #include +#include #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; + } + if (__virtio_has_feature(msg.u64, VHOST_USER_F_PROTOCOL_FEATURES)) { dev->backend_features |= 1ULL << VHOST_USER_F_PROTOCOL_FEATURES; -- 2.1.0