diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-02-23 11:17:52 -0500 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2015-03-10 14:02:22 +0100 |
| commit | f878c916077d510be3276dad7c36f606cdcea80a (patch) | |
| tree | c98666cdab1864856ce4a29674dc29637e685b26 /hw/ide | |
| parent | bd8892c4e6d681517c687ec5ac86eed46b3bb23b (diff) | |
| download | qemu-f878c916077d510be3276dad7c36f606cdcea80a.zip qemu-f878c916077d510be3276dad7c36f606cdcea80a.tar.gz qemu-f878c916077d510be3276dad7c36f606cdcea80a.tar.bz2 | |
ide: introduce ide_register_restart_cb
A helper is added that registers the IDEDMAOp .restart_cb()
via qemu_add_vm_change_state_handler instead of requiring
each HBA to register the callback themselves.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 1424708286-16483-4-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/cmd646.c | 3 | ||||
| -rw-r--r-- | hw/ide/core.c | 5 | ||||
| -rw-r--r-- | hw/ide/internal.h | 1 | ||||
| -rw-r--r-- | hw/ide/piix.c | 3 | ||||
| -rw-r--r-- | hw/ide/via.c | 3 |
5 files changed, 9 insertions, 6 deletions
diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index c8b0322..0374653 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -368,8 +368,7 @@ static int pci_cmd646_ide_initfn(PCIDevice *dev) bmdma_init(&d->bus[i], &d->bmdma[i], d); d->bmdma[i].bus = &d->bus[i]; - qemu_add_vm_change_state_handler(d->bus[i].dma->ops->restart_cb, - &d->bmdma[i].dma); + ide_register_restart_cb(&d->bus[i]); } vmstate_register(DEVICE(dev), 0, &vmstate_ide_pci, d); diff --git a/hw/ide/core.c b/hw/ide/core.c index ac3f015..5a42771 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2330,6 +2330,11 @@ static const IDEDMAOps ide_dma_nop_ops = { .restart_cb = ide_nop_restart, }; +void ide_register_restart_cb(IDEBus *bus) +{ + qemu_add_vm_change_state_handler(bus->dma->ops->restart_cb, bus->dma); +} + static IDEDMA ide_dma_nop = { .ops = &ide_dma_nop_ops, .aiocb = NULL, diff --git a/hw/ide/internal.h b/hw/ide/internal.h index 2566503..57ef5ca 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -551,6 +551,7 @@ int ide_init_drive(IDEState *s, BlockBackend *blk, IDEDriveKind kind, int chs_trans); void ide_init2(IDEBus *bus, qemu_irq irq); void ide_init_ioport(IDEBus *bus, ISADevice *isa, int iobase, int iobase2); +void ide_register_restart_cb(IDEBus *bus); void ide_exec_cmd(IDEBus *bus, uint32_t val); void ide_dma_cb(void *opaque, int ret); diff --git a/hw/ide/piix.c b/hw/ide/piix.c index b0172fb..247dd4f 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -143,8 +143,7 @@ static void pci_piix_init_ports(PCIIDEState *d) { bmdma_init(&d->bus[i], &d->bmdma[i], d); d->bmdma[i].bus = &d->bus[i]; - qemu_add_vm_change_state_handler(d->bus[i].dma->ops->restart_cb, - &d->bmdma[i].dma); + ide_register_restart_cb(&d->bus[i]); } } diff --git a/hw/ide/via.c b/hw/ide/via.c index 4d8089d..fb3d8a0 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -166,8 +166,7 @@ static void vt82c686b_init_ports(PCIIDEState *d) { bmdma_init(&d->bus[i], &d->bmdma[i], d); d->bmdma[i].bus = &d->bus[i]; - qemu_add_vm_change_state_handler(d->bus[i].dma->ops->restart_cb, - &d->bmdma[i].dma); + ide_register_restart_cb(&d->bus[i]); } } |