From: Claire Murphy <claire.k.murphy@intel.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH 2/2] Patch to allow live migration of a VM with US-VHost.
Date: Wed, 18 Jun 2014 16:34:54 +0100 [thread overview]
Message-ID: <1403105694-23736-3-git-send-email-claire.k.murphy@intel.com> (raw)
In-Reply-To: <1403105694-23736-1-git-send-email-claire.k.murphy@intel.com>
Signed-off-by: Claire Murphy <claire.k.murphy@intel.com>
---
examples/vhost/vhost-net-cdev.c | 18 ++++++++++++++++++
examples/vhost/virtio-net.c | 8 +++++++-
2 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/examples/vhost/vhost-net-cdev.c b/examples/vhost/vhost-net-cdev.c
index ef42e88..e942df0 100644
--- a/examples/vhost/vhost-net-cdev.c
+++ b/examples/vhost/vhost-net-cdev.c
@@ -275,6 +275,24 @@ vhost_net_ioctl(fuse_req_t req, int cmd, void *arg,
VHOST_IOCTL_R(struct vhost_vring_file, file, ops->set_vring_call);
break;
+ case VHOST_SET_VRING_ERR:
+ RTE_LOG(ERR, CONFIG, "(%"PRIu64") IOCTL: VHOST_SET_VRING_ERR cmd=%d Un-Supported\n", ctx.fh,cmd);
+ result = -1;
+ fuse_reply_ioctl(req, result, NULL, 0);
+ break;
+
+ case VHOST_SET_LOG_BASE:
+ RTE_LOG(ERR, CONFIG, "(%"PRIu64") IOCTL: VHOST_SET_LOG_BASE cmd=%d Un-Supported\n", ctx.fh,cmd);
+ result = 0;
+ fuse_reply_ioctl(req, result, NULL, 0);
+ break;
+
+ case VHOST_SET_LOG_FD:
+ RTE_LOG(ERR, CONFIG, "(%"PRIu64") IOCTL: VHOST_SET_LOG_FD cmd=%d Un-Supported \n", ctx.fh,cmd);
+ result = -1;
+ fuse_reply_ioctl(req, result, NULL, 0);
+ break;
+
default:
RTE_LOG(ERR, VHOST_CONFIG, "(%"PRIu64") IOCTL: DOESN NOT EXIST\n", ctx.fh);
result = -1;
diff --git a/examples/vhost/virtio-net.c b/examples/vhost/virtio-net.c
index 9be959f..3cf650d 100644
--- a/examples/vhost/virtio-net.c
+++ b/examples/vhost/virtio-net.c
@@ -573,7 +573,13 @@ set_features(struct vhost_device_ctx ctx, uint64_t *pu)
dev = get_device(ctx);
if (dev == NULL)
return -1;
- if (*pu & ~VHOST_FEATURES)
+
+ /*
+ * We mask the VHOST_F_LOG_ALL feature bit here as it is enabled by default
+ * during migration in QEMU even if we have it disabled as a feature in
+ * userspace vhost.
+ */
+ if (*pu & ~(VHOST_FEATURES | (1ULL << VHOST_F_LOG_ALL)))
return -1;
/* Store the negotiated feature list for the device. */
--
1.7.0.7
next prev parent reply other threads:[~2014-06-18 15:36 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-18 15:34 [dpdk-dev] [PATCH 0/2] *** SUBJECT HERE *** Claire Murphy
2014-06-18 15:34 ` [dpdk-dev] [PATCH 1/2] Patch for Qemu wrapper for US-VHost to ensure Qemu process ends when VM is shutdown Claire Murphy
2014-06-18 15:34 ` Claire Murphy [this message]
2014-08-06 9:44 ` [dpdk-dev] [PATCH 2/2] Patch to allow live migration of a VM with US-VHost Gray, Mark D
2014-08-06 10:01 ` Gray, Mark D
2014-08-29 15:08 ` Thomas Monjalon
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=1403105694-23736-3-git-send-email-claire.k.murphy@intel.com \
--to=claire.k.murphy@intel.com \
--cc=dev@dpdk.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).