From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X0bXD-0005jW-PE for qemu-devel@nongnu.org; Fri, 27 Jun 2014 15:10:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X0bX8-00077A-Nu for qemu-devel@nongnu.org; Fri, 27 Jun 2014 15:10:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:31387) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X0bX8-00076S-G3 for qemu-devel@nongnu.org; Fri, 27 Jun 2014 15:10:02 -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 s5RJA1EP009588 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 27 Jun 2014 15:10:02 -0400 From: Kevin Wolf Date: Fri, 27 Jun 2014 21:08:57 +0200 Message-Id: <1403896146-3063-39-git-send-email-kwolf@redhat.com> In-Reply-To: <1403896146-3063-1-git-send-email-kwolf@redhat.com> References: <1403896146-3063-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 38/47] 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 From: Markus Armbruster Commit 5a2d2cb screwed up the the value of members device and action, breaking tests/qemu-iotests/041. Signed-off-by: Markus Armbruster Tested-By: Benoit Canet Reviewed-by: Kevin Wolf Reviewed-by: Luiz Capitulino Signed-off-by: Kevin Wolf --- blockjob.c | 2 +- qapi/block-core.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blockjob.c b/blockjob.c index a32c1c8..67a64ea 100644 --- a/blockjob.c +++ b/blockjob.c @@ -300,7 +300,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 6f41f84..ff7224f 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1551,7 +1551,7 @@ { 'event': 'BLOCK_JOB_ERROR', 'data': { 'device' : 'str', 'operation': 'IoOperationType', - 'action' : 'BlockdevOnError' } } + 'action' : 'BlockErrorAction' } } ## # @BLOCK_JOB_READY -- 1.8.3.1