From patchwork Wed Apr 28 20:32:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 51252 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 73DF8B7D12 for ; Thu, 29 Apr 2010 07:28:29 +1000 (EST) Received: from localhost ([127.0.0.1]:46375 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O7Eny-0007PN-Bo for incoming@patchwork.ozlabs.org; Wed, 28 Apr 2010 17:28:26 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O7Dvr-00053k-N2 for qemu-devel@nongnu.org; Wed, 28 Apr 2010 16:32:31 -0400 Received: from [140.186.70.92] (port=45146 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O7Dvm-0004xw-Ek for qemu-devel@nongnu.org; Wed, 28 Apr 2010 16:32:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O7Dvk-0001ze-K4 for qemu-devel@nongnu.org; Wed, 28 Apr 2010 16:32:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20441) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O7Dvk-0001zO-7X for qemu-devel@nongnu.org; Wed, 28 Apr 2010 16:32:24 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o3SKWNJ5027680 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 28 Apr 2010 16:32:23 -0400 Received: from localhost (vpn-8-180.rdu.redhat.com [10.11.8.180]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o3SKWMcp008408; Wed, 28 Apr 2010 16:32:22 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 28 Apr 2010 17:32:09 -0300 Message-Id: <1272486729-14771-3-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1272486729-14771-1-git-send-email-lcapitulino@redhat.com> References: <1272486729-14771-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: armbru@redhat.com Subject: [Qemu-devel] [PATCH 2/2] QMP: Add 'reason' member to the BLOCK_IO_ERROR event X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org It's a parsable errno string representation, this is needed because some management tools want to base their action on the error cause. Signed-off-by: Luiz Capitulino --- QMP/qmp-events.txt | 4 +++- block.c | 8 +++++--- block.h | 2 +- hw/ide/core.c | 6 +++--- hw/scsi-disk.c | 6 +++--- hw/virtio-blk.c | 6 +++--- 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/QMP/qmp-events.txt b/QMP/qmp-events.txt index 01ec85f..47097fd 100644 --- a/QMP/qmp-events.txt +++ b/QMP/qmp-events.txt @@ -14,13 +14,15 @@ Data: "ignore": error has been ignored "report": error has been reported to the device "stop": error caused VM to be stopped +- "reason": errno string representation (json-string) Example: { "event": "BLOCK_IO_ERROR", "data": { "device": "ide0-hd1", "operation": "write", - "action": "stop" }, + "action": "stop", + "reason": "EINTR" }, "timestamp": { "seconds": 1265044230, "microseconds": 450486 } } Note: If action is "stop", a STOP event will eventually follow the diff --git a/block.c b/block.c index 7974215..1179b1c 100644 --- a/block.c +++ b/block.c @@ -1236,7 +1236,7 @@ int bdrv_is_allocated(BlockDriverState *bs, int64_t sector_num, int nb_sectors, } void bdrv_mon_event(const BlockDriverState *bdrv, - BlockMonEventAction action, int is_read) + BlockMonEventAction action, int error, int is_read) { QObject *data; const char *action_str; @@ -1255,10 +1255,12 @@ void bdrv_mon_event(const BlockDriverState *bdrv, abort(); } - data = qobject_from_jsonf("{ 'device': %s, 'action': %s, 'operation': %s }", + data = qobject_from_jsonf("{ 'device': %s, 'action': %s, " + "'operation': %s, 'reason': %s }", bdrv->device_name, action_str, - is_read ? "read" : "write"); + is_read ? "read" : "write", + get_errno_name(errno)); monitor_protocol_event(QEVENT_BLOCK_IO_ERROR, data); qobject_decref(data); diff --git a/block.h b/block.h index 05ad572..9696081 100644 --- a/block.h +++ b/block.h @@ -45,7 +45,7 @@ typedef enum { } BlockMonEventAction; void bdrv_mon_event(const BlockDriverState *bdrv, - BlockMonEventAction action, int is_read); + BlockMonEventAction action, int error, int is_read); void bdrv_info_print(Monitor *mon, const QObject *data); void bdrv_info(Monitor *mon, QObject **ret_data); void bdrv_stats_print(Monitor *mon, const QObject *data); diff --git a/hw/ide/core.c b/hw/ide/core.c index 0757528..1ce0cdd 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -484,7 +484,7 @@ static int ide_handle_rw_error(IDEState *s, int error, int op) BlockInterfaceErrorAction action = drive_get_on_error(s->bs, is_read); if (action == BLOCK_ERR_IGNORE) { - bdrv_mon_event(s->bs, BDRV_ACTION_IGNORE, is_read); + bdrv_mon_event(s->bs, BDRV_ACTION_IGNORE, error, is_read); return 0; } @@ -492,7 +492,7 @@ static int ide_handle_rw_error(IDEState *s, int error, int op) || action == BLOCK_ERR_STOP_ANY) { s->bus->bmdma->unit = s->unit; s->bus->bmdma->status |= op; - bdrv_mon_event(s->bs, BDRV_ACTION_STOP, is_read); + bdrv_mon_event(s->bs, BDRV_ACTION_STOP, error, is_read); vm_stop(0); } else { if (op & BM_STATUS_DMA_RETRY) { @@ -501,7 +501,7 @@ static int ide_handle_rw_error(IDEState *s, int error, int op) } else { ide_rw_error(s); } - bdrv_mon_event(s->bs, BDRV_ACTION_REPORT, is_read); + bdrv_mon_event(s->bs, BDRV_ACTION_REPORT, error, is_read); } return 1; diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 77cb1da..1df9552 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -182,19 +182,19 @@ static int scsi_handle_write_error(SCSIDiskReq *r, int error) BlockInterfaceErrorAction action = drive_get_on_error(s->bs, 0); if (action == BLOCK_ERR_IGNORE) { - bdrv_mon_event(s->bs, BDRV_ACTION_IGNORE, 0); + bdrv_mon_event(s->bs, BDRV_ACTION_IGNORE, error, 0); return 0; } if ((error == ENOSPC && action == BLOCK_ERR_STOP_ENOSPC) || action == BLOCK_ERR_STOP_ANY) { r->status |= SCSI_REQ_STATUS_RETRY; - bdrv_mon_event(s->bs, BDRV_ACTION_STOP, 0); + bdrv_mon_event(s->bs, BDRV_ACTION_STOP, error, 0); vm_stop(0); } else { scsi_command_complete(r, CHECK_CONDITION, HARDWARE_ERROR); - bdrv_mon_event(s->bs, BDRV_ACTION_REPORT, 0); + bdrv_mon_event(s->bs, BDRV_ACTION_REPORT, error, 0); } return 1; diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index b05d15e..b0c504e 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -65,7 +65,7 @@ static int virtio_blk_handle_rw_error(VirtIOBlockReq *req, int error, VirtIOBlock *s = req->dev; if (action == BLOCK_ERR_IGNORE) { - bdrv_mon_event(s->bs, BDRV_ACTION_IGNORE, is_read); + bdrv_mon_event(s->bs, BDRV_ACTION_IGNORE, error, is_read); return 0; } @@ -73,11 +73,11 @@ static int virtio_blk_handle_rw_error(VirtIOBlockReq *req, int error, || action == BLOCK_ERR_STOP_ANY) { req->next = s->rq; s->rq = req; - bdrv_mon_event(s->bs, BDRV_ACTION_STOP, is_read); + bdrv_mon_event(s->bs, BDRV_ACTION_STOP, error, is_read); vm_stop(0); } else { virtio_blk_req_complete(req, VIRTIO_BLK_S_IOERR); - bdrv_mon_event(s->bs, BDRV_ACTION_REPORT, is_read); + bdrv_mon_event(s->bs, BDRV_ACTION_REPORT, error, is_read); } return 1;