[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 18/22] atapi: Account for failed and invalid oper
From: |
Alberto Garcia |
Subject: |
[Qemu-devel] [PATCH v2 18/22] atapi: Account for failed and invalid operations |
Date: |
Fri, 2 Oct 2015 17:26:28 +0300 |
Signed-off-by: Alberto Garcia <address@hidden>
---
hw/ide/atapi.c | 31 +++++++++++++++++++------------
1 file changed, 19 insertions(+), 12 deletions(-)
diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c
index 747f466..cf0b78e 100644
--- a/hw/ide/atapi.c
+++ b/hw/ide/atapi.c
@@ -108,27 +108,30 @@ static void cd_data_to_raw(uint8_t *buf, int lba)
static int cd_read_sector(IDEState *s, int lba, uint8_t *buf, int sector_size)
{
int ret;
+ block_acct_start(blk_get_stats(s->blk), &s->acct,
+ 4 * BDRV_SECTOR_SIZE, BLOCK_ACCT_READ);
switch(sector_size) {
case 2048:
- block_acct_start(blk_get_stats(s->blk), &s->acct,
- 4 * BDRV_SECTOR_SIZE, BLOCK_ACCT_READ);
ret = blk_read(s->blk, (int64_t)lba << 2, buf, 4);
- block_acct_done(blk_get_stats(s->blk), &s->acct);
break;
case 2352:
- block_acct_start(blk_get_stats(s->blk), &s->acct,
- 4 * BDRV_SECTOR_SIZE, BLOCK_ACCT_READ);
ret = blk_read(s->blk, (int64_t)lba << 2, buf + 16, 4);
- block_acct_done(blk_get_stats(s->blk), &s->acct);
- if (ret < 0)
- return ret;
- cd_data_to_raw(buf, lba);
+ if (ret >= 0) {
+ cd_data_to_raw(buf, lba);
+ }
break;
default:
- ret = -EIO;
- break;
+ block_acct_invalid(blk_get_stats(s->blk), BLOCK_ACCT_READ);
+ return -EIO;
}
+
+ if (ret < 0) {
+ block_acct_failed(blk_get_stats(s->blk), &s->acct);
+ } else {
+ block_acct_done(blk_get_stats(s->blk), &s->acct);
+ }
+
return ret;
}
@@ -357,7 +360,11 @@ static void ide_atapi_cmd_read_dma_cb(void *opaque, int
ret)
return;
eot:
- block_acct_done(blk_get_stats(s->blk), &s->acct);
+ if (ret < 0) {
+ block_acct_failed(blk_get_stats(s->blk), &s->acct);
+ } else {
+ block_acct_done(blk_get_stats(s->blk), &s->acct);
+ }
ide_set_inactive(s, false);
}
--
2.5.3
- [Qemu-devel] [PATCH v2 02/22] ide: Account for write operations correctly, (continued)
- [Qemu-devel] [PATCH v2 02/22] ide: Account for write operations correctly, Alberto Garcia, 2015/10/08
- [Qemu-devel] [PATCH v2 21/22] scsi-disk: Account for failed operations, Alberto Garcia, 2015/10/08
- [Qemu-devel] [PATCH v2 13/22] block: Use QEMU_CLOCK_VIRTUAL for the accounting code in qtest mode, Alberto Garcia, 2015/10/08
- [Qemu-devel] [PATCH v2 20/22] macio: Account for failed operations, Alberto Garcia, 2015/10/08
- [Qemu-devel] [PATCH v2 14/22] iotests: Add test for the block device statistics, Alberto Garcia, 2015/10/08
- [Qemu-devel] [PATCH v2 10/22] block: Add average I/O queue depth to BlockDeviceTimedStats, Alberto Garcia, 2015/10/08
- [Qemu-devel] [PATCH v2 08/22] block: Allow configuring whether to account failed and invalid ops, Alberto Garcia, 2015/10/08
- [Qemu-devel] [PATCH v2 12/22] qemu-io: Account for failed, invalid and flush operations, Alberto Garcia, 2015/10/08
- [Qemu-devel] [PATCH v2 18/22] atapi: Account for failed and invalid operations,
Alberto Garcia <=
- [Qemu-devel] [PATCH v2 17/22] xen_disk: Account for failed and invalid operations, Alberto Garcia, 2015/10/08
- [Qemu-devel] [PATCH v2 15/22] nvme: Account for failed and invalid operations, Alberto Garcia, 2015/10/08
- [Qemu-devel] [PATCH v2 19/22] ide: Account for failed and invalid operations, Alberto Garcia, 2015/10/08