diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-02-23 11:17:56 -0500 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2015-03-10 14:02:22 +0100 |
| commit | fe09c7c9f0e8ed8793e986cf616c8de0a9518fd7 (patch) | |
| tree | a5311748283a46c44f8a2c370b725b55ddff1a1c | |
| parent | 9898586d8929a7f1293fc64164b67a79289b074f (diff) | |
ide: remove restart_cb callback
With restarts now handled by ide_restart_cb and
the IDEDMAOps.restart_dma() member, remove the old
restart_cb callback.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 1424708286-16483-8-git-send-email-jsnow@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | hw/ide/ahci.c | 5 | ||||
| -rw-r--r-- | hw/ide/core.c | 5 | ||||
| -rw-r--r-- | hw/ide/internal.h | 1 | ||||
| -rw-r--r-- | hw/ide/macio.c | 5 |
4 files changed, 0 insertions, 16 deletions
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 5651372be3..3892025f5c 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1252,10 +1252,6 @@ static void ahci_irq_set(void *opaque, int n, int level) { } -static void ahci_dma_restart_cb(void *opaque, int running, RunState state) -{ -} - static const IDEDMAOps ahci_dma_ops = { .start_dma = ahci_start_dma, .start_transfer = ahci_start_transfer, @@ -1264,7 +1260,6 @@ static const IDEDMAOps ahci_dma_ops = { .rw_buf = ahci_dma_rw_buf, .set_unit = ahci_dma_set_unit, .cmd_done = ahci_cmd_done, - .restart_cb = ahci_dma_restart_cb, }; void ahci_init(AHCIState *s, DeviceState *qdev, AddressSpace *as, int ports) diff --git a/hw/ide/core.c b/hw/ide/core.c index a4250f605f..0a3d244fe0 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2323,16 +2323,11 @@ static int32_t ide_nop_int32(IDEDMA *dma, int x) return 0; } -static void ide_nop_restart(void *opaque, int x, RunState y) -{ -} - static const IDEDMAOps ide_dma_nop_ops = { .prepare_buf = ide_nop_int32, .restart_dma = ide_nop, .rw_buf = ide_nop_int, .set_unit = ide_nop_int, - .restart_cb = ide_nop_restart, }; static void ide_restart_dma(IDEState *s, enum ide_dma_cmd dma_cmd) diff --git a/hw/ide/internal.h b/hw/ide/internal.h index 9a11c3c6f0..44cce5b1ba 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -440,7 +440,6 @@ struct IDEDMAOps { DMAVoidFunc *restart_dma; DMAStopFunc *set_inactive; DMAVoidFunc *cmd_done; - DMARestartFunc *restart_cb; DMAVoidFunc *reset; }; diff --git a/hw/ide/macio.c b/hw/ide/macio.c index f6074f2024..e7a5c99710 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -558,10 +558,6 @@ static int32_t ide_nop_int32(IDEDMA *dma, int x) return 0; } -static void ide_nop_restart(void *opaque, int x, RunState y) -{ -} - static void ide_dbdma_start(IDEDMA *dma, IDEState *s, BlockCompletionFunc *cb) { @@ -577,7 +573,6 @@ static const IDEDMAOps dbdma_ops = { .prepare_buf = ide_nop_int32, .rw_buf = ide_nop_int, .set_unit = ide_nop_int, - .restart_cb = ide_nop_restart, }; static void macio_ide_realizefn(DeviceState *dev, Error **errp) |