From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:33813) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeACW-0000D5-Ja for qemu-devel@nongnu.org; Tue, 05 Jul 2011 14:18:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QeACU-00029J-A6 for qemu-devel@nongnu.org; Tue, 05 Jul 2011 14:18:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29949) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeACT-00028o-Qr for qemu-devel@nongnu.org; Tue, 05 Jul 2011 14:18:22 -0400 From: Luiz Capitulino Date: Tue, 5 Jul 2011 15:17:49 -0300 Message-Id: <1309889871-6267-7-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1309889871-6267-1-git-send-email-lcapitulino@redhat.com> References: <1309889871-6267-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 6/8] scsi: Support I/O status List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, jan.kiszka@siemens.com, armbru@redhat.com, stefanha@gmail.com, jdenemar@redhat.com Signed-off-by: Luiz Capitulino --- hw/scsi-disk.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 66037fd..7002560 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -137,10 +137,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; + bdrv_iostatus_update(s->bs, ret); if (ret) { if (scsi_handle_rw_error(r, -ret, SCSI_REQ_STATUS_RETRY_READ)) { return; @@ -243,11 +245,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; + bdrv_iostatus_update(s->bs, ret); if (ret) { if (scsi_handle_rw_error(r, -ret, SCSI_REQ_STATUS_RETRY_WRITE)) { return; @@ -905,6 +909,7 @@ static int scsi_disk_emulate_command(SCSIDiskReq *r, uint8_t *outbuf) break; case SYNCHRONIZE_CACHE: ret = bdrv_flush(s->bs); + bdrv_iostatus_update(s->bs, ret); if (ret < 0) { if (scsi_handle_rw_error(r, -ret, SCSI_REQ_STATUS_RETRY_FLUSH)) { return -1; @@ -1226,6 +1231,7 @@ static int scsi_initfn(SCSIDevice *dev, SCSIDriveKind kind) s->qdev.type = TYPE_DISK; qemu_add_vm_change_state_handler(scsi_dma_restart_cb, s); + bdrv_enable_iostatus(s->bs); bdrv_set_removable(s->bs, kind == SCSI_CD); add_boot_device_path(s->qdev.conf.bootindex, &dev->qdev, ",0"); return 0; -- 1.7.6.131.g99019