From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X0ag2-0008V0-M1 for qemu-devel@nongnu.org; Fri, 27 Jun 2014 14:15:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X0afv-0005NY-P1 for qemu-devel@nongnu.org; Fri, 27 Jun 2014 14:15:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50949) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X0afv-0005Mt-Gb for qemu-devel@nongnu.org; Fri, 27 Jun 2014 14:15:03 -0400 From: Markus Armbruster Date: Fri, 27 Jun 2014 19:24:13 +0200 Message-Id: <1403889855-5740-2-git-send-email-armbru@redhat.com> In-Reply-To: <1403889855-5740-1-git-send-email-armbru@redhat.com> References: <1403889855-5740-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 2.1 1/3] blockjob: Fix recent BLOCK_JOB_READY regression List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, wenchaoqemu@gmail.com, lcapitulino@redhat.com, stefanha@redhat.com, pbonzini@redhat.com Commit bcada37 dropped the (up to now undocumented) members type, len, offset, speed, breaking tests/qemu-iotests/040 and 041. Restore and document them. This fixes 040, and partially fixes 041. Signed-off-by: Markus Armbruster Tested-By: Benoit Canet --- blockjob.c | 6 +++++- qapi/block-core.json | 15 ++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/blockjob.c b/blockjob.c index 4da86cd..37a8f1f 100644 --- a/blockjob.c +++ b/blockjob.c @@ -256,7 +256,11 @@ void block_job_event_completed(BlockJob *job, const char *msg) void block_job_event_ready(BlockJob *job) { - qapi_event_send_block_job_ready(bdrv_get_device_name(job->bs), &error_abort); + qapi_event_send_block_job_ready(job->driver->job_type, + bdrv_get_device_name(job->bs), + job->len, + job->offset, + job->speed, &error_abort); } BlockErrorAction block_job_error_action(BlockJob *job, BlockDriverState *bs, diff --git a/qapi/block-core.json b/qapi/block-core.json index af6b436..822fe16 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1551,12 +1551,25 @@ # # Emitted when a block job is ready to complete # +# @type: job type +# # @device: device name # +# @len: maximum progress value +# +# @offset: current progress value. On success this is equal to len. +# On failure this is less than len +# +# @speed: rate limit, bytes per second +# # Note: The "ready to complete" status is always reset by a @BLOCK_JOB_ERROR # event # # Since: 1.3 ## { 'event': 'BLOCK_JOB_READY', - 'data': { 'device': 'str' } } + 'data': { 'type' : 'BlockJobType', + 'device': 'str', + 'len' : 'int', + 'offset': 'int', + 'speed' : 'int' } } -- 1.9.3