From b2780d325306dc80ec07db9c0c61e9b2ac10e559 Mon Sep 17 00:00:00 2001 From: Wen Congyang Date: Fri, 20 Nov 2015 17:34:38 +0800 Subject: call bdrv_drain_all() even if the vm is stopped There are still I/O operations when the vm is stopped. For example, stop the vm, and do block migration. In this case, we don't drain all I/O operation, and may meet the following problem: qemu-system-x86_64: migration/block.c:731: block_save_complete: Assertion `block_mig_state.submitted == 0' failed. Signed-off-by: Wen Congyang Message-Id: <564EE92E.4070701@cn.fujitsu.com> Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- cpus.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'cpus.c') diff --git a/cpus.c b/cpus.c index 877bd70a27..43676fa1f3 100644 --- a/cpus.c +++ b/cpus.c @@ -1415,6 +1415,8 @@ int vm_stop_force_state(RunState state) return vm_stop(state); } else { runstate_set(state); + + bdrv_drain_all(); /* Make sure to return an error if the flush in a previous vm_stop() * failed. */ return bdrv_flush_all(); -- cgit v1.2.1