[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 05/15] ahci: factor ncq_finish out of ncq_cb
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH v2 05/15] ahci: factor ncq_finish out of ncq_cb |
Date: |
Wed, 1 Jul 2015 12:19:28 -0400 |
When we add werror=stop or rerror=stop support to NCQ,
we'll want to take a codepath where we don't actually
complete the command, so factor that out into a new routine.
Signed-off-by: John Snow <address@hidden>
---
hw/ide/ahci.c | 32 +++++++++++++++++++-------------
1 file changed, 19 insertions(+), 13 deletions(-)
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index b3a6a91..b0b9b41 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -933,23 +933,11 @@ static void ncq_err(NCQTransferState *ncq_tfs)
ncq_tfs->drive->port_regs.scr_err |= (1 << ncq_tfs->tag);
}
-static void ncq_cb(void *opaque, int ret)
+static void ncq_finish(NCQTransferState *ncq_tfs)
{
- NCQTransferState *ncq_tfs = (NCQTransferState *)opaque;
- IDEState *ide_state = &ncq_tfs->drive->port.ifs[0];
-
- if (ret == -ECANCELED) {
- return;
- }
/* Clear bit for this tag in SActive */
ncq_tfs->drive->port_regs.scr_act &= ~(1 << ncq_tfs->tag);
- if (ret < 0) {
- ncq_err(ncq_tfs);
- } else {
- ide_state->status = READY_STAT | SEEK_STAT;
- }
-
ahci_write_fis_sdb(ncq_tfs->drive->hba, ncq_tfs->drive->port_no,
(1 << ncq_tfs->tag));
@@ -962,6 +950,24 @@ static void ncq_cb(void *opaque, int ret)
ncq_tfs->used = 0;
}
+static void ncq_cb(void *opaque, int ret)
+{
+ NCQTransferState *ncq_tfs = (NCQTransferState *)opaque;
+ IDEState *ide_state = &ncq_tfs->drive->port.ifs[0];
+
+ if (ret == -ECANCELED) {
+ return;
+ }
+
+ if (ret < 0) {
+ ncq_err(ncq_tfs);
+ } else {
+ ide_state->status = READY_STAT | SEEK_STAT;
+ }
+
+ ncq_finish(ncq_tfs);
+}
+
static int is_ncq(uint8_t ata_cmd)
{
/* Based on SATA 3.2 section 13.6.3.2 */
--
2.1.0
- [Qemu-devel] [PATCH v2 00/15] ahci: ncq cleanup, part 2, John Snow, 2015/07/01
- [Qemu-devel] [PATCH v2 03/15] ahci: assert is_ncq for process_ncq, John Snow, 2015/07/01
- [Qemu-devel] [PATCH v2 04/15] ahci: refactor process_ncq_command, John Snow, 2015/07/01
- [Qemu-devel] [PATCH v2 05/15] ahci: factor ncq_finish out of ncq_cb,
John Snow <=
- [Qemu-devel] [PATCH v2 07/15] ahci: correct types in NCQTransferState, John Snow, 2015/07/01
- [Qemu-devel] [PATCH v2 06/15] ahci: add rwerror=stop support for ncq, John Snow, 2015/07/01
- [Qemu-devel] [PATCH v2 01/15] ide: add limit to .prepare_buf(), John Snow, 2015/07/01
- [Qemu-devel] [PATCH v2 09/15] qtest/ahci: halted NCQ test, John Snow, 2015/07/01
- [Qemu-devel] [PATCH v2 02/15] ahci: stash ncq command, John Snow, 2015/07/01
- [Qemu-devel] [PATCH v2 08/15] ahci: correct ncq sector count, John Snow, 2015/07/01
- [Qemu-devel] [PATCH v2 10/15] ahci: add cmd header to ncq transfer state, John Snow, 2015/07/01
- [Qemu-devel] [PATCH v2 14/15] qtest/ahci: halted ncq migration test, John Snow, 2015/07/01