diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2015-10-09 17:17:27 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-10-22 14:34:49 +0300 |
| commit | d2fc4402cb152d3e526f736d7d53dbd050ef8794 (patch) | |
| tree | 3c0cc81541a9d589d7d899fa69f1ba2ebbd83c19 /hw/virtio/vhost-user.c | |
| parent | 9a78a5dd272a190d262b5ba5d4721ab93d48c564 (diff) | |
| download | qemu-d2fc4402cb152d3e526f736d7d53dbd050ef8794.zip qemu-d2fc4402cb152d3e526f736d7d53dbd050ef8794.tar.gz qemu-d2fc4402cb152d3e526f736d7d53dbd050ef8794.tar.bz2 | |
vhost-user: add a migration blocker
If VHOST_USER_PROTOCOL_F_LOG_SHMFD is not announced, block vhost-user
migration. The blocker is removed in vhost_dev_cleanup().
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Thibaut Collet <thibaut.collet@6wind.com>
Diffstat (limited to 'hw/virtio/vhost-user.c')
| -rw-r--r-- | hw/virtio/vhost-user.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 2709c4e..fb3aa40 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 (dev->migration_blocker == NULL && + !virtio_has_feature(dev->protocol_features, + VHOST_USER_PROTOCOL_F_LOG_SHMFD)) { + error_setg(&dev->migration_blocker, + "Migration disabled: vhost-user backend lacks " + "VHOST_USER_PROTOCOL_F_LOG_SHMFD feature."); + } + return 0; } |