From patchwork Wed Aug 3 15:19:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 108300 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 EC4B1B71DB for ; Thu, 4 Aug 2011 02:14:56 +1000 (EST) Received: from localhost ([::1]:49742 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qoe5t-0003U4-ME for incoming@patchwork.ozlabs.org; Wed, 03 Aug 2011 12:14:53 -0400 Received: from eggs.gnu.org ([140.186.70.92]:40113) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QodF1-0002Xn-1v for qemu-devel@nongnu.org; Wed, 03 Aug 2011 11:20:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QodEq-0006yG-1c for qemu-devel@nongnu.org; Wed, 03 Aug 2011 11:20:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:8521) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QodEp-0006vr-Qq for qemu-devel@nongnu.org; Wed, 03 Aug 2011 11:20:04 -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 p73FJrt1005415 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 3 Aug 2011 11:19:53 -0400 Received: from localhost (ovpn-113-124.phx2.redhat.com [10.3.113.124]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p73FJqvJ004970; Wed, 3 Aug 2011 11:19:52 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 3 Aug 2011 12:19:23 -0300 Message-Id: <1312384765-721-4-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.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, aliguori@us.ibm.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 3/5] virtio-blk: 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/virtio-blk.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index 265c795..a008956 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -29,6 +29,7 @@ typedef struct VirtIOBlock QEMUBH *bh; BlockConf *conf; char *serial; + BlockDevIOStatus iostatus; unsigned short sector_mask; DeviceState *qdev; } VirtIOBlock; @@ -90,9 +91,11 @@ static int virtio_blk_handle_rw_error(VirtIOBlockReq *req, int error, static void virtio_blk_rw_complete(void *opaque, int ret) { VirtIOBlockReq *req = opaque; + VirtIOBlock *s = req->dev; trace_virtio_blk_rw_complete(req, ret); + s->iostatus = bdrv_iostatus_from_error(ret); if (ret) { int is_read = !(ldl_p(&req->out->type) & VIRTIO_BLK_T_OUT); if (virtio_blk_handle_rw_error(req, -ret, is_read)) @@ -105,7 +108,9 @@ static void virtio_blk_rw_complete(void *opaque, int ret) static void virtio_blk_flush_complete(void *opaque, int ret) { VirtIOBlockReq *req = opaque; + VirtIOBlock *s = req->dev; + s->iostatus = bdrv_iostatus_from_error(ret); if (ret) { if (virtio_blk_handle_rw_error(req, -ret, 0)) { return; @@ -535,8 +540,16 @@ static void virtio_blk_resize(void *opaque) virtio_notify_config(&s->vdev); } +static BlockDevIOStatus virtio_blk_iostatus(void *opaque) +{ + VirtIOBlock *s = opaque; + + return s->iostatus; +} + static const BlockDevOps virtio_block_ops = { .resize_cb = virtio_blk_resize, + .get_iostatus = virtio_blk_iostatus, }; VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf *conf, @@ -575,6 +588,7 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf *conf, s->conf = conf; s->serial = *serial; s->rq = NULL; + s->iostatus = BDRV_IOS_INVAL; s->sector_mask = (s->conf->logical_block_size / BDRV_SECTOR_SIZE) - 1; bdrv_guess_geometry(s->bs, &cylinders, &heads, &secs);