ide: Account for failed and invalid operations
Signed-off-by: Alberto Garcia <berto@igalia.com> Message-id: bf4d6c9c563877e699b0bf42e7eaf8b096c4a35e.1446044838.git.berto@igalia.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
ece2d05ed4
commit
ecca3b397d
|
@ -574,7 +574,6 @@ static void ide_sector_read_cb(void *opaque, int ret)
|
||||||
if (ret == -ECANCELED) {
|
if (ret == -ECANCELED) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
block_acct_done(blk_get_stats(s->blk), &s->acct);
|
|
||||||
if (ret != 0) {
|
if (ret != 0) {
|
||||||
if (ide_handle_rw_error(s, -ret, IDE_RETRY_PIO |
|
if (ide_handle_rw_error(s, -ret, IDE_RETRY_PIO |
|
||||||
IDE_RETRY_READ)) {
|
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;
|
n = s->nsector;
|
||||||
if (n > s->req_nb_sectors) {
|
if (n > s->req_nb_sectors) {
|
||||||
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)) {
|
if (!ide_sect_range_ok(s, sector_num, n)) {
|
||||||
ide_rw_error(s);
|
ide_rw_error(s);
|
||||||
|
block_acct_invalid(blk_get_stats(s->blk), BLOCK_ACCT_READ);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -672,6 +674,7 @@ static int ide_handle_rw_error(IDEState *s, int error, int op)
|
||||||
assert(s->bus->retry_unit == s->unit);
|
assert(s->bus->retry_unit == s->unit);
|
||||||
s->bus->error_status = op;
|
s->bus->error_status = op;
|
||||||
} else if (action == BLOCK_ERROR_ACTION_REPORT) {
|
} else if (action == BLOCK_ERROR_ACTION_REPORT) {
|
||||||
|
block_acct_failed(blk_get_stats(s->blk), &s->acct);
|
||||||
if (op & IDE_RETRY_DMA) {
|
if (op & IDE_RETRY_DMA) {
|
||||||
ide_dma_error(s);
|
ide_dma_error(s);
|
||||||
} else {
|
} 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) &&
|
if ((s->dma_cmd == IDE_DMA_READ || s->dma_cmd == IDE_DMA_WRITE) &&
|
||||||
!ide_sect_range_ok(s, sector_num, n)) {
|
!ide_sect_range_ok(s, sector_num, n)) {
|
||||||
ide_dma_error(s);
|
ide_dma_error(s);
|
||||||
|
block_acct_invalid(blk_get_stats(s->blk), s->acct.type);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -826,7 +830,6 @@ static void ide_sector_write_cb(void *opaque, int ret)
|
||||||
if (ret == -ECANCELED) {
|
if (ret == -ECANCELED) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
block_acct_done(blk_get_stats(s->blk), &s->acct);
|
|
||||||
|
|
||||||
s->pio_aiocb = NULL;
|
s->pio_aiocb = NULL;
|
||||||
s->status &= ~BUSY_STAT;
|
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;
|
n = s->nsector;
|
||||||
if (n > s->req_nb_sectors) {
|
if (n > s->req_nb_sectors) {
|
||||||
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)) {
|
if (!ide_sect_range_ok(s, sector_num, n)) {
|
||||||
ide_rw_error(s);
|
ide_rw_error(s);
|
||||||
|
block_acct_invalid(blk_get_stats(s->blk), BLOCK_ACCT_WRITE);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue