[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 19/47] vhost: migration blocker only if shared log is
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 19/47] vhost: migration blocker only if shared log is used |
Date: |
Thu, 10 Nov 2016 18:13:18 +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 7d29dad..cf122bb 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 08/47] virtio: rename virtqueue_discard to virtqueue_unpop, (continued)
- [Qemu-devel] [PULL 08/47] virtio: rename virtqueue_discard to virtqueue_unpop, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 10/47] pcie_aer: Convert pcie_aer_init to Error, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 12/47] intel_iommu: fix several incorrect endianess and bit fields, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 11/47] virtio-crypto: tag as not hotpluggable and migration, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 13/47] intel_iommu: fix incorrect assert, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 14/47] acpi: fix DMAR device scope for IOAPIC, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 15/47] virtio: allow per-device-class legacy features, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 16/47] virtio-net: mark VIRTIO_NET_F_GSO as legacy, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 17/47] vhost: Update 'ioeventfd_started' with host notifiers, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 18/47] vhost: Use vbus var instead of VIRTIO_BUS() macro, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 19/47] vhost: migration blocker only if shared log is used,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 20/47] qdev: hotplug: drop HotplugHandler.post_plug callback, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 21/47] nvdimm acpi: drop the lock of fit buffer, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 22/47] pc: memhp: move nvdimm hotplug out of memory hotplug, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 24/47] nvdimm acpi: clean up nvdimm_build_acpi, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 23/47] pc: memhp: stop handling nvdimm hotplug in pc_dimm_unplug, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 25/47] docs: improve the doc of Read FIT method, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 27/47] nvdimm acpi: cleanup nvdimm_build_fit, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 26/47] nvdimm acpi: rename nvdimm_plugged_device_list, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 28/47] nvdimm acpi: rename nvdimm_acpi_hotplug, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 29/47] nvdimm acpi: define DSM return codes, Michael S. Tsirkin, 2016/11/10