[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 06/14] block: Use blk_{commit, flush}_all() consi
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v3 06/14] block: Use blk_{commit, flush}_all() consistently |
Date: |
Tue, 16 Feb 2016 19:08:18 +0100 |
Replace bdrv_commmit_all() and bdrv_flush_all() by their BlockBackend
equivalents.
Signed-off-by: Max Reitz <address@hidden>
---
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 8eff47d..46cd8a9 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1175,7 +1175,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 898426c..2d34518 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"
@@ -726,7 +727,7 @@ static int do_vm_stop(RunState state)
}
bdrv_drain_all();
- ret = bdrv_flush_all();
+ ret = blk_flush_all();
return ret;
}
@@ -1428,7 +1429,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 1b7d5da..bd58df2 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"
@@ -561,7 +562,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);
--
2.7.1
- [Qemu-devel] [PATCH v3 00/14] blockdev: Further BlockBackend work, Max Reitz, 2016/02/16
- [Qemu-devel] [PATCH v3 02/14] block: Use blk_next() where appropriate, Max Reitz, 2016/02/16
- [Qemu-devel] [PATCH v3 01/14] monitor: Use BB list for BB name completion, Max Reitz, 2016/02/16
- [Qemu-devel] [PATCH v3 03/14] block: Add blk_all_next(), Max Reitz, 2016/02/16
- [Qemu-devel] [PATCH v3 04/14] block: Add blk_name_taken(), Max Reitz, 2016/02/16
- [Qemu-devel] [PATCH v3 06/14] block: Use blk_{commit, flush}_all() consistently,
Max Reitz <=
- [Qemu-devel] [PATCH v3 08/14] blockdev: Remove blk_hide_on_behalf_of_hmp_drive_del(), Max Reitz, 2016/02/16
- [Qemu-devel] [PATCH v3 05/14] block: Add blk_commit_all(), Max Reitz, 2016/02/16
- [Qemu-devel] [PATCH v3 09/14] block: Move some bdrv_*_all() functions to BB, Max Reitz, 2016/02/16
- [Qemu-devel] [PATCH v3 07/14] blockdev: Add list of monitor-owned BlockBackends, Max Reitz, 2016/02/16