45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
From 0720bbba9f7ebac6f4f0ae7a65cd687ac6f3c452 Mon Sep 17 00:00:00 2001
|
|
From: John Snow <jsnow@redhat.com>
|
|
Date: Wed, 10 May 2017 13:39:45 -0400
|
|
Subject: [PATCH 05/23] blockdev: use drained_begin/end for qmp_block_resize
|
|
|
|
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1447551
|
|
|
|
If one tries to issue a block_resize while a guest is busy
|
|
accessing the disk, it is possible that qemu may deadlock
|
|
when invoking aio_poll from both the main loop and the iothread.
|
|
|
|
Replace another instance of bdrv_drain_all that doesn't
|
|
quite belong.
|
|
|
|
Cc: qemu-stable@nongnu.org
|
|
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
---
|
|
blockdev.c | 5 ++---
|
|
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/blockdev.c b/blockdev.c
|
|
index 1eeffb0571..1dca232781 100644
|
|
--- a/blockdev.c
|
|
+++ b/blockdev.c
|
|
@@ -2929,10 +2929,9 @@ void qmp_block_resize(bool has_device, const char *device,
|
|
goto out;
|
|
}
|
|
|
|
- /* complete all in-flight operations before resizing the device */
|
|
- bdrv_drain_all();
|
|
-
|
|
+ bdrv_drained_begin(bs);
|
|
ret = blk_truncate(blk, size);
|
|
+ bdrv_drained_end(bs);
|
|
switch (ret) {
|
|
case 0:
|
|
break;
|
|
--
|
|
2.11.0
|
|
|