From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N0bCd-00085t-8k for qemu-devel@nongnu.org; Wed, 21 Oct 2009 09:26:11 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N0bCX-0007z6-Py for qemu-devel@nongnu.org; Wed, 21 Oct 2009 09:26:10 -0400 Received: from [199.232.76.173] (port=55735 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N0bCX-0007yk-FT for qemu-devel@nongnu.org; Wed, 21 Oct 2009 09:26:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53750) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N0bCW-0007SJ-Uj for qemu-devel@nongnu.org; Wed, 21 Oct 2009 09:26:05 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9LDQ3GL009102 for ; Wed, 21 Oct 2009 09:26:04 -0400 From: Gerd Hoffmann Date: Wed, 21 Oct 2009 15:25:42 +0200 Message-Id: <1256131543-28416-22-git-send-email-kraxel@redhat.com> In-Reply-To: <1256131543-28416-1-git-send-email-kraxel@redhat.com> References: <1256131543-28416-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 21/22] kill dead nic unplug code. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Cleanup on unplug happens via qdev->exit() callback now. Signed-off-by: Gerd Hoffmann --- hw/acpi.c | 3 --- hw/device-hotplug.c | 16 ---------------- hw/pci-hotplug.c | 25 ------------------------- sysemu.h | 4 ---- 4 files changed, 0 insertions(+), 48 deletions(-) diff --git a/hw/acpi.c b/hw/acpi.c index d73aee9..dcc2c86 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 c0cfd31..9cc8376 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 35fa290..4673b89 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 763861d..cda5848 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 */ -- 1.6.2.5