summaryrefslogtreecommitdiffstats
path: root/include/block/blockjob.h
diff options
context:
space:
mode:
authorVladimir Sementsov-Ogievskiy2021-05-06 16:13:57 +0200
committerVladimir Sementsov-Ogievskiy2021-12-28 15:18:59 +0100
commit985cac8f200443ad952becc03b07c51ff4f80983 (patch)
tree85b44c75f58b8bf7e4e2057e0ec17948c0248e6f /include/block/blockjob.h
parenttest-bdrv-drain: don't use BlockJob.blk (diff)
downloadqemu-985cac8f200443ad952becc03b07c51ff4f80983.tar.gz
qemu-985cac8f200443ad952becc03b07c51ff4f80983.tar.xz
qemu-985cac8f200443ad952becc03b07c51ff4f80983.zip
blockjob: drop BlockJob.blk field
It's unused now (except for permission handling)[*]. The only reasonable user of it was block-stream job, recently updated to use own blk. And other block jobs prefer to use own source node related objects. So, the arguments of dropping the field are: - block jobs prefer not to use it - block jobs usually has more then one node to operate on, and better to operate symmetrically (for example has both source and target blk's in specific block-job state structure) *: BlockJob.blk is used to keep some permissions. We simply move permissions to block-job child created in block_job_create() together with blk. In mirror, we just should not care anymore about restoring state of blk. Most probably this code could be dropped long ago, after dropping bs->job pointer. Now it finally goes away together with BlockJob.blk itself. iotest 141 output is updated, as "bdrv_has_blk(bs)" check in qmp_blockdev_del() doesn't fail (we don't have blk now). Still, new error message looks even better. In iotest 283 we need to add a job id, otherwise "Invalid job ID" happens now earlier than permission check (as permissions moved from blk to block-job node). Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by: Nikita Lapshin <nikita.lapshin@virtuozzo.com>
Diffstat (limited to 'include/block/blockjob.h')
-rw-r--r--include/block/blockjob.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/block/blockjob.h b/include/block/blockjob.h
index 3b84805140..87fbb3985f 100644
--- a/include/block/blockjob.h
+++ b/include/block/blockjob.h
@@ -43,9 +43,6 @@ typedef struct BlockJob {
/** Data belonging to the generic Job infrastructure */
Job job;
- /** The block device on which the job is operating. */
- BlockBackend *blk;
-
/** Status that is published by the query-block-jobs QMP API */
BlockDeviceIoStatus iostatus;