[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 15/30] ide: stop PIO transfer on errors
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH v2 15/30] ide: stop PIO transfer on errors |
Date: |
Mon, 4 Aug 2014 17:11:16 -0400 |
From: Paolo Bonzini <address@hidden>
This will provide a hook for sending the result of the command via the
FIS receive area.
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: John Snow <address@hidden>
---
hw/ide/core.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 00fe043..91a17e6 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -420,6 +420,7 @@ BlockDriverAIOCB *ide_issue_trim(BlockDriverState *bs,
static inline void ide_abort_command(IDEState *s)
{
+ ide_transfer_stop(s);
s->status = READY_STAT | ERR_STAT;
s->error = ABRT_ERR;
}
@@ -605,9 +606,7 @@ void ide_set_inactive(IDEState *s, bool more)
void ide_dma_error(IDEState *s)
{
- ide_transfer_stop(s);
- s->error = ABRT_ERR;
- s->status = READY_STAT | ERR_STAT;
+ ide_abort_command(s);
ide_set_inactive(s, false);
ide_set_irq(s->bus);
}
--
1.9.3
- [Qemu-devel] [PATCH v2 09/30] ide: wrap start_dma callback, (continued)
- [Qemu-devel] [PATCH v2 09/30] ide: wrap start_dma callback, John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 08/30] ide: simplify start_transfer callbacks, John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 06/30] ide: simplify set_inactive callbacks, John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 11/30] ide: fold add_status callback into set_inactive, John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 04/30] ide: stash aiocb for flushes, John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 10/30] ide: remove wrong setting of BM_STATUS_INT, John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 13/30] ide: move retry constants out of BM_STATUS_* namespace, John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 12/30] ide: move BM_STATUS bits to pci.[ch], John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 18/30] q35: Enable the ioapic device to be seen by qtest., John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 16/30] ide: make all commands go through cmd_done, John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 15/30] ide: stop PIO transfer on errors,
John Snow <=
- [Qemu-devel] [PATCH v2 17/30] ahci: construct PIO Setup FIS for PIO commands, John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 14/30] ahci: remove duplicate PORT_IRQ_* constants, John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 21/30] libqtest: Correct small memory leak., John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 19/30] qtest: Adding qtest_memset and qmemset., John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 26/30] ahci: Add test_pci_spec to ahci-test., John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 30/30] ahci: Add test_identify case to ahci-test., John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 24/30] qtest/ide: Fix small memory leak, John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 29/30] ahci: Add test_hba_enable to ahci-test., John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 20/30] libqos: Correct memory leak, John Snow, 2014/08/04
- [Qemu-devel] [PATCH v2 27/30] ahci: add test_pci_enable to ahci-test., John Snow, 2014/08/04