diff options
author | Kevin Wolf <kwolf@redhat.com> | 2013-07-18 14:52:19 +0200 |
---|---|---|
committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2013-08-13 09:30:49 -0500 |
commit | 685803fcf71c11c2ef8b9014b893c120dd00af25 (patch) | |
tree | ab4e16cdfa8ceac4d49e01b317c08ecb155cdf6d | |
parent | 32d1d7ff518a5fe3823dd831435be57e8b81a1d9 (diff) | |
download | qemu-685803fcf71c11c2ef8b9014b893c120dd00af25.tar.gz |
cpus: Let vm_stop[_force_state]() always flush block devices
Even if the VM is already stopped, we cannot assume that all data has
already been successfully flushed to disk. The flush during the previous
vm_stop() could have failed.
Run bdrv_flush_all() unconditionally so that we get an error each time
if the block device isn't really flushed.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
(cherry picked from commit 594a45ce64dbef1829996403506a1154eb2fd1cc)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
-rw-r--r-- | cpus.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -446,11 +446,12 @@ static int do_vm_stop(RunState state) pause_all_vcpus(); runstate_set(state); vm_state_notify(0, state); - bdrv_drain_all(); - ret = bdrv_flush_all(); monitor_protocol_event(QEVENT_STOP, NULL); } + bdrv_drain_all(); + ret = bdrv_flush_all(); + return ret; } @@ -1120,7 +1121,9 @@ int vm_stop_force_state(RunState state) return vm_stop(state); } else { runstate_set(state); - return 0; + /* Make sure to return an error if the flush in a previous vm_stop() + * failed. */ + return bdrv_flush_all(); } } |