From patchwork Wed Feb 3 14:41:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 44380 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 6DA58B7D4C for ; Thu, 4 Feb 2010 02:06:09 +1100 (EST) Received: from localhost ([127.0.0.1]:35573 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ncgbd-0006mB-5u for incoming@patchwork.ozlabs.org; Wed, 03 Feb 2010 09:53:25 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NcgQ7-0001Ln-0p for qemu-devel@nongnu.org; Wed, 03 Feb 2010 09:41:31 -0500 Received: from [199.232.76.173] (port=38066 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NcgQ6-0001LZ-Ld for qemu-devel@nongnu.org; Wed, 03 Feb 2010 09:41:30 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NcgQ5-0003ng-MS for qemu-devel@nongnu.org; Wed, 03 Feb 2010 09:41:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45571) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NcgQ4-0003my-Tx for qemu-devel@nongnu.org; Wed, 03 Feb 2010 09:41:29 -0500 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o13EfOHL024021 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 3 Feb 2010 09:41:24 -0500 Received: from localhost (vpn-11-121.rdu.redhat.com [10.11.11.121]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o13EfNd9015551; Wed, 3 Feb 2010 09:41:24 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 3 Feb 2010 12:41:03 -0200 Message-Id: <1265208064-16039-5-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1265208064-16039-1-git-send-email-lcapitulino@redhat.com> References: <1265208064-16039-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com Subject: [Qemu-devel] [PATCH 4/5] scsi: Generate BLOCK_IO_ERROR QMP 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 Just call bdrv_mon_event() in the right place. Signed-off-by: Luiz Capitulino --- hw/scsi-disk.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index b34fbaa..1285122 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -182,16 +182,20 @@ static int scsi_handle_write_error(SCSIDiskReq *r, int error) BlockInterfaceErrorAction action = drive_get_on_error(s->qdev.dinfo->bdrv, 0); - if (action == BLOCK_ERR_IGNORE) + if (action == BLOCK_ERR_IGNORE) { + bdrv_mon_event(s->qdev.dinfo->bdrv, BDRV_ACTION_IGNORE, 0); return 0; + } if ((error == ENOSPC && action == BLOCK_ERR_STOP_ENOSPC) || action == BLOCK_ERR_STOP_ANY) { r->status |= SCSI_REQ_STATUS_RETRY; vm_stop(0); + bdrv_mon_event(s->qdev.dinfo->bdrv, BDRV_ACTION_STOP, 0); } else { scsi_command_complete(r, CHECK_CONDITION, HARDWARE_ERROR); + bdrv_mon_event(s->qdev.dinfo->bdrv, BDRV_ACTION_REPORT, 0); } return 1;