From: Marcel Apfelbaum <marcel@redhat.com>
To: qemu-devel@nongnu.org
Cc: marcel@redhat.com, jasowang@redhat.com, famz@redhat.com,
n.nikolaev@virtualopensystems.com, mst@redhat.com
Subject: [Qemu-devel] [PATCH V3 2/3] hw/vhost-user: sync backend features
Date: Fri, 31 Jul 2015 19:38:19 +0300 [thread overview]
Message-ID: <1438360700-18289-3-git-send-email-marcel@redhat.com> (raw)
In-Reply-To: <1438360700-18289-1-git-send-email-marcel@redhat.com>
Complete vhost-user negotiation by 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;
+ }
+
if (__virtio_has_feature(msg.u64, VHOST_USER_F_PROTOCOL_FEATURES)) {
dev->backend_features |= 1ULL << VHOST_USER_F_PROTOCOL_FEATURES;
--
2.1.0
next prev parent reply other threads:[~2015-07-31 16:38 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-31 16:38 [Qemu-devel] [PATCH V3 0/3] vhost-user: sync backend Marcel Apfelbaum
2015-07-31 16:38 ` [Qemu-devel] [PATCH V3 1/3] hw/vhost-user: remove unnecessary virtio control bits Marcel Apfelbaum
2015-08-05 11:37 ` Marcel Apfelbaum
2015-07-31 16:38 ` Marcel Apfelbaum [this message]
2015-07-31 16:38 ` [Qemu-devel] [PATCH V3 3/3] tests/vhost-user: check vhost-user feature negotiation Marcel Apfelbaum
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1438360700-18289-3-git-send-email-marcel@redhat.com \
--to=marcel@redhat.com \
--cc=famz@redhat.com \
--cc=jasowang@redhat.com \
--cc=mst@redhat.com \
--cc=n.nikolaev@virtualopensystems.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).