Commit 36be0929 authored by Alberto Garcia's avatar Alberto Garcia Committed by John Snow
Browse files

atapi: Account for failed and invalid operations in cd_read_sector() 



Commit 5f81724d made PIO read requests async but didn't add the
relevant block_acct_failed() and block_acct_invalid() calls.

Signed-off-by: default avatarAlberto Garcia <berto@igalia.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Message-id: 9b87e09d61019c128139b6c999ed0c07f0674170.1448367341.git.berto@igalia.com
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent a421f3c3

hw/ide/atapi.c

+4 −2
Original line number Diff line number Diff line
@@ -148,17 +148,18 @@ static void cd_read_sector_cb(void *opaque, int ret) 
{

    IDEState *s = opaque;



    block_acct_done(blk_get_stats(s->blk), &s->acct);



#ifdef DEBUG_IDE_ATAPI

    printf("cd_read_sector_cb: lba=%d ret=%d\n", s->lba, ret);

#endif



    if (ret < 0) {

        block_acct_failed(blk_get_stats(s->blk), &s->acct);

        ide_atapi_io_error(s, ret);

        return;

    }



    block_acct_done(blk_get_stats(s->blk), &s->acct);



    if (s->cd_sector_size == 2352) {

        cd_data_to_raw(s->io_buffer, s->lba);

    }
@@ -173,6 +174,7 @@ static void cd_read_sector_cb(void *opaque, int ret) 
static int cd_read_sector(IDEState *s)

{

    if (s->cd_sector_size != 2048 && s->cd_sector_size != 2352) {

        block_acct_invalid(blk_get_stats(s->blk), BLOCK_ACCT_READ);

        return -EINVAL;

    }