diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2009-10-21 15:25:42 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-27 12:28:41 -0500 |
| commit | 9ad4531e1e00b996ba55de04d6ecfb4d02a9fd7c (patch) | |
| tree | ba077d0f67589e920591e9f269d10a1f450050fe | |
| parent | 1cc33683c8952c62343e06cceffba5c7990e3b7b (diff) | |
| download | focaccia-qemu-9ad4531e1e00b996ba55de04d6ecfb4d02a9fd7c.tar.gz focaccia-qemu-9ad4531e1e00b996ba55de04d6ecfb4d02a9fd7c.zip | |
kill dead nic unplug code.
Cleanup on unplug happens via qdev->exit() callback now. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | hw/acpi.c | 3 | ||||
| -rw-r--r-- | hw/device-hotplug.c | 16 | ||||
| -rw-r--r-- | hw/pci-hotplug.c | 25 | ||||
| -rw-r--r-- | sysemu.h | 4 |
4 files changed, 0 insertions, 48 deletions
diff --git a/hw/acpi.c b/hw/acpi.c index d73aee99ae..dcc2c862d3 100644 --- a/hw/acpi.c +++ b/hw/acpi.c @@ -702,9 +702,6 @@ static void pciej_write(void *opaque, uint32_t addr, uint32_t val) QLIST_FOREACH_SAFE(qdev, &bus->children, sibling, next) { dev = DO_UPCAST(PCIDevice, qdev, qdev); if (PCI_SLOT(dev->devfn) == slot) { -#if defined (TARGET_I386) - pci_device_hot_remove_success(dev); -#endif qdev_free(qdev); } } diff --git a/hw/device-hotplug.c b/hw/device-hotplug.c index c0cfd31d4d..9cc8376691 100644 --- a/hw/device-hotplug.c +++ b/hw/device-hotplug.c @@ -46,19 +46,3 @@ DriveInfo *add_init_drive(const char *optstr) return dinfo; } - -void destroy_nic(dev_match_fn *match_fn, void *arg) -{ - int i; - NICInfo *nic; - - for (i = 0; i < MAX_NICS; i++) { - nic = &nd_table[i]; - if (nic->used) { - if (nic->private && match_fn(nic->private, arg)) { - qemu_del_vlan_client(nic->vc); - net_client_uninit(nic); - } - } - } -} diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c index 35fa2907cb..4673b898ab 100644 --- a/hw/pci-hotplug.c +++ b/hw/pci-hotplug.c @@ -234,28 +234,3 @@ void do_pci_device_hot_remove(Monitor *mon, const QDict *qdict) { pci_device_hot_remove(mon, qdict_get_str(qdict, "pci_addr")); } - -static int pci_match_fn(void *dev_private, void *arg) -{ - PCIDevice *dev = dev_private; - PCIDevice *match = arg; - - return (dev == match); -} - -/* - * OS has executed _EJ0 method, we now can remove the device - */ -void pci_device_hot_remove_success(PCIDevice *d) -{ - int class_code; - - class_code = d->config_read(d, PCI_CLASS_DEVICE+1, 1); - - switch(class_code) { - case PCI_BASE_CLASS_NETWORK: - destroy_nic(pci_match_fn, d); - break; - } -} - diff --git a/sysemu.h b/sysemu.h index 763861ded5..cda58486b8 100644 --- a/sysemu.h +++ b/sysemu.h @@ -202,17 +202,13 @@ extern DriveInfo *drive_init(QemuOpts *arg, void *machine, int *fatal_error); /* device-hotplug */ -typedef int (dev_match_fn)(void *dev_private, void *arg); - DriveInfo *add_init_drive(const char *opts); -void destroy_nic(dev_match_fn *match_fn, void *arg); /* pci-hotplug */ void pci_device_hot_add(Monitor *mon, const QDict *qdict); void drive_hot_add(Monitor *mon, const QDict *qdict); void pci_device_hot_remove(Monitor *mon, const char *pci_addr); void do_pci_device_hot_remove(Monitor *mon, const QDict *qdict); -void pci_device_hot_remove_success(PCIDevice *dev); /* serial ports */ |