Commit b2780d32 authored by Wen Congyang's avatar Wen Congyang Committed by Paolo Bonzini
Browse files

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: default avatarWen Congyang <wency@cn.fujitsu.com>
Message-Id: <564EE92E.4070701@cn.fujitsu.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 2b1641d0

cpus.c

+2 −0
Original line number Diff line number Diff line
@@ -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();