From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53790) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwMm-0000K2-96 for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UjwMl-0007sZ-EJ for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:56 -0400 Received: from mail-wi0-x22c.google.com ([2a00:1450:400c:c05::22c]:42245) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwMl-0007sR-9V for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:55 -0400 Received: by mail-wi0-f172.google.com with SMTP id m6so4067934wiv.5 for ; Tue, 04 Jun 2013 11:53:54 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 4 Jun 2013 20:52:30 +0200 Message-Id: <1370371954-8479-36-git-send-email-pbonzini@redhat.com> In-Reply-To: <1370371954-8479-1-git-send-email-pbonzini@redhat.com> References: <1370371954-8479-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 35/39] usb-uhci: use instance_finalize instead of exit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com Signed-off-by: Paolo Bonzini --- hw/usb/hcd-uhci.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c index c85b203..766e0fb 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -1282,8 +1282,9 @@ static int usb_uhci_vt82c686b_initfn(PCIDevice *dev) return usb_uhci_common_initfn(dev); } -static void usb_uhci_exit(PCIDevice *dev) +static void usb_uhci_instance_finalize(Object *obj) { + PCIDevice *dev = PCI_DEVICE(obj); UHCIState *s = DO_UPCAST(UHCIState, dev, dev); memory_region_destroy(&s->io_bar); @@ -1305,7 +1306,6 @@ static void uhci_class_init(ObjectClass *klass, void *data) UHCIInfo *info = data; k->init = info->initfn ? info->initfn : usb_uhci_common_initfn; - k->exit = info->unplug ? usb_uhci_exit : NULL; k->vendor_id = info->vendor_id; k->device_id = info->device_id; k->revision = info->revision; @@ -1391,6 +1391,7 @@ static void uhci_register_types(void) .instance_size = sizeof(UHCIState), .class_size = sizeof(UHCIPCIDeviceClass), .class_init = uhci_class_init, + .instance_finalize = usb_uhci_instance_finalize, }; int i; -- 1.8.1.4