diff options
| author | Fam Zheng <famz@redhat.com> | 2015-11-05 18:13:11 -0500 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2015-11-12 16:22:43 +0100 |
| commit | 18930ba3d17866fff6df52ae6d2e54ce5c5ca04b (patch) | |
| tree | d2105745115882ec2d58cbb2c8c58c3011393cb6 /include/block | |
| parent | b976ea3cf591ac994cc17dcf0fc550c9aa9c0f5d (diff) | |
| download | qemu-18930ba3d17866fff6df52ae6d2e54ce5c5ca04b.zip qemu-18930ba3d17866fff6df52ae6d2e54ce5c5ca04b.tar.gz qemu-18930ba3d17866fff6df52ae6d2e54ce5c5ca04b.tar.bz2 | |
blockjob: Introduce reference count and fix reference to job->bs
Add reference count to block job, meanwhile move the ownership of the
reference to job->bs from the caller (which is released in two
completion callbacks) to the block job itself. It is necessary for
block_job_complete_sync to work, because block job shouldn't live longer
than its bs, as asserted in bdrv_delete.
Now block_job_complete_sync can be simplified.
Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 1446765200-3054-6-git-send-email-jsnow@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'include/block')
| -rw-r--r-- | include/block/blockjob.h | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/include/block/blockjob.h b/include/block/blockjob.h index 289b13f..b649a40 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -130,6 +130,9 @@ struct BlockJob { /** The opaque value that is passed to the completion function. */ void *opaque; + + /** Reference count of the block job */ + int refcnt; }; /** @@ -174,12 +177,21 @@ void block_job_sleep_ns(BlockJob *job, QEMUClockType type, int64_t ns); void block_job_yield(BlockJob *job); /** - * block_job_release: + * block_job_ref: + * @bs: The block device. + * + * Grab a reference to the block job. Should be paired with block_job_unref. + */ +void block_job_ref(BlockJob *job); + +/** + * block_job_unref: * @bs: The block device. * - * Release job resources when an error occurred or job completed. + * Release reference to the block job and release resources if it is the last + * reference. */ -void block_job_release(BlockDriverState *bs); +void block_job_unref(BlockJob *job); /** * block_job_completed: |