From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50282) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X0WVA-0003Mj-0w for qemu-devel@nongnu.org; Fri, 27 Jun 2014 09:47:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X0WUx-0005i6-GQ for qemu-devel@nongnu.org; Fri, 27 Jun 2014 09:47:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13164) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X0WUx-0005hx-7z for qemu-devel@nongnu.org; Fri, 27 Jun 2014 09:47:27 -0400 From: Markus Armbruster Date: Fri, 27 Jun 2014 15:47:22 +0200 Message-Id: <1403876842-15926-3-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> Subject: [Qemu-devel] [PATCH 2.1 2/2] blockjob: Fix recent BLOCK_JOB_ERROR 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 5a2d2cb screwed up the the value of members device and action, breaking tests/qemu-iotests/041. Signed-off-by: Markus Armbruster --- blockjob.c | 2 +- qapi/block-core.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blockjob.c b/blockjob.c index 37a8f1f..4d8ff45 100644 --- a/blockjob.c +++ b/blockjob.c @@ -286,7 +286,7 @@ BlockErrorAction block_job_error_action(BlockJob *job, BlockDriverState *bs, default: abort(); } - qapi_event_send_block_job_error(bdrv_get_device_name(bs), + qapi_event_send_block_job_error(bdrv_get_device_name(job->bs), is_read ? IO_OPERATION_TYPE_READ : IO_OPERATION_TYPE_WRITE, action, &error_abort); diff --git a/qapi/block-core.json b/qapi/block-core.json index 8f42f24..c339d05 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1544,7 +1544,7 @@ { 'event': 'BLOCK_JOB_ERROR', 'data': { 'device' : 'str', 'operation': 'IoOperationType', - 'action' : 'BlockdevOnError' } } + 'action' : 'BlockErrorAction' } } ## # @BLOCK_JOB_READY -- 1.9.3