diff options
| author | Max Reitz <mreitz@redhat.com> | 2016-03-16 19:54:32 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-03-17 15:47:56 +0100 |
| commit | da31d594cf971795c1150ef1f5bdb01790b1b1b9 (patch) | |
| tree | 1be81f733d4b240e8bae563cf18307054bcfad1c | |
| parent | 1393f21270d707dfe0af3206b8757887c7b5c1ec (diff) | |
| download | qemu-da31d594cf971795c1150ef1f5bdb01790b1b1b9.tar.gz | |
block: Use blk_{commit,flush}_all() consistently
Replace bdrv_commmit_all() and bdrv_flush_all() by their BlockBackend
equivalents.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | blockdev.c | 2 | ||||
| -rw-r--r-- | cpus.c | 5 | ||||
| -rw-r--r-- | qemu-char.c | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/blockdev.c b/blockdev.c index 50410bf328..5be7d4bbd0 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1173,7 +1173,7 @@ void hmp_commit(Monitor *mon, const QDict *qdict) int ret; if (!strcmp(device, "all")) { - ret = bdrv_commit_all(); + ret = blk_commit_all(); } else { BlockDriverState *bs; AioContext *aio_context; @@ -29,6 +29,7 @@ #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" #include "sysemu/sysemu.h" +#include "sysemu/block-backend.h" #include "exec/gdbstub.h" #include "sysemu/dma.h" #include "sysemu/kvm.h" @@ -734,7 +735,7 @@ static int do_vm_stop(RunState state) } bdrv_drain_all(); - ret = bdrv_flush_all(); + ret = blk_flush_all(); return ret; } @@ -1433,7 +1434,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 bdrv_flush_all(); + return blk_flush_all(); } } diff --git a/qemu-char.c b/qemu-char.c index 0a14e57839..bfcf80dd10 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -25,6 +25,7 @@ #include "qemu-common.h" #include "monitor/monitor.h" #include "sysemu/sysemu.h" +#include "sysemu/block-backend.h" #include "qemu/error-report.h" #include "qemu/timer.h" #include "sysemu/char.h" @@ -628,7 +629,7 @@ static int mux_proc_byte(CharDriverState *chr, MuxDriver *d, int ch) break; } case 's': - bdrv_commit_all(); + blk_commit_all(); break; case 'b': qemu_chr_be_event(chr, CHR_EVENT_BREAK); |