From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60696) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XhfNU-0001Z0-FX for qemu-devel@nongnu.org; Fri, 24 Oct 2014 09:58:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XhfNN-0006xZ-8V for qemu-devel@nongnu.org; Fri, 24 Oct 2014 09:58:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44438) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XhfNM-0006xK-W4 for qemu-devel@nongnu.org; Fri, 24 Oct 2014 09:57:57 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s9ODvuV6017213 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 24 Oct 2014 09:57:56 -0400 From: Max Reitz Date: Fri, 24 Oct 2014 15:57:34 +0200 Message-Id: <1414159063-25977-6-git-send-email-mreitz@redhat.com> In-Reply-To: <1414159063-25977-1-git-send-email-mreitz@redhat.com> References: <1414159063-25977-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v14 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 | 3 +++ include/block/blockjob.h | 5 +++++ qapi/block-core.json | 4 +++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/blockjob.c b/blockjob.c index a7d57e3..448b9ce 100644 --- a/blockjob.c +++ b/blockjob.c @@ -261,6 +261,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; } @@ -296,6 +297,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 ab11a0f..9694f13 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 8f7089e..77a0cfb 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -514,12 +514,14 @@ # # @io-status: the status of the job (since 1.3) # +# @ready: true if the job may be completed (since 2.2) +# # 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.3