diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-06-20 15:07:56 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-06-20 15:07:56 +0100 |
| commit | fd2590bccc0bd63833813592a3e193686cf1c623 (patch) | |
| tree | 2be06d9fe8553ef621282a2f068b133e160eeec7 /blockdev.c | |
| parent | 5edbd4e30426d3a0d712510b2509a521e35192b1 (diff) | |
| parent | 5ab4b69ce29908b327a91966dc78ea0fd7424075 (diff) | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Mon 20 Jun 2016 15:05:24 BST
# gpg: using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/block-pull-request:
backup: follow AioContext change gracefully
mirror: follow AioContext change gracefully
blockjob: add AioContext attached callback
block: use safe iteration over AioContext notifiers
blockjob: add block_job_get_aio_context()
blockjob: add pause points
blockjob: rename block_job_is_paused()
blockjob: move iostatus reset out of block_job_enter()
block: process before_write_notifiers in bdrv_co_discard
block: fix race in bdrv_co_discard with drive-mirror
block: fixed BdrvTrackedRequest filling in bdrv_co_discard
libqos: add qvirtqueue_cleanup()
libqos: drop duplicated virtio_pci.h definitions
libqos: drop duplicated virtio_scsi.h definitions
libqos: drop duplicated virtio_blk.h definitions
libqos: drop duplicated virtio_vring.h structs
libqos: drop duplicated virtio_ring.h bit definitions
libqos: drop duplicated virtio_config.h definitions
libqos: drop duplicated PCI vendor ID definition
libqos: use virtio_ids.h for device ID definitions
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'blockdev.c')
| -rw-r--r-- | blockdev.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/blockdev.c b/blockdev.c index c9a0068cd6..7299312632 100644 --- a/blockdev.c +++ b/blockdev.c @@ -3811,6 +3811,7 @@ void qmp_block_job_resume(const char *device, Error **errp) job->user_paused = false; trace_qmp_block_job_resume(job); + block_job_iostatus_reset(job); block_job_resume(job); aio_context_release(aio_context); } |