Skip to content

Commit

Permalink
qemu: use bdrv_flush_all for vm_stop et al
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-by: Kevin Wolf <[email protected]>
Reviewed-by: Max Reitz <[email protected]>
Acked-by: Fam Zheng <[email protected]>
Signed-off-by: Kevin Wolf <[email protected]>
  • Loading branch information
jnsnow authored and kevmw committed Sep 29, 2016
1 parent 4085f5c commit 22af08e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions cpus.c
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@ static int do_vm_stop(RunState state)

bdrv_drain_all();
replay_disable_events();
ret = blk_flush_all();
ret = bdrv_flush_all();

return ret;
}
Expand Down Expand Up @@ -1408,7 +1408,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();
}
}

Expand Down

0 comments on commit 22af08e

Please sign in to comment.