From 95200ebb5078a6718a8010528263994f9cb7ebaf Mon Sep 17 00:00:00 2001 From: John Snow Date: Thu, 22 Sep 2016 21:45:51 -0400 Subject: [PATCH] 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 Reviewed-by: Kevin Wolf Reviewed-by: Max Reitz Acked-by: Fam Zheng Signed-off-by: Kevin Wolf (cherry picked from commit 22af08eacf6b5aa0e6c0581e547380b3eb4f95e9) Conflicts: cpus.c * drop context dependancy on 6d0ceb80 Signed-off-by: Michael Roth --- cpus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpus.c b/cpus.c index 84c3520d446..7e73c0314c5 100644 --- a/cpus.c +++ b/cpus.c @@ -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(); } } -- 2.39.5