david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ide: prepare to move restart to common code

Browse Source 
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>
This commit is contained in:
Paolo Bonzini 2015-02-23 11:17:51 -05:00 committed by Kevin Wolf
parent 06b95b1ee7
commit bd8892c4e6
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/ide/internal.h
View File

@ -437,6 +437,7 @@ struct IDEDMAOps {
DMAu32Func *commit_buf; DMAu32Func *commit_buf;
DMAIntFunc *rw_buf; DMAIntFunc *rw_buf;
DMAIntFunc *set_unit; DMAIntFunc *set_unit;
DMAVoidFunc *restart_dma;
DMAStopFunc *set_inactive; DMAStopFunc *set_inactive;
DMAVoidFunc *cmd_done; DMAVoidFunc *cmd_done;
DMARestartFunc *restart_cb; DMARestartFunc *restart_cb;

12
hw/ide/pci.c
View File

@ -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); IDEState *s = bmdma_active_if(bm);
ide_set_sector(s, bm->sector_num); 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) static void ide_restart_dma(IDEState *s, enum ide_dma_cmd dma_cmd)
{ {
BMDMAState *bm = DO_UPCAST(BMDMAState, dma, s->bus->dma); if (s->bus->dma->ops->restart_dma) {
s->bus->dma->ops->restart_dma(s->bus->dma);
bmdma_restart_dma(bm); }
s->io_buffer_index = 0; s->io_buffer_index = 0;
s->io_buffer_size = 0; s->io_buffer_size = 0;
s->dma_cmd = dma_cmd; 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 */ /* TODO This should be common IDE code */
@ -532,6 +533,7 @@ static const struct IDEDMAOps bmdma_ops = {
.prepare_buf = bmdma_prepare_buf, .prepare_buf = bmdma_prepare_buf,
.rw_buf = bmdma_rw_buf, .rw_buf = bmdma_rw_buf,
.set_unit = bmdma_set_unit, .set_unit = bmdma_set_unit,
.restart_dma = bmdma_restart_dma,
.set_inactive = bmdma_set_inactive, .set_inactive = bmdma_set_inactive,
.restart_cb = bmdma_restart_cb, .restart_cb = bmdma_restart_cb,
.reset = bmdma_reset, .reset = bmdma_reset,