| Message ID | 1404582448-23840-6-git-send-email-mreitz@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 07/05/2014 11:47 AM, Max Reitz wrote: > When a block job signals readiness, this is currently reported only > through QMP. If qemu wants to use block jobs for internal tasks, there > needs to be another way to correctly detect when a block job may be > completed. > > For this reason, introduce a bool "ready" which is set when the block > job may be completed. > > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > blockjob.c | 3 +++ > include/block/blockjob.h | 5 +++++ > qapi/block-core.json | 4 +++- > 3 files changed, 11 insertions(+), 1 deletion(-) > > +++ b/qapi/block-core.json > @@ -505,12 +505,14 @@ > # > # @io-status: the status of the job (since 1.3) > # > +# @ready: true if the job may be completed (since 2.1) Isn't this 2.2 now, or are you still shooting for calling this a bug fix in 2.1 hard freeze? Depending on the answer, Reviewed-by: Eric Blake <eblake@redhat.com>
On 07.07.2014 20:53, Eric Blake wrote: > On 07/05/2014 11:47 AM, Max Reitz wrote: >> When a block job signals readiness, this is currently reported only >> through QMP. If qemu wants to use block jobs for internal tasks, there >> needs to be another way to correctly detect when a block job may be >> completed. >> >> For this reason, introduce a bool "ready" which is set when the block >> job may be completed. >> >> Signed-off-by: Max Reitz <mreitz@redhat.com> >> --- >> blockjob.c | 3 +++ >> include/block/blockjob.h | 5 +++++ >> qapi/block-core.json | 4 +++- >> 3 files changed, 11 insertions(+), 1 deletion(-) >> >> +++ b/qapi/block-core.json >> @@ -505,12 +505,14 @@ >> # >> # @io-status: the status of the job (since 1.3) >> # >> +# @ready: true if the job may be completed (since 2.1) > Isn't this 2.2 now, or are you still shooting for calling this a bug fix > in 2.1 hard freeze? Ah, right, I forgot. This should be 2.2, of course. Max > Depending on the answer, > Reviewed-by: Eric Blake <eblake@redhat.com>
diff --git a/blockjob.c b/blockjob.c index 2c98689..ff1d78e 100644 --- a/blockjob.c +++ b/blockjob.c @@ -260,6 +260,7 @@ BlockJobInfo *block_job_query(BlockJob *job) info->offset = job->offset; info->speed = job->speed; info->io_status = job->iostatus; + info->ready = job->ready; return info; } @@ -295,6 +296,8 @@ void block_job_event_completed(BlockJob *job, const char *msg) void block_job_event_ready(BlockJob *job) { + job->ready = true; + qapi_event_send_block_job_ready(job->driver->job_type, bdrv_get_device_name(job->bs), job->len, diff --git a/include/block/blockjob.h b/include/block/blockjob.h index 88f4be2..97658ca 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -91,6 +91,11 @@ struct BlockJob { */ bool busy; + /** + * Set to true when the job is ready to be completed. + */ + bool ready; + /** Status that is published by the query-block-jobs QMP API */ BlockDeviceIoStatus iostatus; diff --git a/qapi/block-core.json b/qapi/block-core.json index e378653..72ebfef 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -505,12 +505,14 @@ # # @io-status: the status of the job (since 1.3) # +# @ready: true if the job may be completed (since 2.1) +# # Since: 1.1 ## { 'type': 'BlockJobInfo', 'data': {'type': 'str', 'device': 'str', 'len': 'int', 'offset': 'int', 'busy': 'bool', 'paused': 'bool', 'speed': 'int', - 'io-status': 'BlockDeviceIoStatus'} } + 'io-status': 'BlockDeviceIoStatus', 'ready': 'bool'} } ## # @query-block-jobs:
When a block job signals readiness, this is currently reported only through QMP. If qemu wants to use block jobs for internal tasks, there needs to be another way to correctly detect when a block job may be completed. For this reason, introduce a bool "ready" which is set when the block job may be completed. Signed-off-by: Max Reitz <mreitz@redhat.com> --- blockjob.c | 3 +++ include/block/blockjob.h | 5 +++++ qapi/block-core.json | 4 +++- 3 files changed, 11 insertions(+), 1 deletion(-)