From patchwork Fri Jun 27 13:47:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 364972 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 58A891400DE for ; Fri, 27 Jun 2014 23:48:17 +1000 (EST) Received: from localhost ([::1]:50481 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X0WVj-0004Ij-JC for incoming@patchwork.ozlabs.org; Fri, 27 Jun 2014 09:48:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50274) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X0WV8-0003Mh-PY for qemu-devel@nongnu.org; Fri, 27 Jun 2014 09:47:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X0WUx-0005iJ-R4 for qemu-devel@nongnu.org; Fri, 27 Jun 2014 09:47:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:12769) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X0WUx-0005hv-Ie for qemu-devel@nongnu.org; Fri, 27 Jun 2014 09:47:27 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5RDlPlw030087 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Jun 2014 09:47:25 -0400 Received: from blackfin.pond.sub.org (ovpn-116-34.ams2.redhat.com [10.36.116.34]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s5RDlNBH022484 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 27 Jun 2014 09:47:24 -0400 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 91D8530403B0; Fri, 27 Jun 2014 15:47:22 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 27 Jun 2014 15:47:21 +0200 Message-Id: <1403876842-15926-2-git-send-email-armbru@redhat.com> In-Reply-To: <1403876842-15926-1-git-send-email-armbru@redhat.com> References: <1403876842-15926-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, wenchaoqemu@gmail.com, lcapitulino@redhat.com, stefanha@redhat.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH 2.1 1/2] blockjob: Fix recent BLOCK_JOB_READY regression X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Commit bcada37 dropped the (undocumented) members type, len, offset, speed, breaking tests/qemu-iotests/040 and 041. Restore them. This fixes 040, and partially fixes 041. Signed-off-by: Markus Armbruster --- blockjob.c | 6 +++++- qapi/block-core.json | 6 +++++- 2 files changed, 10 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..8f42f24 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1559,4 +1559,8 @@ # Since: 1.3 ## { 'event': 'BLOCK_JOB_READY', - 'data': { 'device': 'str' } } + 'data': { 'type' : 'BlockJobType', + 'device': 'str', + 'len' : 'int', + 'offset': 'int', + 'speed' : 'int' } }