diff options
| author | Olaf Hering <olaf@aepfle.de> | 2014-02-20 17:57:13 +0000 |
|---|---|---|
| committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2014-02-20 17:57:13 +0000 |
| commit | 58da5b1e01a586eb5a52ba3eec342d6828269839 (patch) | |
| tree | e8f6f557e461227ad7d6b4a45e68b2221e4bab2b /hw/block | |
| parent | 15e8159e7613ec0b1418879acc916d1412c02a28 (diff) | |
| download | qemu-58da5b1e01a586eb5a52ba3eec342d6828269839.tar.gz | |
xen_disk: fix io accounting
bdrv_acct_done was called unconditional. But in case the ioreq has no
segments there is no matching bdrv_acct_start call. This could lead to
bogus accounting values.
Found by code inspection.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Diffstat (limited to 'hw/block')
| -rw-r--r-- | hw/block/xen_disk.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c index 098f6c62c7..7f0f14ae52 100644 --- a/hw/block/xen_disk.c +++ b/hw/block/xen_disk.c @@ -483,7 +483,18 @@ static void qemu_aio_complete(void *opaque, int ret) ioreq->status = ioreq->aio_errors ? BLKIF_RSP_ERROR : BLKIF_RSP_OKAY; ioreq_unmap(ioreq); ioreq_finish(ioreq); - bdrv_acct_done(ioreq->blkdev->bs, &ioreq->acct); + switch (ioreq->req.operation) { + case BLKIF_OP_WRITE: + case BLKIF_OP_FLUSH_DISKCACHE: + if (!ioreq->req.nr_segments) { + break; + } + case BLKIF_OP_READ: + bdrv_acct_done(ioreq->blkdev->bs, &ioreq->acct); + break; + default: + break; + } qemu_bh_schedule(ioreq->blkdev->bh); } |