diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-02-23 11:17:51 -0500 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2015-03-10 14:02:22 +0100 |
| commit | bd8892c4e6d681517c687ec5ac86eed46b3bb23b (patch) | |
| tree | 8e845c2a9de058e707051a492f4c29960319457a /hw/ide | |
| parent | 06b95b1ee75706592929e7e91cf18373fd0e6697 (diff) | |
| download | qemu-bd8892c4e6d681517c687ec5ac86eed46b3bb23b.zip | |
ide: prepare to move restart to common code
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 <pbonzini@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 1424708286-16483-3-git-send-email-jsnow@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/ide')
| -rw-r--r-- | hw/ide/internal.h | 1 | ||||
| -rw-r--r-- | 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 ee9a57f039..2566503e5c 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 da3e392d0a..34fc4fbef9 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, |