[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/17] usb-ehci: add ehci unrealize funciton
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 11/17] usb-ehci: add ehci unrealize funciton |
Date: |
Fri, 29 Aug 2014 14:03:46 +0200 |
From: Gonglei <address@hidden>
cleanup ehci controller resource, both pci and sysbus
if they're necessary.
Signed-off-by: Gonglei <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/hcd-ehci.c | 25 +++++++++++++++++++++++++
hw/usb/hcd-ehci.h | 1 +
2 files changed, 26 insertions(+)
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
index ef26f36..2aa06bb 100644
--- a/hw/usb/hcd-ehci.c
+++ b/hw/usb/hcd-ehci.c
@@ -2471,6 +2471,31 @@ void usb_ehci_realize(EHCIState *s, DeviceState *dev,
Error **errp)
s->vmstate = qemu_add_vm_change_state_handler(usb_ehci_vm_state_change, s);
}
+void usb_ehci_unrealize(EHCIState *s, DeviceState *dev, Error **errp)
+{
+ if (s->frame_timer) {
+ timer_del(s->frame_timer);
+ timer_free(s->frame_timer);
+ s->frame_timer = NULL;
+ }
+ if (s->async_bh) {
+ qemu_bh_delete(s->async_bh);
+ }
+
+ ehci_queues_rip_all(s, 0);
+ ehci_queues_rip_all(s, 1);
+
+ memory_region_del_subregion(&s->mem, &s->mem_caps);
+ memory_region_del_subregion(&s->mem, &s->mem_opreg);
+ memory_region_del_subregion(&s->mem, &s->mem_ports);
+
+ usb_bus_release(&s->bus);
+
+ if (s->vmstate) {
+ qemu_del_vm_change_state_handler(s->vmstate);
+ }
+}
+
void usb_ehci_init(EHCIState *s, DeviceState *dev)
{
/* 2.2 host controller interface version */
diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h
index 594d9d3..4858b7e 100644
--- a/hw/usb/hcd-ehci.h
+++ b/hw/usb/hcd-ehci.h
@@ -323,6 +323,7 @@ extern const VMStateDescription vmstate_ehci;
void usb_ehci_init(EHCIState *s, DeviceState *dev);
void usb_ehci_realize(EHCIState *s, DeviceState *dev, Error **errp);
+void usb_ehci_unrealize(EHCIState *s, DeviceState *dev, Error **errp);
#define TYPE_PCI_EHCI "pci-ehci-usb"
#define PCI_EHCI(obj) OBJECT_CHECK(EHCIPCIState, (obj), TYPE_PCI_EHCI)
--
1.8.3.1
- [Qemu-devel] [PULL 00/17] usb patch queue, Gerd Hoffmann, 2014/08/29
- [Qemu-devel] [PULL 04/17] xhci: use (1u << i), Gerd Hoffmann, 2014/08/29
- [Qemu-devel] [PULL 01/17] usb: Fix bootindex for portnr > 9, Gerd Hoffmann, 2014/08/29
- [Qemu-devel] [PULL 05/17] Revert "xhci: Fix number of streams allocated when using streams", Gerd Hoffmann, 2014/08/29
- [Qemu-devel] [PULL 08/17] usb-ohci: add exit function, Gerd Hoffmann, 2014/08/29
- [Qemu-devel] [PULL 02/17] xhci: fix debug print compiling error, Gerd Hoffmann, 2014/08/29
- [Qemu-devel] [PULL 11/17] usb-ehci: add ehci unrealize funciton,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 10/17] usb-ehci: add vmstate properity for EHCIState, Gerd Hoffmann, 2014/08/29
- [Qemu-devel] [PULL 12/17] usb-ehci: add ehci-pci device exit function, Gerd Hoffmann, 2014/08/29
- [Qemu-devel] [PULL 06/17] usb: add usb_bus_release function, Gerd Hoffmann, 2014/08/29
- [Qemu-devel] [PULL 13/17] usb-xhci: add exit function, Gerd Hoffmann, 2014/08/29
- [Qemu-devel] [PULL 15/17] tests: add OHCI qtest, Gerd Hoffmann, 2014/08/29
- [Qemu-devel] [PULL 03/17] Fix OHCI ISO TD state never being written back., Gerd Hoffmann, 2014/08/29
- [Qemu-devel] [PULL 14/17] usb: add usb host adapters exit trace, Gerd Hoffmann, 2014/08/29
- [Qemu-devel] [PULL 07/17] usb-ohci: Fix memory leak for ohci timer, Gerd Hoffmann, 2014/08/29
- [Qemu-devel] [PULL 17/17] tests: add xHCI qtest, Gerd Hoffmann, 2014/08/29
- [Qemu-devel] [PULL 16/17] tests: add UHCI qtest, Gerd Hoffmann, 2014/08/29