[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 16/34] vhost: migration blocker only if shared log
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 16/34] vhost: migration blocker only if shared log is used |
Date: |
Fri, 11 Nov 2016 20:10:50 +0200 |
From: Rafael David Tinoco <address@hidden>
Commit 31190ed7 added a migration blocker in vhost_dev_init() to
check if memfd would succeed. It is better if this blocker first
checks if vhost backend requires shared log. This will avoid a
situation where a blocker is added inappropriately (e.g. shared
log allocation fails when vhost backend doesn't support it).
Signed-off-by: Rafael David Tinoco <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/virtio/vhost.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index 131f164..25bf67f 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -1122,7 +1122,7 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaque,
if (!(hdev->features & (0x1ULL << VHOST_F_LOG_ALL))) {
error_setg(&hdev->migration_blocker,
"Migration disabled: vhost lacks VHOST_F_LOG_ALL
feature.");
- } else if (!qemu_memfd_check()) {
+ } else if (vhost_dev_log_is_shared(hdev) && !qemu_memfd_check()) {
error_setg(&hdev->migration_blocker,
"Migration disabled: failed to allocate shared memory");
}
--
MST
- [Qemu-devel] [PULL v2 06/34] tests/vhost-user-bridge: use contrib/libvhost-user, (continued)
- [Qemu-devel] [PULL v2 06/34] tests/vhost-user-bridge: use contrib/libvhost-user, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 08/34] virtio: rename virtqueue_discard to virtqueue_unpop, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 07/34] intel_iommu: fixing source id during IOTLB hash key calculation, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 11/34] intel_iommu: fix several incorrect endianess and bit fields, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 09/34] virtio: make virtqueue_alloc_element static, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 12/34] intel_iommu: fix incorrect assert, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 10/34] virtio-crypto: tag as not hotpluggable and migration, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 13/34] acpi: fix DMAR device scope for IOAPIC, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 15/34] virtio-net: mark VIRTIO_NET_F_GSO as legacy, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 14/34] virtio: allow per-device-class legacy features, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 16/34] vhost: migration blocker only if shared log is used,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v2 17/34] qdev: hotplug: drop HotplugHandler.post_plug callback, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 18/34] nvdimm acpi: drop the lock of fit buffer, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 19/34] pc: memhp: move nvdimm hotplug out of memory hotplug, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 20/34] pc: memhp: stop handling nvdimm hotplug in pc_dimm_unplug, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 21/34] nvdimm acpi: clean up nvdimm_build_acpi, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 22/34] docs: improve the doc of Read FIT method, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 23/34] nvdimm acpi: rename nvdimm_plugged_device_list, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 24/34] nvdimm acpi: cleanup nvdimm_build_fit, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 25/34] nvdimm acpi: rename nvdimm_acpi_hotplug, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 26/34] nvdimm acpi: define DSM return codes, Michael S. Tsirkin, 2016/11/11