summaryrefslogtreecommitdiff
path: root/include/migration/migration.h
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2016-02-24 11:53:38 +0300
committerAmit Shah <amit.shah@redhat.com>2016-02-26 20:39:50 +0530
commit0aa6aefc9c93db1f64e3ba406ee5234da75b545b (patch)
tree79ac49a096df2bd4a9a41f0a9a38546363c02f84 /include/migration/migration.h
parent8da5ef579f956857ca1887ce0bc5e189dd9de0c4 (diff)
downloadqemu-0aa6aefc9c93db1f64e3ba406ee5234da75b545b.zip
migration (ordinary): move bdrv_invalidate_cache_all of of coroutine context
There is a possibility to hit an assert in qcow2_get_specific_info that s->qcow_version is undefined. This happens when VM in starting from suspended state, i.e. it processes incoming migration, and in the same time 'info block' is called. The problem is that qcow2_invalidate_cache() closes the image and memset()s BDRVQcowState in the middle. The patch moves processing of bdrv_invalidate_cache_all out of coroutine context for standard migration to avoid that. Signed-off-by: Denis V. Lunev <den@openvz.org> Reviewed-by: Fam Zheng <famz@redhat.com> CC: Paolo Bonzini <pbonzini@redhat.com> CC: Juan Quintela <quintela@redhat.com> CC: Amit Shah <amit.shah@redhat.com> Message-Id: <1456304019-10507-2-git-send-email-den@openvz.org> [Amit: Fix a use-after-free bug] Signed-off-by: Amit Shah <amit.shah@redhat.com>
Diffstat (limited to 'include/migration/migration.h')
-rw-r--r--include/migration/migration.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/migration/migration.h b/include/migration/migration.h
index 85b6026d10..ac2c12c2a5 100644
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -104,6 +104,8 @@ struct MigrationIncomingState {
QemuMutex rp_mutex; /* We send replies from multiple threads */
void *postcopy_tmp_page;
+ QEMUBH *bh;
+
int state;
/* See savevm.c */
LoadStateEntry_Head loadvm_handlers;