[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 02/17] ide: prepare to move restart to common cod
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH v4 02/17] ide: prepare to move restart to common code |
Date: |
Mon, 23 Feb 2015 11:17:51 -0500 |
From: Paolo Bonzini <address@hidden>
This patch adds the restart_dma callback and adjusts
the ide_restart_dma function to utilize this callback
to call the BMDMA-specific restart code instead of statically
executing BMDMA-specific code.
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: John Snow <address@hidden>
---
hw/ide/internal.h | 1 +
hw/ide/pci.c | 12 +++++++-----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/hw/ide/internal.h b/hw/ide/internal.h
index ee9a57f..2566503 100644
--- a/hw/ide/internal.h
+++ b/hw/ide/internal.h
@@ -437,6 +437,7 @@ struct IDEDMAOps {
DMAu32Func *commit_buf;
DMAIntFunc *rw_buf;
DMAIntFunc *set_unit;
+ DMAVoidFunc *restart_dma;
DMAStopFunc *set_inactive;
DMAVoidFunc *cmd_done;
DMARestartFunc *restart_cb;
diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index da3e392..34fc4fb 100644
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -184,8 +184,9 @@ static void bmdma_set_inactive(IDEDMA *dma, bool more)
}
}
-static void bmdma_restart_dma(BMDMAState *bm)
+static void bmdma_restart_dma(IDEDMA *dma)
{
+ BMDMAState *bm = DO_UPCAST(BMDMAState, dma, dma);
IDEState *s = bmdma_active_if(bm);
ide_set_sector(s, bm->sector_num);
@@ -195,13 +196,13 @@ static void bmdma_restart_dma(BMDMAState *bm)
static void ide_restart_dma(IDEState *s, enum ide_dma_cmd dma_cmd)
{
- BMDMAState *bm = DO_UPCAST(BMDMAState, dma, s->bus->dma);
-
- bmdma_restart_dma(bm);
+ if (s->bus->dma->ops->restart_dma) {
+ s->bus->dma->ops->restart_dma(s->bus->dma);
+ }
s->io_buffer_index = 0;
s->io_buffer_size = 0;
s->dma_cmd = dma_cmd;
- bmdma_start_dma(&bm->dma, s, ide_dma_cb);
+ ide_start_dma(s, ide_dma_cb);
}
/* TODO This should be common IDE code */
@@ -532,6 +533,7 @@ static const struct IDEDMAOps bmdma_ops = {
.prepare_buf = bmdma_prepare_buf,
.rw_buf = bmdma_rw_buf,
.set_unit = bmdma_set_unit,
+ .restart_dma = bmdma_restart_dma,
.set_inactive = bmdma_set_inactive,
.restart_cb = bmdma_restart_cb,
.reset = bmdma_reset,
--
1.9.3
- [Qemu-devel] [PATCH v4 00/17] ide: rerror/werror migration fixes for IDE/ISA and AHCI, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 04/17] ide: do not use BMDMA in restart callback, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 01/17] ide: start extracting ide_restart_dma out of bmdma_restart_dma, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 03/17] ide: introduce ide_register_restart_cb, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 08/17] ide: replace set_unit callback with more IDEBus state, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 02/17] ide: prepare to move restart to common code,
John Snow <=
- [Qemu-devel] [PATCH v4 09/17] ide: place initial state of the current request to IDEBus, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 06/17] ide: move restart callback to common code, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 10/17] ide: migrate initial request state via IDEBus, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 05/17] ide: pass IDEBus to the restart_cb, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 07/17] ide: remove restart_cb callback, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 15/17] ahci: add support for restarting non-queued commands, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 13/17] ide: support PIO restart for the ISA controller, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 14/17] ahci: Migrate IDEStatus, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 17/17] qtest/ide: Test flush / retry for ISA and PCI, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 12/17] ide: make more functions static, John Snow, 2015/02/23