[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-stable] [PATCH 03/10] migration: added missed aio_context_acquire
From: |
Denis V. Lunev |
Subject: |
[Qemu-stable] [PATCH 03/10] migration: added missed aio_context_acquire around bdrv_snapshot_delete |
Date: |
Tue, 3 Nov 2015 17:12:06 +0300 |
Necessary for bdrv_drain to run properly.
Signed-off-by: Denis V. Lunev <address@hidden>
CC: Stefan Hajnoczi <address@hidden>
CC: Juan Quintela <address@hidden>
CC: Amit Shah <address@hidden>
---
migration/savevm.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/migration/savevm.c b/migration/savevm.c
index 1653f56..f45ff63 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1273,7 +1273,12 @@ static int del_existing_snapshots(Monitor *mon, const
char *name)
while ((bs = bdrv_next(bs))) {
if (bdrv_can_snapshot(bs) &&
bdrv_snapshot_find(bs, snapshot, name) >= 0) {
+ AioContext *ctx = bdrv_get_aio_context(bs);
+
+ aio_context_acquire(ctx);
bdrv_snapshot_delete_by_id_or_name(bs, name, &err);
+ aio_context_release(ctx);
+
if (err) {
monitor_printf(mon,
"Error while deleting snapshot on device '%s':"
@@ -1518,8 +1523,13 @@ void hmp_delvm(Monitor *mon, const QDict *qdict)
bs = NULL;
while ((bs = bdrv_next(bs))) {
if (bdrv_can_snapshot(bs)) {
+ AioContext *ctx = bdrv_get_aio_context(bs);
+
err = NULL;
+ aio_context_acquire(ctx);
bdrv_snapshot_delete_by_id_or_name(bs, name, &err);
+ aio_context_release(ctx);
+
if (err) {
monitor_printf(mon,
"Error while deleting snapshot on device '%s':"
--
2.5.0
- [Qemu-stable] [PATCH QEMU 2.5 v4 0/10] dataplane snapshot fixes + aio_poll fixes, Denis V. Lunev, 2015/11/03
- [Qemu-stable] [PATCH 01/10] migration: add missed aio_context_acquire for state writing/reading, Denis V. Lunev, 2015/11/03
- [Qemu-stable] [PATCH 02/10] block: add missed aio_context_acquire around bdrv_set_aio_context, Denis V. Lunev, 2015/11/03
- [Qemu-stable] [PATCH 03/10] migration: added missed aio_context_acquire around bdrv_snapshot_delete,
Denis V. Lunev <=
- [Qemu-stable] [PATCH 05/10] block: guard bdrv_drain in bdrv_close with aio_context_acquire, Denis V. Lunev, 2015/11/03
- [Qemu-stable] [PATCH 04/10] blockdev: acquire AioContext in hmp_commit(), Denis V. Lunev, 2015/11/03
- [Qemu-stable] [PATCH 07/10] block: call aio_context_acquire in qemu_img/nbd/io, Denis V. Lunev, 2015/11/03
- [Qemu-stable] [PATCH 08/10] fifolock: create rfifolock_is_owner helper, Denis V. Lunev, 2015/11/03
- [Qemu-stable] [PATCH 06/10] io: guard aio_poll with aio_context_acquire, Denis V. Lunev, 2015/11/03
- [Qemu-stable] [PATCH 09/10] aio_context: create aio_context_is_owner helper, Denis V. Lunev, 2015/11/03
- [Qemu-stable] [PATCH 10/10] aio: change aio_poll constraints, Denis V. Lunev, 2015/11/03