diff options
author | John Snow <jsnow@redhat.com> | 2016-09-22 21:45:51 -0400 |
---|---|---|
committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2016-11-02 17:04:56 -0500 |
commit | 95200ebb5078a6718a8010528263994f9cb7ebaf (patch) | |
tree | 588e8f505e756adce88347fb8f7f212dbc72a6ef | |
parent | 8e94512568729c8dfaa9827b5417c7be3d2fb773 (diff) | |
download | qemu-95200ebb5078a6718a8010528263994f9cb7ebaf.tar.gz |
qemu: use bdrv_flush_all for vm_stop et al
Reimplement bdrv_flush_all for vm_stop. In contrast to blk_flush_all,
bdrv_flush_all does not have device model restrictions. This allows
us to flush and halt unconditionally without error.
This allows us to do things like migrate when we have a device with
an open tray, but has a node that may need to be flushed, or nodes
that aren't currently attached to any device and need to be flushed.
Specifically, this allows us to migrate when we have a CDROM with
an open tray.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Acked-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
(cherry picked from commit 22af08eacf6b5aa0e6c0581e547380b3eb4f95e9)
Conflicts:
cpus.c
* drop context dependancy on 6d0ceb80
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
-rw-r--r-- | cpus.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -745,7 +745,7 @@ static int do_vm_stop(RunState state) } bdrv_drain_all(); - ret = blk_flush_all(); + ret = bdrv_flush_all(); return ret; } @@ -1488,7 +1488,7 @@ int vm_stop_force_state(RunState state) bdrv_drain_all(); /* Make sure to return an error if the flush in a previous vm_stop() * failed. */ - return blk_flush_all(); + return bdrv_flush_all(); } } |