diff options
author | Peter Maydell | 2017-03-16 11:04:41 +0100 |
---|---|---|
committer | Peter Maydell | 2017-03-16 11:04:41 +0100 |
commit | 7c756380281504900aa77af3233463cf3d37ad8f (patch) | |
tree | b86aede3eee5162aa98edfda11365dbed028452d /hw/ide/core.c | |
parent | Merge remote-tracking branch 'remotes/mcayland/tags/qemu-openbios-signed' int... (diff) | |
parent | ide: ahci: call cleanup function in ahci unit (diff) | |
download | qemu-7c756380281504900aa77af3233463cf3d37ad8f.tar.gz qemu-7c756380281504900aa77af3233463cf3d37ad8f.tar.xz qemu-7c756380281504900aa77af3233463cf3d37ad8f.zip |
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
# gpg: Signature made Thu 16 Mar 2017 00:52:41 GMT
# gpg: using RSA key 0x7DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
# Primary key fingerprint: FAEB 9711 A12C F475 812F 18F2 88A9 064D 1835 61EB
# Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76 CBD0 7DEF 8106 AAFC 390E
* remotes/jnsnow/tags/ide-pull-request:
ide: ahci: call cleanup function in ahci unit
ide: core: add cleanup function
ide: qdev: register ide bus unrealize function
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/ide/core.c')
-rw-r--r-- | hw/ide/core.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/hw/ide/core.c b/hw/ide/core.c index db509b3e15..0b48b64d3a 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2603,6 +2603,14 @@ void ide_init2(IDEBus *bus, qemu_irq irq) bus->dma = &ide_dma_nop; } +void ide_exit(IDEState *s) +{ + timer_del(s->sector_write_timer); + timer_free(s->sector_write_timer); + qemu_vfree(s->smart_selftest_data); + qemu_vfree(s->io_buffer); +} + static const MemoryRegionPortio ide_portio_list[] = { { 0, 8, 1, .read = ide_ioport_read, .write = ide_ioport_write }, { 0, 1, 2, .read = ide_data_readw, .write = ide_data_writew }, |