From patchwork Wed Jul 25 03:31:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [5/5] e1000: using new interface--unmap to unplug Date: Tue, 24 Jul 2012 17:31:10 -0000 From: pingfan liu X-Patchwork-Id: 173100 Message-Id: <1343187070-27371-6-git-send-email-qemulist@gmail.com> To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org, Stefan Hajnoczi , Marcelo Tosatti , Avi Kivity , Anthony Liguori , Jan Kiszka From: Liu Ping Fan Signed-off-by: Liu Ping Fan --- hw/e1000.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/hw/e1000.c b/hw/e1000.c index 4573f13..4c1e141 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -1192,6 +1192,18 @@ e1000_cleanup(VLANClientState *nc) s->nic = NULL; } +static void +pci_e1000_unmap(DeviceState *dev) +{ + PCIDevice *p = PCI_DEVICE(dev); + E1000State *d = DO_UPCAST(E1000State, dev, p); + + /* DO NOT FREE anything!until refcnt=0 */ + /* isolate from memory view */ + memory_region_destroy(&d->mmio); + memory_region_destroy(&d->io); +} + static int pci_e1000_uninit(PCIDevice *dev) { @@ -1199,8 +1211,6 @@ pci_e1000_uninit(PCIDevice *dev) qemu_del_timer(d->autoneg_timer); qemu_free_timer(d->autoneg_timer); - memory_region_destroy(&d->mmio); - memory_region_destroy(&d->io); qemu_del_vlan_client(&d->nic->nc); return 0; } @@ -1283,6 +1293,7 @@ static void e1000_class_init(ObjectClass *klass, void *data) k->class_id = PCI_CLASS_NETWORK_ETHERNET; dc->desc = "Intel Gigabit Ethernet"; dc->reset = qdev_e1000_reset; + dc->unmap = pci_e1000_unmap; dc->vmsd = &vmstate_e1000; dc->props = e1000_properties; }