diff options
Diffstat (limited to 'include/block')
-rw-r--r-- | include/block/blockjob.h | 9 | ||||
-rw-r--r-- | include/block/blockjob_int.h | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/include/block/blockjob.h b/include/block/blockjob.h index 0f56f72..640e649 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -26,6 +26,7 @@ #ifndef BLOCKJOB_H #define BLOCKJOB_H +#include "qemu/job.h" #include "block/block.h" #include "qemu/ratelimit.h" @@ -40,6 +41,9 @@ typedef struct BlockJobTxn BlockJobTxn; * Long-running operation on a BlockDriverState. */ typedef struct BlockJob { + /** Data belonging to the generic Job infrastructure */ + Job job; + /** The job type, including the job vtable. */ const BlockJobDriver *driver; @@ -47,11 +51,6 @@ typedef struct BlockJob { BlockBackend *blk; /** - * The ID of the block job. May be NULL for internal jobs. - */ - char *id; - - /** * The coroutine that executes the job. If not NULL, it is * reentered when busy is false and the job is cancelled. */ diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h index 62ec964..e8eca44 100644 --- a/include/block/blockjob_int.h +++ b/include/block/blockjob_int.h @@ -35,8 +35,8 @@ * A class type for block job driver. */ struct BlockJobDriver { - /** Derived BlockJob struct size */ - size_t instance_size; + /** Generic JobDriver callbacks and settings */ + JobDriver job_driver; /** String describing the operation, part of query-block-jobs QMP API */ BlockJobType job_type; |