[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 04/17] ide: do not use BMDMA in restart callback
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH v3 04/17] ide: do not use BMDMA in restart callback |
Date: |
Tue, 10 Feb 2015 13:19:16 -0500 |
From: Paolo Bonzini <address@hidden>
Whenever an error stops the VM, ide_handle_rw_error does
"s->bus->dma->unit = s->unit". So we can just use
idebus_active_if.
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: John Snow <address@hidden>
---
hw/ide/pci.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index 34fc4fb..62c88d7 100644
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -217,17 +217,17 @@ static void bmdma_restart_bh(void *opaque)
qemu_bh_delete(bm->bh);
bm->bh = NULL;
- if (bm->unit == (uint8_t) -1) {
+ error_status = bus->error_status;
+ if (bus->error_status == 0) {
return;
}
- s = bmdma_active_if(bm);
+ s = idebus_active_if(bus);
is_read = (bus->error_status & IDE_RETRY_READ) != 0;
/* The error status must be cleared before resubmitting the request: The
* request may fail again, and this case can only be distinguished if the
* called function can set a new error status. */
- error_status = bus->error_status;
bus->error_status = 0;
if (error_status & IDE_RETRY_DMA) {
--
1.9.3
- [Qemu-devel] [PATCH v3 00/17] ide: rerror/werror migration fixes for IDE/ISA and AHCI, John Snow, 2015/02/10
- [Qemu-devel] [PATCH v3 02/17] ide: prepare to move restart to common code, John Snow, 2015/02/10
- [Qemu-devel] [PATCH v3 03/17] ide: introduce ide_register_restart_cb, John Snow, 2015/02/10
- [Qemu-devel] [PATCH v3 05/17] ide: pass IDEBus to the restart_cb, John Snow, 2015/02/10
- [Qemu-devel] [PATCH v3 07/17] ide: remove restart_cb callback, John Snow, 2015/02/10
- [Qemu-devel] [PATCH v3 08/17] ide: replace set_unit callback with more IDEBus state, John Snow, 2015/02/10
- [Qemu-devel] [PATCH v3 06/17] ide: move restart callback to common code, John Snow, 2015/02/10
- [Qemu-devel] [PATCH v3 04/17] ide: do not use BMDMA in restart callback,
John Snow <=
- [Qemu-devel] [PATCH v3 09/17] ide: place initial state of the current request to IDEBus, John Snow, 2015/02/10
- [Qemu-devel] [PATCH v3 14/17] ahci: Migrate IDEStatus, John Snow, 2015/02/10
- [Qemu-devel] [PATCH v3 01/17] ide: start extracting ide_restart_dma out of bmdma_restart_dma, John Snow, 2015/02/10
- [Qemu-devel] [PATCH v3 10/17] ide: migrate initial request state via IDEBus, John Snow, 2015/02/10
- [Qemu-devel] [PATCH v3 16/17] ahci: Recompute cur_cmd on migrate post load, John Snow, 2015/02/10
- [Qemu-devel] [PATCH v3 12/17] ide: make more functions static, John Snow, 2015/02/10
- [Qemu-devel] [PATCH v3 13/17] ide: support PIO restart for the ISA controller, John Snow, 2015/02/10
- [Qemu-devel] [PATCH v3 17/17] qtest/ide: Test flush / retry for ISA and PCI, John Snow, 2015/02/10
- [Qemu-devel] [PATCH v3 15/17] ahci: add support for restarting non-queued commands, John Snow, 2015/02/10