diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2009-09-16 22:25:29 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-05 09:32:46 -0500 |
| commit | b2317837f0dadd845b33d528a940adb658b669b9 (patch) | |
| tree | 07b668610459f04f1edb78243f2888e616159977 /hw/usb-uhci.c | |
| parent | ca9c39faed928405574d234b4f7c5704cd2c568e (diff) | |
| download | qemu-b2317837f0dadd845b33d528a940adb658b669b9.zip qemu-b2317837f0dadd845b33d528a940adb658b669b9.tar.gz qemu-b2317837f0dadd845b33d528a940adb658b669b9.tar.bz2 | |
switch usb bus to inplace allocation.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/usb-uhci.c')
| -rw-r--r-- | hw/usb-uhci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c index 6807413..a3ed9b2 100644 --- a/hw/usb-uhci.c +++ b/hw/usb-uhci.c @@ -122,7 +122,7 @@ typedef struct UHCIPort { typedef struct UHCIState { PCIDevice dev; - USBBus *bus; + USBBus bus; uint16_t cmd; /* cmd register */ uint16_t status; uint16_t intr; /* interrupt enable register */ @@ -1083,9 +1083,9 @@ static int usb_uhci_common_initfn(UHCIState *s) pci_conf[0x3d] = 4; // interrupt pin 3 pci_conf[0x60] = 0x10; // release number - s->bus = usb_bus_new(&s->dev.qdev); + usb_bus_new(&s->bus, &s->dev.qdev); for(i = 0; i < NB_PORTS; i++) { - usb_register_port(s->bus, &s->ports[i].port, s, i, uhci_attach); + usb_register_port(&s->bus, &s->ports[i].port, s, i, uhci_attach); } s->frame_timer = qemu_new_timer(vm_clock, uhci_frame_timer, s); |