From patchwork Wed Aug 3 15:19:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 108297 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 22E47B71E0 for ; Thu, 4 Aug 2011 02:06:16 +1000 (EST) Received: from localhost ([::1]:52977 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QodL9-0005ME-NP for incoming@patchwork.ozlabs.org; Wed, 03 Aug 2011 11:26:35 -0400 Received: from eggs.gnu.org ([140.186.70.92]:40133) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QodFR-0003WU-Lx for qemu-devel@nongnu.org; Wed, 03 Aug 2011 11:20:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QodFG-00073O-Ea for qemu-devel@nongnu.org; Wed, 03 Aug 2011 11:20:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14548) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QodFG-0006wx-2j for qemu-devel@nongnu.org; Wed, 03 Aug 2011 11:20:30 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p73FJujE001619 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 3 Aug 2011 11:19:56 -0400 Received: from localhost (ovpn-113-124.phx2.redhat.com [10.3.113.124]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p73FJtBn025424; Wed, 3 Aug 2011 11:19:56 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 3 Aug 2011 12:19:25 -0300 Message-Id: <1312384765-721-6-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1312384765-721-1-git-send-email-lcapitulino@redhat.com> References: <1312384765-721-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, aliguori@us.ibm.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 5/5] scsi-disk: Support I/O status 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 TODO: migration Signed-off-by: Luiz Capitulino --- hw/scsi-disk.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index db2d5a3..e4b57a7 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -77,11 +77,17 @@ struct SCSIDiskState bool tray_open; bool tray_locked; SCSIDriveKind drive_kind; + BlockDevIOStatus iostatus; }; static int scsi_handle_rw_error(SCSIDiskReq *r, int error, int type); static int scsi_disk_emulate_command(SCSIDiskReq *r, uint8_t *outbuf); +static void scsi_update_iostatus(SCSIDiskState *s, int error) +{ + s->iostatus = bdrv_iostatus_from_error(error); +} + static SCSIRequest *scsi_new_request(SCSIDevice *d, uint32_t tag, uint32_t lun, void *hba_private) { @@ -139,10 +145,12 @@ static void scsi_cancel_io(SCSIRequest *req) static void scsi_read_complete(void * opaque, int ret) { SCSIDiskReq *r = (SCSIDiskReq *)opaque; + SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev); int n; r->req.aiocb = NULL; + scsi_update_iostatus(s, ret); if (ret) { if (scsi_handle_rw_error(r, -ret, SCSI_REQ_STATUS_RETRY_READ)) { return; @@ -247,11 +255,13 @@ static int scsi_handle_rw_error(SCSIDiskReq *r, int error, int type) static void scsi_write_complete(void * opaque, int ret) { SCSIDiskReq *r = (SCSIDiskReq *)opaque; + SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev); uint32_t len; uint32_t n; r->req.aiocb = NULL; + scsi_update_iostatus(s, ret); if (ret) { if (scsi_handle_rw_error(r, -ret, SCSI_REQ_STATUS_RETRY_WRITE)) { return; @@ -940,6 +950,7 @@ static int scsi_disk_emulate_command(SCSIDiskReq *r, uint8_t *outbuf) break; case SYNCHRONIZE_CACHE: ret = bdrv_flush(s->bs); + scsi_update_iostatus(s, ret); if (ret < 0) { if (scsi_handle_rw_error(r, -ret, SCSI_REQ_STATUS_RETRY_FLUSH)) { return -1; @@ -1298,10 +1309,16 @@ static bool scsi_cd_is_medium_locked(void *opaque) return ((SCSIDiskState *)opaque)->tray_locked; } +static BlockDevIOStatus scsi_iostatus(void *opaque) +{ + return ((SCSIDiskState *)opaque)->iostatus; +} + static const BlockDevOps scsi_cd_block_ops = { .change_media_cb = scsi_cd_change_media_cb, .is_medium_ejected = scsi_cd_is_medium_ejected, .is_medium_locked = scsi_cd_is_medium_locked, + .get_iostatus = scsi_iostatus, }; static int scsi_initfn(SCSIDevice *dev, SCSIDriveKind kind) @@ -1347,6 +1364,7 @@ static int scsi_initfn(SCSIDevice *dev, SCSIDriveKind kind) s->cluster_size = s->qdev.blocksize / 512; bdrv_set_buffer_alignment(s->bs, s->qdev.blocksize); + s->iostatus = BDRV_IOS_INVAL; s->qdev.type = TYPE_DISK; qemu_add_vm_change_state_handler(scsi_dma_restart_cb, s); if (kind == SCSI_CD) {