From: "Marc-André Lureau" <marcandre.lureau@redhat.com>
To: qemu-devel@nongnu.org
Cc: thibaut.collet@6wind.com, pbonzini@redhat.com,
haifeng.lin@huawei.com,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
mst@redhat.com
Subject: [Qemu-devel] [PATCH RFC 5/6] vhost-user: send log shm fd along with log_base
Date: Thu, 23 Jul 2015 03:36:42 +0200 [thread overview]
Message-ID: <1437615403-13554-6-git-send-email-marcandre.lureau@redhat.com> (raw)
In-Reply-To: <1437615403-13554-1-git-send-email-marcandre.lureau@redhat.com>
Send the shm for the dirty pages logging if the backend support
VHOST_USER_PROTOCOL_F_LOG_SHMFD.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/virtio/vhost-user.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index 4993b63..fe75618 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -26,7 +26,9 @@
#define VHOST_MEMORY_MAX_NREGIONS 8
#define VHOST_USER_F_PROTOCOL_FEATURES 30
-#define VHOST_USER_PROTOCOL_FEATURE_MASK 0x0ULL
+
+#define VHOST_USER_PROTOCOL_FEATURE_MASK 0x1ULL
+#define VHOST_USER_PROTOCOL_F_LOG_SHMFD 0
typedef enum VhostUserRequest {
VHOST_USER_NONE = 0,
@@ -213,8 +215,15 @@ static int vhost_user_call(struct vhost_dev *dev, unsigned long int request,
need_reply = 1;
break;
- case VHOST_USER_SET_FEATURES:
case VHOST_USER_SET_LOG_BASE:
+ if (__virtio_has_feature(dev->protocol_features,
+ VHOST_USER_PROTOCOL_F_LOG_SHMFD) &&
+ dev->log->fd != -1) {
+ fds[fd_num++] = dev->log->fd;
+ }
+ /* fall through */
+
+ case VHOST_USER_SET_FEATURES:
msg.u64 = *((__u64 *) arg);
msg.size = sizeof(m.u64);
break;
--
2.4.3
next prev parent reply other threads:[~2015-07-23 1:37 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-23 1:36 [Qemu-devel] [PATCH RFC 0/6] vhost-user: add migration log support Marc-André Lureau
2015-07-23 1:36 ` [Qemu-devel] [PATCH RFC 1/6] configure: probe for memfd Marc-André Lureau
2015-07-23 1:36 ` [Qemu-devel] [PATCH RFC 2/6] posix: add linux-only memfd fallback Marc-André Lureau
2015-07-23 15:25 ` Michael S. Tsirkin
2015-07-28 8:11 ` Paolo Bonzini
2015-07-28 10:58 ` Marc-André Lureau
2015-07-28 11:50 ` Paolo Bonzini
2015-07-28 14:25 ` Marc-André Lureau
2015-07-28 16:37 ` Paolo Bonzini
2015-07-23 1:36 ` [Qemu-devel] [PATCH RFC 3/6] osdep: add memfd helpers Marc-André Lureau
2015-07-23 1:36 ` [Qemu-devel] [PATCH RFC 4/6] vhost: alloc shareable log Marc-André Lureau
2015-07-28 5:28 ` Jason Wang
2015-07-28 10:10 ` Michael S. Tsirkin
2015-07-28 14:42 ` Marc-André Lureau
2015-07-23 1:36 ` Marc-André Lureau [this message]
2015-07-23 1:36 ` [Qemu-devel] [PATCH RFC 6/6] vhost-user: document migration log Marc-André Lureau
2015-07-23 15:30 ` Michael S. Tsirkin
2015-07-23 15:36 ` Marc-André Lureau
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=1437615403-13554-6-git-send-email-marcandre.lureau@redhat.com \
--to=marcandre.lureau@redhat.com \
--cc=haifeng.lin@huawei.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thibaut.collet@6wind.com \
/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).