[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 40/44] atapi: Account for failed and invalid operatio
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 40/44] atapi: Account for failed and invalid operations |
Date: |
Tue, 10 Nov 2015 14:14:35 +0000 |
From: Alberto Garcia <address@hidden>
Signed-off-by: Alberto Garcia <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <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.0
- Re: [Qemu-devel] [PULL 33/44] block: New option to define the intervals for collecting I/O statistics, (continued)
- [Qemu-devel] [PULL 35/44] block: Use QEMU_CLOCK_VIRTUAL for the accounting code in qtest mode, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 37/44] nvme: Account for failed and invalid operations, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 36/44] iotests: Add test for the block device statistics, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 39/44] xen_disk: Account for failed and invalid operations, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 38/44] virtio-blk: Account for failed and invalid operations, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 42/44] macio: Account for failed operations, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 44/44] block: Update copyright of the accounting code, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 40/44] atapi: Account for failed and invalid operations,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 43/44] scsi-disk: Account for failed operations, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 41/44] ide: Account for failed and invalid operations, Stefan Hajnoczi, 2015/11/10