Commit a55c8231 authored by John Snow's avatar John Snow
Browse files

ahci: add ncq_err helper 



Set some appropriate error bits for NCQ for us.

Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Message-id: 1435016308-6150-4-git-send-email-jsnow@redhat.com
parent b6fe41fa

hw/ide/ahci.c

+10 −4
Original line number Diff line number Diff line
@@ -922,6 +922,15 @@ out: 
    return r;

}



static void ncq_err(NCQTransferState *ncq_tfs)

{

    IDEState *ide_state = &ncq_tfs->drive->port.ifs[0];



    ide_state->error = ABRT_ERR;

    ide_state->status = READY_STAT | ERR_STAT;

    ncq_tfs->drive->port_regs.scr_err |= (1 << ncq_tfs->tag);

}



static void ncq_cb(void *opaque, int ret)

{

    NCQTransferState *ncq_tfs = (NCQTransferState *)opaque;
@@ -934,10 +943,7 @@ static void ncq_cb(void *opaque, int ret) 
    ncq_tfs->drive->port_regs.scr_act &= ~(1 << ncq_tfs->tag);



    if (ret < 0) {

        /* error */

        ide_state->error = ABRT_ERR;

        ide_state->status = READY_STAT | ERR_STAT;

        ncq_tfs->drive->port_regs.scr_err |= (1 << ncq_tfs->tag);

        ncq_err(ncq_tfs);

    } else {

        ide_state->status = READY_STAT | SEEK_STAT;

    }