diff options
| author | John Snow <jsnow@redhat.com> | 2015-07-04 02:06:03 -0400 |
|---|---|---|
| committer | John Snow <jsnow@redhat.com> | 2015-07-04 02:06:03 -0400 |
| commit | a55c8231d04e3023bc5c3da9290f01e7d6989a94 (patch) | |
| tree | 438ad653591dd1aead3d86c5f32afbc6c715a9e8 | |
| parent | b6fe41fa6dbdf7b92b76cd4848ef442de18e03d3 (diff) | |
| download | qemu-a55c8231d04e3023bc5c3da9290f01e7d6989a94.zip qemu-a55c8231d04e3023bc5c3da9290f01e7d6989a94.tar.gz qemu-a55c8231d04e3023bc5c3da9290f01e7d6989a94.tar.bz2 | |
ahci: add ncq_err helper
Set some appropriate error bits for NCQ for us.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 1435016308-6150-4-git-send-email-jsnow@redhat.com
| -rw-r--r-- | hw/ide/ahci.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 3a8bff7..7b286a2 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -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; } |