From patchwork Wed Oct 28 15:33:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Garcia X-Patchwork-Id: 537422 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 83CB1140323 for ; Thu, 29 Oct 2015 02:35:30 +1100 (AEDT) Received: from localhost ([::1]:38821 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZrSl6-0003G9-CB for incoming@patchwork.ozlabs.org; Wed, 28 Oct 2015 11:35:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47047) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZrSjb-0000nC-NH for qemu-devel@nongnu.org; Wed, 28 Oct 2015 11:33:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZrSjY-0003zc-RT for qemu-devel@nongnu.org; Wed, 28 Oct 2015 11:33:55 -0400 Received: from smtp3.mundo-r.com ([212.51.32.191]:34328 helo=smtp4.mundo-r.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZrSjY-0003xv-LM; Wed, 28 Oct 2015 11:33:52 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2CnBQBI6jBW/5tjdVteGQEBAg4BAQGDCIFDqhIBAQEBAQEFAYENAY9ChCEBDYFahhsCgTs4FAEBAQEBAQGBCkETAYNhAQEEJ1IQOAcSPBsZiDQBxgMBAQgjhjCJcGUHCg2EFwWHQocJh3KNJI8mF4x3HwEBQoIRHYFYcIIRgiOBSQEBAQ X-IPAS-Result: A2CnBQBI6jBW/5tjdVteGQEBAg4BAQGDCIFDqhIBAQEBAQEFAYENAY9ChCEBDYFahhsCgTs4FAEBAQEBAQGBCkETAYNhAQEEJ1IQOAcSPBsZiDQBxgMBAQgjhjCJcGUHCg2EFwWHQocJh3KNJI8mF4x3HwEBQoIRHYFYcIIRgiOBSQEBAQ X-IronPort-AV: E=Sophos;i="5.20,210,1444687200"; d="scan'208";a="39053314" Received: from fanzine.igalia.com ([91.117.99.155]) by smtp4.mundo-r.com with ESMTP; 28 Oct 2015 16:33:49 +0100 Received: from 85-76-137-228-nat.elisa-mobile.fi ([85.76.137.228] helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim) id 1ZrSjS-0001Mk-F3; Wed, 28 Oct 2015 16:33:47 +0100 Received: from berto by perseus.local with local (Exim 4.86) (envelope-from ) id 1ZrSj2-0006XG-IQ; Wed, 28 Oct 2015 17:33:20 +0200 From: Alberto Garcia To: qemu-devel@nongnu.org Date: Wed, 28 Oct 2015 17:33:13 +0200 Message-Id: X-Mailer: git-send-email 2.6.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 212.51.32.191 Cc: Kevin Wolf , Alberto Garcia , qemu-block@nongnu.org, Markus Armbruster , Max Reitz , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH v4 16/21] xen_disk: Account for failed and invalid operations 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: Alberto Garcia --- hw/block/xen_disk.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c index 4869518..02eda6e 100644 --- a/hw/block/xen_disk.c +++ b/hw/block/xen_disk.c @@ -537,7 +537,11 @@ static void qemu_aio_complete(void *opaque, int ret) break; } case BLKIF_OP_READ: - block_acct_done(blk_get_stats(ioreq->blkdev->blk), &ioreq->acct); + if (ioreq->status == BLKIF_RSP_OKAY) { + block_acct_done(blk_get_stats(ioreq->blkdev->blk), &ioreq->acct); + } else { + block_acct_failed(blk_get_stats(ioreq->blkdev->blk), &ioreq->acct); + } break; case BLKIF_OP_DISCARD: default: @@ -722,6 +726,23 @@ static void blk_handle_requests(struct XenBlkDev *blkdev) /* parse them */ if (ioreq_parse(ioreq) != 0) { + + switch (ioreq->req.operation) { + case BLKIF_OP_READ: + block_acct_invalid(blk_get_stats(blkdev->blk), + BLOCK_ACCT_READ); + break; + case BLKIF_OP_WRITE: + block_acct_invalid(blk_get_stats(blkdev->blk), + BLOCK_ACCT_WRITE); + break; + case BLKIF_OP_FLUSH_DISKCACHE: + block_acct_invalid(blk_get_stats(blkdev->blk), + BLOCK_ACCT_FLUSH); + default: + break; + }; + if (blk_send_response_one(ioreq)) { xen_be_send_notify(&blkdev->xendev); }