From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39190) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WiU75-00013i-FL for qemu-devel@nongnu.org; Thu, 08 May 2014 15:36:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WiU6z-0007WL-1W for qemu-devel@nongnu.org; Thu, 08 May 2014 15:36:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52682) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WiU6y-0007WB-PA for qemu-devel@nongnu.org; Thu, 08 May 2014 15:36:08 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s48Ja8t9024756 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 8 May 2014 15:36:08 -0400 From: Max Reitz Date: Thu, 8 May 2014 21:35:39 +0200 Message-Id: <1399577748-18907-6-git-send-email-mreitz@redhat.com> In-Reply-To: <1399577748-18907-1-git-send-email-mreitz@redhat.com> References: <1399577748-18907-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v7 05/14] blockjob: Add "ready" field List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , Max Reitz 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 Reviewed-by: Eric Blake Reviewed-by: Kevin Wolf --- blockjob.c | 7 ++++++- include/block/blockjob.h | 5 +++++ qapi-schema.json | 4 +++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/blockjob.c b/blockjob.c index 9c7b198..a4271c1 100644 --- a/blockjob.c +++ b/blockjob.c @@ -242,6 +242,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; } @@ -270,7 +271,11 @@ QObject *qobject_from_block_job(BlockJob *job) void block_job_ready(BlockJob *job) { - QObject *data = qobject_from_block_job(job); + QObject *data; + + job->ready = true; + + data = qobject_from_block_job(job); monitor_protocol_event(QEVENT_BLOCK_JOB_READY, data); qobject_decref(data); } diff --git a/include/block/blockjob.h b/include/block/blockjob.h index 626ea42..4a920e7 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-schema.json b/qapi-schema.json index 36cb964..c9b9f09 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1578,12 +1578,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: -- 1.9.2