[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 41/44] ide: Account for failed and invalid operations
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 41/44] ide: Account for failed and invalid operations |
Date: |
Tue, 10 Nov 2015 14:14:36 +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/core.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 35ba1ad..2725dd3 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -574,7 +574,6 @@ static void ide_sector_read_cb(void *opaque, int ret)
if (ret == -ECANCELED) {
return;
}
- block_acct_done(blk_get_stats(s->blk), &s->acct);
if (ret != 0) {
if (ide_handle_rw_error(s, -ret, IDE_RETRY_PIO |
IDE_RETRY_READ)) {
@@ -582,6 +581,8 @@ static void ide_sector_read_cb(void *opaque, int ret)
}
}
+ block_acct_done(blk_get_stats(s->blk), &s->acct);
+
n = s->nsector;
if (n > s->req_nb_sectors) {
n = s->req_nb_sectors;
@@ -621,6 +622,7 @@ static void ide_sector_read(IDEState *s)
if (!ide_sect_range_ok(s, sector_num, n)) {
ide_rw_error(s);
+ block_acct_invalid(blk_get_stats(s->blk), BLOCK_ACCT_READ);
return;
}
@@ -672,6 +674,7 @@ static int ide_handle_rw_error(IDEState *s, int error, int
op)
assert(s->bus->retry_unit == s->unit);
s->bus->error_status = op;
} else if (action == BLOCK_ERROR_ACTION_REPORT) {
+ block_acct_failed(blk_get_stats(s->blk), &s->acct);
if (op & IDE_RETRY_DMA) {
ide_dma_error(s);
} else {
@@ -750,6 +753,7 @@ static void ide_dma_cb(void *opaque, int ret)
if ((s->dma_cmd == IDE_DMA_READ || s->dma_cmd == IDE_DMA_WRITE) &&
!ide_sect_range_ok(s, sector_num, n)) {
ide_dma_error(s);
+ block_acct_invalid(blk_get_stats(s->blk), s->acct.type);
return;
}
@@ -826,7 +830,6 @@ static void ide_sector_write_cb(void *opaque, int ret)
if (ret == -ECANCELED) {
return;
}
- block_acct_done(blk_get_stats(s->blk), &s->acct);
s->pio_aiocb = NULL;
s->status &= ~BUSY_STAT;
@@ -837,6 +840,8 @@ static void ide_sector_write_cb(void *opaque, int ret)
}
}
+ block_acct_done(blk_get_stats(s->blk), &s->acct);
+
n = s->nsector;
if (n > s->req_nb_sectors) {
n = s->req_nb_sectors;
@@ -887,6 +892,7 @@ static void ide_sector_write(IDEState *s)
if (!ide_sect_range_ok(s, sector_num, n)) {
ide_rw_error(s);
+ block_acct_invalid(blk_get_stats(s->blk), BLOCK_ACCT_WRITE);
return;
}
--
2.5.0
- [Qemu-devel] [PULL 35/44] block: Use QEMU_CLOCK_VIRTUAL for the accounting code in qtest mode, (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, 2015/11/10
- [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 <=