From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37657) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agaIJ-0001ru-4b for qemu-devel@nongnu.org; Thu, 17 Mar 2016 11:57:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1agaII-0001hM-7R for qemu-devel@nongnu.org; Thu, 17 Mar 2016 11:57:03 -0400 From: Kevin Wolf Date: Thu, 17 Mar 2016 16:56:19 +0100 Message-Id: <1458230202-29136-7-git-send-email-kwolf@redhat.com> In-Reply-To: <1458230202-29136-1-git-send-email-kwolf@redhat.com> References: <1458230202-29136-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 06/29] block: Use blk_{commit, flush}_all() consistently List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Max Reitz Replace bdrv_commmit_all() and bdrv_flush_all() by their BlockBackend equivalents. Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- blockdev.c | 2 +- cpus.c | 5 +++-- qemu-char.c | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/blockdev.c b/blockdev.c index 50410bf..5be7d4b 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; diff --git a/cpus.c b/cpus.c index 4052be5..23cf7aa 100644 --- a/cpus.c +++ b/cpus.c @@ -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 0a14e57..bfcf80d 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); -- 1.8.3.1