From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46846) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZLDKO-0005sG-2x for qemu-devel@nongnu.org; Fri, 31 Jul 2015 12:38:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZLDKG-0003Bk-TK for qemu-devel@nongnu.org; Fri, 31 Jul 2015 12:38:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34399) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZLDKG-0003Bg-NP for qemu-devel@nongnu.org; Fri, 31 Jul 2015 12:38:28 -0400 From: Marcel Apfelbaum Date: Fri, 31 Jul 2015 19:38:19 +0300 Message-Id: <1438360700-18289-3-git-send-email-marcel@redhat.com> In-Reply-To: <1438360700-18289-1-git-send-email-marcel@redhat.com> References: <1438360700-18289-1-git-send-email-marcel@redhat.com> Subject: [Qemu-devel] [PATCH V3 2/3] hw/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, n.nikolaev@virtualopensystems.com, mst@redhat.com Complete vhost-user negotiation by synching 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