From patchwork Tue Jul 5 18:17:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 103366 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 8BE72B6F00 for ; Wed, 6 Jul 2011 04:48:48 +1000 (EST) Received: from localhost ([::1]:46272 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeAfs-0007EQ-ID for incoming@patchwork.ozlabs.org; Tue, 05 Jul 2011 14:48:44 -0400 Received: from eggs.gnu.org ([140.186.70.92]:33778) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeACT-0000Aj-Gg for qemu-devel@nongnu.org; Tue, 05 Jul 2011 14:18:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QeACR-00028X-Ki for qemu-devel@nongnu.org; Tue, 05 Jul 2011 14:18:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48708) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeACR-00028M-5M for qemu-devel@nongnu.org; Tue, 05 Jul 2011 14:18:19 -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.14.4/8.14.4) with ESMTP id p65IIEUh024476 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 5 Jul 2011 14:18:14 -0400 Received: from localhost (ovpn-113-99.phx2.redhat.com [10.3.113.99]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p65IIDoE011543; Tue, 5 Jul 2011 14:18:13 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Tue, 5 Jul 2011 15:17:47 -0300 Message-Id: <1309889871-6267-5-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> 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. X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, jan.kiszka@siemens.com, armbru@redhat.com, stefanha@gmail.com, jdenemar@redhat.com Subject: [Qemu-devel] [PATCH 4/8] 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 Signed-off-by: Luiz Capitulino --- hw/ide/core.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index bf9df41..5fae4c6 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -473,6 +473,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); + bdrv_iostatus_update(s->bs, ret); if (ret != 0) { if (ide_handle_rw_error(s, -ret, BM_STATUS_PIO_RETRY | BM_STATUS_RETRY_READ)) @@ -544,6 +545,7 @@ void ide_dma_cb(void *opaque, int ret) int64_t sector_num; handle_rw_error: + bdrv_iostatus_update(s->bs, ret); if (ret < 0) { int op = BM_STATUS_DMA_RETRY; @@ -642,6 +644,7 @@ void ide_sector_write(IDEState *s) if (n > s->req_nb_sectors) n = s->req_nb_sectors; ret = bdrv_write(s->bs, sector_num, s->io_buffer, n); + bdrv_iostatus_update(s->bs, ret); if (ret != 0) { if (ide_handle_rw_error(s, -ret, BM_STATUS_PIO_RETRY)) @@ -678,6 +681,7 @@ static void ide_flush_cb(void *opaque, int ret) { IDEState *s = opaque; + bdrv_iostatus_update(s->bs, ret); if (ret < 0) { /* XXX: What sector number to set here? */ if (ide_handle_rw_error(s, -ret, BM_STATUS_RETRY_FLUSH)) { @@ -1749,6 +1753,7 @@ int ide_init_drive(IDEState *s, BlockDriverState *bs, IDEDriveKind kind, } ide_reset(s); + bdrv_enable_iostatus(bs); bdrv_set_removable(bs, s->drive_kind == IDE_CD); return 0; }