[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/11] migration: add missed aio_context_acquire for
From: |
Denis V. Lunev |
Subject: |
[Qemu-devel] [PATCH 09/11] migration: add missed aio_context_acquire for state writing/reading |
Date: |
Wed, 4 Nov 2015 20:19:40 +0300 |
aio_context should be locked in the similar way as was done in QMP
snapshot creation in the other case there are a lot of possible
troubles if native AIO mode is enabled for disk.
qemu_fopen_bdrv and bdrv_fclose are used in real snapshot operations only
along with block drivers. This change should influence only HMP snapshot
operations.
AioContext lock is reqursive. Thus nested locking should not be a problem.
Signed-off-by: Denis V. Lunev <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
CC: Stefan Hajnoczi <address@hidden>
CC: Kevin Wolf <address@hidden>
---
migration/savevm.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/migration/savevm.c b/migration/savevm.c
index 9339f2e..f8c727d 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -153,7 +153,11 @@ static ssize_t block_get_buffer(void *opaque, uint8_t
*buf, int64_t pos,
static int bdrv_fclose(void *opaque)
{
- return bdrv_flush(opaque);
+ BlockDriverState *bs = (BlockDriverState *)opaque;
+ int ret = bdrv_flush(bs);
+
+ aio_context_release(bdrv_get_aio_context(bs));
+ return ret;
}
static const QEMUFileOps bdrv_read_ops = {
@@ -169,10 +173,18 @@ static const QEMUFileOps bdrv_write_ops = {
static QEMUFile *qemu_fopen_bdrv(BlockDriverState *bs, int is_writable)
{
+ QEMUFile *file;
+
if (is_writable) {
- return qemu_fopen_ops(bs, &bdrv_write_ops);
+ file = qemu_fopen_ops(bs, &bdrv_write_ops);
+ } else {
+ file = qemu_fopen_ops(bs, &bdrv_read_ops);
+ }
+
+ if (file != NULL) {
+ aio_context_acquire(bdrv_get_aio_context(bs));
}
- return qemu_fopen_ops(bs, &bdrv_read_ops);
+ return file;
}
--
2.5.0
- Re: [Qemu-devel] [PATCH 01/11] snapshot: create helper to test that block drivers supports snapshots, (continued)
- [Qemu-devel] [PATCH 04/11] snapshot: create bdrv_all_goto_snapshot helper, Denis V. Lunev, 2015/11/04
- [Qemu-devel] [PATCH 07/11] migration: reorder processing in hmp_savevm, Denis V. Lunev, 2015/11/04
- [Qemu-devel] [PATCH 05/11] snapshot: create bdrv_all_find_snapshot helper, Denis V. Lunev, 2015/11/04
- [Qemu-devel] [PATCH 08/11] migration: implement bdrv_all_find_vmstate_bs and bdrv_unlock helpers, Denis V. Lunev, 2015/11/04
- [Qemu-devel] [PATCH 09/11] migration: add missed aio_context_acquire for state writing/reading,
Denis V. Lunev <=
- [Qemu-devel] [PATCH 06/11] migration: drop find_vmstate_bs check in hmp_delvm, Denis V. Lunev, 2015/11/04
- [Qemu-devel] [PATCH 11/11] monitor: add missed aio_context_acquire into vm_completion call, Denis V. Lunev, 2015/11/04
- [Qemu-devel] [PATCH 10/11] snapshot: create bdrv_all_create_snapshot helper, Denis V. Lunev, 2015/11/04
- Re: [Qemu-devel] [PATCH 2.5 v5 0/11] dataplane snapshot fixes, Stefan Hajnoczi, 2015/11/06