diff options
| author | John Snow <jsnow@redhat.com> | 2018-03-10 03:27:27 -0500 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2018-03-19 12:01:24 +0100 |
| commit | 75859b9420906f72c1c6d6273481ff30c141dbd5 (patch) | |
| tree | a2f6e91fbe15a7c9531046dfa45d3311b89efb25 /include/block | |
| parent | d4fce188448a273306b0c1c915e7bd91d6f83a6e (diff) | |
| download | qemu-75859b9420906f72c1c6d6273481ff30c141dbd5.zip | |
blockjobs: model single jobs as transactions
model all independent jobs as single job transactions.
It's one less case we have to worry about when we add more states to the
transition machine. This way, we can just treat all job lifetimes exactly
the same. This helps tighten assertions of the STM graph and removes some
conditionals that would have been needed in the coming commits adding a
more explicit job lifetime management API.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'include/block')
| -rw-r--r-- | include/block/blockjob.h | 1 | ||||
| -rw-r--r-- | include/block/blockjob_int.h | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/block/blockjob.h b/include/block/blockjob.h index 00403d9482..29cde3ffe3 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -141,7 +141,6 @@ typedef struct BlockJob { */ QEMUTimer sleep_timer; - /** Non-NULL if this job is part of a transaction */ BlockJobTxn *txn; QLIST_ENTRY(BlockJob) txn_list; } BlockJob; diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h index c9b23b0cc9..becaae74c2 100644 --- a/include/block/blockjob_int.h +++ b/include/block/blockjob_int.h @@ -115,6 +115,7 @@ struct BlockJobDriver { * @job_id: The id of the newly-created job, or %NULL to have one * generated automatically. * @job_type: The class object for the newly-created job. + * @txn: The transaction this job belongs to, if any. %NULL otherwise. * @bs: The block * @perm, @shared_perm: Permissions to request for @bs * @speed: The maximum speed, in bytes per second, or 0 for unlimited. @@ -132,7 +133,7 @@ struct BlockJobDriver { * called from a wrapper that is specific to the job type. */ void *block_job_create(const char *job_id, const BlockJobDriver *driver, - BlockDriverState *bs, uint64_t perm, + BlockJobTxn *txn, BlockDriverState *bs, uint64_t perm, uint64_t shared_perm, int64_t speed, int flags, BlockCompletionFunc *cb, void *opaque, Error **errp); |