diff options
| author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-17 17:11:08 +0000 |
|---|---|---|
| committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-17 17:11:08 +0000 |
| commit | b946a1533209f61a93e34898aebb5b43154b99c3 (patch) | |
| tree | 36b0017910ca42cc5a41671b8edc7faa5da0a452 /hw/e1000.c | |
| parent | 32a8f6ae93f175518f86f99249177c35d1a85114 (diff) | |
| download | qemu-b946a1533209f61a93e34898aebb5b43154b99c3.tar.gz | |
Introduce VLANClientState::cleanup() (Mark McLoughlin)
We're currently leaking memory and file descriptors on device
hot-unplug.
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7150 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/e1000.c')
| -rw-r--r-- | hw/e1000.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/hw/e1000.c b/hw/e1000.c index 2d16774dad..1729db28e1 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -1033,6 +1033,14 @@ e1000_mmio_map(PCIDevice *pci_dev, int region_num, excluded_regs[i] - 4); } +static void +e1000_cleanup(VLANClientState *vc) +{ + E1000State *d = vc->opaque; + + unregister_savevm("e1000", d); +} + static int pci_e1000_uninit(PCIDevice *dev) { @@ -1094,7 +1102,8 @@ pci_e1000_init(PCIBus *bus, NICInfo *nd, int devfn) memset(&d->tx, 0, sizeof d->tx); d->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name, - e1000_receive, e1000_can_receive, d); + e1000_receive, e1000_can_receive, + e1000_cleanup, d); d->vc->link_status_changed = e1000_set_link_status; qemu_format_nic_info_str(d->vc, nd->macaddr); |