ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vhost: block migration if backend does not log memory 

vhost user does not support LOG_ALL feature bit.
Generally, we should not try to set this bit without
checking that backend can support it first.

Detect and block migration.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Nikolay Nikolaev <n.nikolaev@virtualopensystems.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2014-06-18 17:20:42 +03:00
parent d9c1647d89
commit 7145872ed3
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/virtio/vhost.c
View File

@ -20,6 +20,7 @@
#include <linux/vhost.h> #include <linux/vhost.h>
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-bus.h"
#include "migration/migration.h"
static void vhost_dev_sync_region(struct vhost_dev *dev, static void vhost_dev_sync_region(struct vhost_dev *dev,
MemoryRegionSection *section, MemoryRegionSection *section,
@ -854,6 +855,12 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaque,
.eventfd_del = vhost_eventfd_del, .eventfd_del = vhost_eventfd_del,
.priority = 10 .priority = 10
}; };
hdev->migration_blocker = NULL;
if (!(hdev->features & (0x1 << VHOST_F_LOG_ALL))) {
error_setg(&hdev->migration_blocker,
"Migration disabled: vhost lacks VHOST_F_LOG_ALL feature.");
migrate_add_blocker(hdev->migration_blocker);
}
hdev->mem = g_malloc0(offsetof(struct vhost_memory, regions)); hdev->mem = g_malloc0(offsetof(struct vhost_memory, regions));
hdev->n_mem_sections = 0; hdev->n_mem_sections = 0;
hdev->mem_sections = NULL; hdev->mem_sections = NULL;
@ -882,6 +889,10 @@ void vhost_dev_cleanup(struct vhost_dev *hdev)
vhost_virtqueue_cleanup(hdev->vqs + i); vhost_virtqueue_cleanup(hdev->vqs + i);
} }
memory_listener_unregister(&hdev->memory_listener); memory_listener_unregister(&hdev->memory_listener);
if (hdev->migration_blocker) {
migrate_del_blocker(hdev->migration_blocker);
error_free(hdev->migration_blocker);
}
g_free(hdev->mem); g_free(hdev->mem);
g_free(hdev->mem_sections); g_free(hdev->mem_sections);
hdev->vhost_ops->vhost_backend_cleanup(hdev); hdev->vhost_ops->vhost_backend_cleanup(hdev);

1
include/hw/virtio/vhost.h
View File

@ -45,6 +45,7 @@ struct vhost_dev {
bool log_enabled; bool log_enabled;
vhost_log_chunk_t *log; vhost_log_chunk_t *log;
unsigned long long log_size; unsigned long long log_size;
Error *migration_blocker;
bool force; bool force;
bool memory_changed; bool memory_changed;
hwaddr mem_changed_start_addr; hwaddr mem_changed_start_addr;