mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

atapi: Account for failed and invalid operations

Browse Source 
Signed-off-by: Alberto Garcia <berto@igalia.com>
Message-id: 59dee4e2921b0c79d41c49b67dfb93d32db9f7f9.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:
Alberto Garcia 2015-10-28 17:33:14 +02:00 committed by Kevin Wolf
parent 57ee366ce9
commit ece2d05ed4
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hw/ide/atapi.c
View File

@ -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) static int cd_read_sector(IDEState *s, int lba, uint8_t *buf, int sector_size)
{ {
int ret; int ret;
block_acct_start(blk_get_stats(s->blk), &s->acct,
4 * BDRV_SECTOR_SIZE, BLOCK_ACCT_READ);
switch(sector_size) { switch(sector_size) {
case 2048: 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); ret = blk_read(s->blk, (int64_t)lba << 2, buf, 4);
block_acct_done(blk_get_stats(s->blk), &s->acct);
break; break;
case 2352: 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); 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) {
if (ret < 0) cd_data_to_raw(buf, lba);
return ret; }
cd_data_to_raw(buf, lba);
break; break;
default: default:
ret = -EIO; block_acct_invalid(blk_get_stats(s->blk), BLOCK_ACCT_READ);
break; 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; return ret;
} }
@ -357,7 +360,11 @@ static void ide_atapi_cmd_read_dma_cb(void *opaque, int ret)
return; return;
eot: 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); ide_set_inactive(s, false);
} }