From 6796b4008bd195e6765a1144dc98a8673e69d169 Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Wed, 3 May 2017 15:28:19 +0800 Subject: dump: Acquire BQL around vm_start() in dump thread This fixes an assertion failure in the following backtrace: __GI___assert_fail memory_region_transaction_commit memory_region_add_eventfd virtio_pci_ioeventfd_assign virtio_bus_set_host_notifier virtio_blk_data_plane_start virtio_bus_start_ioeventfd virtio_vmstate_change vm_state_notify vm_prepare_start vm_start dump_cleanup dump_process dump_thread start_thread clone vm_start need BQL, acquire it if doing cleaning up from main thread. Signed-off-by: Fam Zheng Message-Id: <20170503072819.14462-1-famz@redhat.com> Signed-off-by: Paolo Bonzini --- dump.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'dump.c') diff --git a/dump.c b/dump.c index f7b80d856b..d9090a24cc 100644 --- a/dump.c +++ b/dump.c @@ -77,7 +77,13 @@ static int dump_cleanup(DumpState *s) memory_mapping_list_free(&s->list); close(s->fd); if (s->resume) { + if (s->detached) { + qemu_mutex_lock_iothread(); + } vm_start(); + if (s->detached) { + qemu_mutex_unlock_iothread(); + } } return 0; @@ -1804,6 +1810,7 @@ void qmp_dump_guest_memory(bool paging, const char *file, if (detach_p) { /* detached dump */ + s->detached = true; qemu_thread_create(&s->dump_thread, "dump_thread", dump_thread, s, QEMU_THREAD_DETACHED); } else { -- cgit v1.2.1