From patchwork Wed Aug 3 15:19:24 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 108293 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 DD4B8B71D4 for ; Thu, 4 Aug 2011 02:00:35 +1000 (EST) Received: from localhost ([::1]:39294 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QodF6-0002Qw-6K for incoming@patchwork.ozlabs.org; Wed, 03 Aug 2011 11:20:20 -0400 Received: from eggs.gnu.org ([140.186.70.92]:40100) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QodEn-0001qQ-Q7 for qemu-devel@nongnu.org; Wed, 03 Aug 2011 11:20:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QodEm-0006x4-OZ for qemu-devel@nongnu.org; Wed, 03 Aug 2011 11:20:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46717) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QodEm-0006wL-Fd for qemu-devel@nongnu.org; Wed, 03 Aug 2011 11:20:00 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p73FJsdK008689 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 3 Aug 2011 11:19:54 -0400 Received: from localhost (ovpn-113-124.phx2.redhat.com [10.3.113.124]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p73FJrhk026545; Wed, 3 Aug 2011 11:19:54 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 3 Aug 2011 12:19:24 -0300 Message-Id: <1312384765-721-5-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.68 on 10.5.11.25 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 4/5] ide: 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/ide/core.c | 16 ++++++++++++++++ hw/ide/internal.h | 2 ++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index ffb6500..3f075a1 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -58,6 +58,11 @@ static const int smart_attributes[][12] = { static int ide_handle_rw_error(IDEState *s, int error, int op); static void ide_dummy_transfer_stop(IDEState *s); +static void ide_update_iostatus(IDEState *s, int error) +{ + s->iostatus = bdrv_iostatus_from_error(error); +} + static void padstr(char *str, const char *src, int len) { int i, v; @@ -474,6 +479,7 @@ void ide_sector_read(IDEState *s) if (n > s->req_nb_sectors) n = s->req_nb_sectors; ret = bdrv_read(s->bs, sector_num, s->io_buffer, n); + ide_update_iostatus(s, ret); if (ret != 0) { if (ide_handle_rw_error(s, -ret, BM_STATUS_PIO_RETRY | BM_STATUS_RETRY_READ)) @@ -544,6 +550,7 @@ void ide_dma_cb(void *opaque, int ret) int64_t sector_num; handle_rw_error: + ide_update_iostatus(s, ret); if (ret < 0) { int op = BM_STATUS_DMA_RETRY; @@ -643,6 +650,7 @@ void ide_sector_write(IDEState *s) n = s->req_nb_sectors; ret = bdrv_write(s->bs, sector_num, s->io_buffer, n); + ide_update_iostatus(s, ret); if (ret != 0) { if (ide_handle_rw_error(s, -ret, BM_STATUS_PIO_RETRY)) return; @@ -678,6 +686,7 @@ static void ide_flush_cb(void *opaque, int ret) { IDEState *s = opaque; + ide_update_iostatus(s, ret); if (ret < 0) { /* XXX: What sector number to set here? */ if (ide_handle_rw_error(s, -ret, BM_STATUS_RETRY_FLUSH)) { @@ -1780,10 +1789,16 @@ static bool ide_cd_is_medium_locked(void *opaque) return ((IDEState *)opaque)->tray_locked; } +static BlockDevIOStatus ide_iostatus(void *opaque) +{ + return ((IDEState *)opaque)->iostatus; +} + static const BlockDevOps ide_cd_block_ops = { .change_media_cb = ide_cd_change_cb, .is_medium_ejected = ide_cd_medium_ejected, .is_medium_locked = ide_cd_is_medium_locked, + .get_iostatus = ide_iostatus, }; int ide_init_drive(IDEState *s, BlockDriverState *bs, IDEDriveKind kind, @@ -1843,6 +1858,7 @@ int ide_init_drive(IDEState *s, BlockDriverState *bs, IDEDriveKind kind, } else { pstrcpy(s->version, sizeof(s->version), QEMU_VERSION); } + s->iostatus = BDRV_IOS_INVAL; ide_reset(s); if (s->drive_kind == IDE_CD) { diff --git a/hw/ide/internal.h b/hw/ide/internal.h index 2feae25..3a9a2cf 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -480,6 +480,8 @@ struct IDEState { uint8_t *smart_selftest_data; /* AHCI */ int ncq_queues; + + BlockDevIOStatus iostatus; }; struct IDEDMAOps {