diff options
| author | John Snow <jsnow@redhat.com> | 2017-05-10 13:39:45 -0400 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2017-05-11 12:08:24 +0200 |
| commit | 698bdfa07d66b5ec218a60229e58eae1dcde00e5 (patch) | |
| tree | 75fc21add7dd149d544e2e488e313fb4f8f13c86 /blockdev.c | |
| parent | c03e7ef12a954f715a4b56e3a9595f8253987701 (diff) | |
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>
Diffstat (limited to 'blockdev.c')
| -rw-r--r-- | blockdev.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/blockdev.c b/blockdev.c index 0d3773bcb8..c63f4e82c7 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2923,10 +2923,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, errp); + bdrv_drained_end(bs); out: blk_unref(blk); |