Commit ece2d05e authored by Alberto Garcia's avatar Alberto Garcia Committed by Kevin Wolf
Browse files

atapi: Account for failed and invalid operations 



Signed-off-by: default avatarAlberto Garcia <berto@igalia.com>
Message-id: 59dee4e2921b0c79d41c49b67dfb93d32db9f7f9.1446044838.git.berto@igalia.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 57ee366c

hw/ide/atapi.c

+19 −12
Original line number Diff line number Diff line
@@ -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;

        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:

    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);

}