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>
This commit is contained in:
parent
9898586d89
commit
fe09c7c9f0
|
@ -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 = {
|
static const IDEDMAOps ahci_dma_ops = {
|
||||||
.start_dma = ahci_start_dma,
|
.start_dma = ahci_start_dma,
|
||||||
.start_transfer = ahci_start_transfer,
|
.start_transfer = ahci_start_transfer,
|
||||||
|
@ -1264,7 +1260,6 @@ static const IDEDMAOps ahci_dma_ops = {
|
||||||
.rw_buf = ahci_dma_rw_buf,
|
.rw_buf = ahci_dma_rw_buf,
|
||||||
.set_unit = ahci_dma_set_unit,
|
.set_unit = ahci_dma_set_unit,
|
||||||
.cmd_done = ahci_cmd_done,
|
.cmd_done = ahci_cmd_done,
|
||||||
.restart_cb = ahci_dma_restart_cb,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
void ahci_init(AHCIState *s, DeviceState *qdev, AddressSpace *as, int ports)
|
void ahci_init(AHCIState *s, DeviceState *qdev, AddressSpace *as, int ports)
|
||||||
|
|
|
@ -2323,16 +2323,11 @@ static int32_t ide_nop_int32(IDEDMA *dma, int x)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ide_nop_restart(void *opaque, int x, RunState y)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
static const IDEDMAOps ide_dma_nop_ops = {
|
static const IDEDMAOps ide_dma_nop_ops = {
|
||||||
.prepare_buf = ide_nop_int32,
|
.prepare_buf = ide_nop_int32,
|
||||||
.restart_dma = ide_nop,
|
.restart_dma = ide_nop,
|
||||||
.rw_buf = ide_nop_int,
|
.rw_buf = ide_nop_int,
|
||||||
.set_unit = 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)
|
static void ide_restart_dma(IDEState *s, enum ide_dma_cmd dma_cmd)
|
||||||
|
|
|
@ -440,7 +440,6 @@ struct IDEDMAOps {
|
||||||
DMAVoidFunc *restart_dma;
|
DMAVoidFunc *restart_dma;
|
||||||
DMAStopFunc *set_inactive;
|
DMAStopFunc *set_inactive;
|
||||||
DMAVoidFunc *cmd_done;
|
DMAVoidFunc *cmd_done;
|
||||||
DMARestartFunc *restart_cb;
|
|
||||||
DMAVoidFunc *reset;
|
DMAVoidFunc *reset;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -558,10 +558,6 @@ static int32_t ide_nop_int32(IDEDMA *dma, int x)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ide_nop_restart(void *opaque, int x, RunState y)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
static void ide_dbdma_start(IDEDMA *dma, IDEState *s,
|
static void ide_dbdma_start(IDEDMA *dma, IDEState *s,
|
||||||
BlockCompletionFunc *cb)
|
BlockCompletionFunc *cb)
|
||||||
{
|
{
|
||||||
|
@ -577,7 +573,6 @@ static const IDEDMAOps dbdma_ops = {
|
||||||
.prepare_buf = ide_nop_int32,
|
.prepare_buf = ide_nop_int32,
|
||||||
.rw_buf = ide_nop_int,
|
.rw_buf = ide_nop_int,
|
||||||
.set_unit = ide_nop_int,
|
.set_unit = ide_nop_int,
|
||||||
.restart_cb = ide_nop_restart,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static void macio_ide_realizefn(DeviceState *dev, Error **errp)
|
static void macio_ide_realizefn(DeviceState *dev, Error **errp)
|
||||||
|
|
Loading…
Reference in a new issue