From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46851) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZLDKP-0005uD-J8 for qemu-devel@nongnu.org; Fri, 31 Jul 2015 12:38:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZLDKJ-0003Dt-I4 for qemu-devel@nongnu.org; Fri, 31 Jul 2015 12:38:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49315) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZLDKJ-0003Do-4d for qemu-devel@nongnu.org; Fri, 31 Jul 2015 12:38:31 -0400 From: Marcel Apfelbaum Date: Fri, 31 Jul 2015 19:38:20 +0300 Message-Id: <1438360700-18289-4-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 3/3] tests/vhost-user: check vhost-user feature negotiation 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 Check the backend receives all declared virtio features that are also supported by QEMU virtio. Signed-off-by: Marcel Apfelbaum --- tests/vhost-user-test.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index 228acb6..019b880 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -17,6 +17,7 @@ #include "sysemu/sysemu.h" #include +#include #include #include #include @@ -297,14 +298,26 @@ static void chr_read(void *opaque, const uint8_t *buf, int size) /* send back features to qemu */ msg.flags |= VHOST_USER_REPLY_MASK; msg.size = sizeof(m.u64); - msg.u64 = 0x1ULL << VHOST_USER_F_PROTOCOL_FEATURES; + msg.u64 = (0x1ULL << VHOST_USER_F_PROTOCOL_FEATURES) | + (0x1ULL << VIRTIO_F_ANY_LAYOUT) | + (0x1ULL << VIRTIO_F_VERSION_1) | + (0x1ULL << VIRTIO_NET_F_MRG_RXBUF) | + (0x1ULL << VIRTIO_NET_F_MQ); p = (uint8_t *) &msg; qemu_chr_fe_write_all(chr, p, VHOST_USER_HDR_SIZE + msg.size); break; case VHOST_USER_SET_FEATURES: - g_assert_cmpint(msg.u64 & (0x1ULL << VHOST_USER_F_PROTOCOL_FEATURES), - !=, 0ULL); + g_assert_cmpint(msg.u64 & (0x1ULL << VHOST_USER_F_PROTOCOL_FEATURES), + !=, 0ULL); + g_assert_cmpint(msg.u64 & (0x1ULL << VIRTIO_F_ANY_LAYOUT), + !=, 0ULL); + g_assert_cmpint(msg.u64 & (0x1ULL << VIRTIO_F_VERSION_1), + !=, 0ULL); + g_assert_cmpint(msg.u64 & (0x1ULL << VIRTIO_NET_F_MRG_RXBUF), + !=, 0ULL); + g_assert_cmpint(msg.u64 & (0x1ULL << VIRTIO_NET_F_MQ), + !=, 0ULL); break; case VHOST_USER_GET_PROTOCOL_FEATURES: -- 2.1.0