qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: marcandre.lureau@redhat.com
To: qemu-devel@nongnu.org
Cc: haifeng.lin@huawei.com, mst@redhat.com, thibaut.collet@6wind.com,
	jasowang@redhat.com, pbonzini@redhat.com,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [Qemu-devel] [PATCH v5 09/21] vhost-user: add a migration blocker
Date: Thu, 24 Sep 2015 18:22:09 +0200	[thread overview]
Message-ID: <1443111741-4736-10-git-send-email-marcandre.lureau@redhat.com> (raw)
In-Reply-To: <1443111741-4736-1-git-send-email-marcandre.lureau@redhat.com>

From: Marc-André Lureau <marcandre.lureau@redhat.com>

If VHOST_USER_PROTOCOL_F_LOG_SHMFD is not announced, block vhost-user
migration.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 hw/virtio/vhost-user.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index 6420efd..ff87e87 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -15,6 +15,7 @@
 #include "qemu/error-report.h"
 #include "qemu/sockets.h"
 #include "exec/ram_addr.h"
+#include "migration/migration.h"
 
 #include <fcntl.h>
 #include <unistd.h>
@@ -442,6 +443,14 @@ static int vhost_user_init(struct vhost_dev *dev, void *opaque)
         }
     }
 
+    if (!virtio_has_feature(dev->protocol_features,
+                            VHOST_USER_PROTOCOL_F_LOG_SHMFD)) {
+        migrate_add_blocker(dev->migration_blocker);
+        error_setg(&dev->migration_blocker,
+                   "Migration disabled: vhost-user backend lacks "
+                   "VHOST_USER_PROTOCOL_F_LOG_SHMFD feature.");
+    }
+
     return 0;
 }
 
@@ -466,6 +475,10 @@ static int vhost_user_cleanup(struct vhost_dev *dev)
     assert(dev->vhost_ops->backend_type == VHOST_BACKEND_TYPE_USER);
 
     dev->opaque = 0;
+    if (dev->migration_blocker) {
+        migrate_del_blocker(dev->migration_blocker);
+        error_free(dev->migration_blocker);
+    }
 
     return 0;
 }
-- 
2.4.3

  parent reply	other threads:[~2015-09-24 16:22 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-24 16:22 [Qemu-devel] [PATCH v5 00/21] vhost-user: add migration support marcandre.lureau
2015-09-24 16:22 ` [Qemu-devel] [PATCH v5 01/21] vhost-user: unit test for new messages marcandre.lureau
2015-09-24 16:22 ` [Qemu-devel] [PATCH v5 02/21] configure: probe for memfd marcandre.lureau
2015-09-24 16:22 ` [Qemu-devel] [PATCH v5 03/21] util: add linux-only memfd fallback marcandre.lureau
2015-09-24 16:22 ` [Qemu-devel] [PATCH v5 04/21] util: add memfd helpers marcandre.lureau
2015-09-24 16:22 ` [Qemu-devel] [PATCH v5 05/21] vhost: alloc shareable log marcandre.lureau
2015-09-24 16:22 ` [Qemu-devel] [PATCH v5 06/21] vhost: document log resizing marcandre.lureau
2015-09-24 16:22 ` [Qemu-devel] [PATCH v5 07/21] vhost: add vhost_set_log_base op marcandre.lureau
2015-09-24 16:22 ` [Qemu-devel] [PATCH v5 08/21] vhost-user: send log shm fd along with log_base marcandre.lureau
2015-09-24 16:22 ` marcandre.lureau [this message]
2015-09-24 16:22 ` [Qemu-devel] [PATCH v5 10/21] vhost: use a function for each call marcandre.lureau
2015-09-24 16:22 ` [Qemu-devel] [PATCH v5 11/21] vhost: only use shared log if in use by backend marcandre.lureau
2015-09-29 14:59   ` Michael S. Tsirkin
2015-09-29 15:26     ` Marc-André Lureau
2015-09-24 16:22 ` [Qemu-devel] [PATCH v5 12/21] vhost-user: document migration log marcandre.lureau
2015-09-24 16:38   ` Eric Blake
2015-09-24 16:41     ` Marc-André Lureau
2015-09-24 16:47       ` Eric Blake
2015-09-24 16:22 ` [Qemu-devel] [PATCH v5 13/21] net: add trace_vhost_user_event marcandre.lureau
2015-09-24 16:22 ` [Qemu-devel] [PATCH v5 14/21] vhost user: add support of live migration marcandre.lureau
2015-09-24 16:22 ` [Qemu-devel] [PATCH v5 15/21] vhost user: add rarp sending after live migration for legacy guest marcandre.lureau
2015-09-24 17:24   ` Thibaut Collet
2015-09-24 21:53     ` Marc-André Lureau
2015-09-27 13:12       ` Michael S. Tsirkin
2015-09-27 15:13         ` Marc-André Lureau
2015-09-27 15:49           ` Thibaut Collet
2015-09-27 18:04             ` Marc-André Lureau
2015-09-24 16:22 ` [Qemu-devel] [PATCH v5 16/21] vhost-user-test: move wait_for_fds() out marcandre.lureau
2015-09-24 16:22 ` [Qemu-devel] [PATCH v5 17/21] vhost-user-test: remove useless static check marcandre.lureau
2015-09-24 16:22 ` [Qemu-devel] [PATCH v5 18/21] vhost-user-test: wrap server in TestServer struct marcandre.lureau
2015-09-24 16:22 ` [Qemu-devel] [PATCH v5 19/21] vhost-user-test: learn to tweak various qemu arguments marcandre.lureau
2015-09-24 16:22 ` [Qemu-devel] [PATCH v5 20/21] vhost-user-test: add live-migration test marcandre.lureau
2015-09-24 16:22 ` [Qemu-devel] [PATCH v5 21/21] vhost-user-test: check ownership during migration marcandre.lureau
2015-09-27 13:19 ` [Qemu-devel] [PATCH v5 00/21] vhost-user: add migration support Michael S. Tsirkin
2015-09-29 15:07 ` Michael S. Tsirkin

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=1443111741-4736-10-git-send-email-marcandre.lureau@redhat.com \
    --to=marcandre.lureau@redhat.com \
    --cc=haifeng.lin@huawei.com \
    --cc=jasowang@redhat.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).