From 4b09be85a08c601cf2f25f799ab6f4c51c165e0a Mon Sep 17 00:00:00 2001 From: aliguori Date: Wed, 11 Feb 2009 15:21:22 +0000 Subject: [PATCH] qemu: LSI SCSI and e1000 unregister callbacks (Marcelo Tosatti) Signed-off-by: Marcelo Tosatti Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6605 c046a42c-6fe2-441c-8c8c-71466251a162 --- hw/e1000.c | 11 +++++++++++ hw/lsi53c895a.c | 13 +++++++++++++ 2 files changed, 24 insertions(+) diff --git a/hw/e1000.c b/hw/e1000.c index 14c8297b31..e6155d6a69 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -1034,6 +1034,16 @@ e1000_mmio_map(PCIDevice *pci_dev, int region_num, excluded_regs[i] - 4); } +static int +pci_e1000_uninit(PCIDevice *dev) +{ + E1000State *d = (E1000State *) dev; + + cpu_unregister_io_memory(d->mmio_index); + + return 0; +} + PCIDevice * pci_e1000_init(PCIBus *bus, NICInfo *nd, int devfn) { @@ -1092,6 +1102,7 @@ pci_e1000_init(PCIBus *bus, NICInfo *nd, int devfn) qemu_format_nic_info_str(d->vc, d->nd->macaddr); register_savevm(info_str, -1, 2, nic_save, nic_load, d); + d->dev.unregister = pci_e1000_uninit; return (PCIDevice *)d; } diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c index 6991a60325..36ee28e714 100644 --- a/hw/lsi53c895a.c +++ b/hw/lsi53c895a.c @@ -1962,6 +1962,18 @@ void lsi_scsi_attach(void *opaque, BlockDriverState *bd, int id) bd->private = &s->pci_dev; } +static int lsi_scsi_uninit(PCIDevice *d) +{ + LSIState *s = (LSIState *) d; + + cpu_unregister_io_memory(s->mmio_io_addr); + cpu_unregister_io_memory(s->ram_io_addr); + + qemu_free(s->queue); + + return 0; +} + void *lsi_scsi_init(PCIBus *bus, int devfn) { LSIState *s; @@ -2004,6 +2016,7 @@ void *lsi_scsi_init(PCIBus *bus, int devfn) s->queue = qemu_malloc(sizeof(lsi_queue)); s->queue_len = 1; s->active_commands = 0; + s->pci_dev.unregister = lsi_scsi_uninit; lsi_soft_reset(s); -- 2.11.4.GIT