openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ehci: save device pointer in EHCIState 

We'll need a pointer to the actual pci/sysbus device,
stick a pointer to it into the EHCIState struct.

https://bugzilla.redhat.com/show_bug.cgi?id=1005495

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2013-09-09 10:18:17 +02:00
parent 615fe4de4b
commit adbecc8973
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/usb/hcd-ehci.c
View File

@ -1241,13 +1241,11 @@ static int ehci_init_transfer(EHCIPacket *p)
{ {
uint32_t cpage, offset, bytes, plen; uint32_t cpage, offset, bytes, plen;
dma_addr_t page; dma_addr_t page;
USBBus *bus = &p->queue->ehci->bus;
BusState *qbus = BUS(bus);
cpage = get_field(p->qtd.token, QTD_TOKEN_CPAGE); cpage = get_field(p->qtd.token, QTD_TOKEN_CPAGE);
bytes = get_field(p->qtd.token, QTD_TOKEN_TBYTES); bytes = get_field(p->qtd.token, QTD_TOKEN_TBYTES);
offset = p->qtd.bufptr[0] & ~QTD_BUFPTR_MASK; offset = p->qtd.bufptr[0] & ~QTD_BUFPTR_MASK;
qemu_sglist_init(&p->sgl, qbus->parent, 5, p->queue->ehci->as); qemu_sglist_init(&p->sgl, p->queue->ehci->device, 5, p->queue->ehci->as);
while (bytes > 0) { while (bytes > 0) {
if (cpage > 4) { if (cpage > 4) {
@ -1486,7 +1484,7 @@ static int ehci_process_itd(EHCIState *ehci,
return -1; return -1;
} }
qemu_sglist_init(&ehci->isgl, DEVICE(ehci), 2, ehci->as); qemu_sglist_init(&ehci->isgl, ehci->device, 2, ehci->as);
if (off + len > 4096) { if (off + len > 4096) {
/* transfer crosses page border */ /* transfer crosses page border */
uint32_t len2 = off + len - 4096; uint32_t len2 = off + len - 4096;
@ -2529,6 +2527,7 @@ void usb_ehci_realize(EHCIState *s, DeviceState *dev, Error **errp)
s->frame_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, ehci_frame_timer, s); s->frame_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, ehci_frame_timer, s);
s->async_bh = qemu_bh_new(ehci_frame_timer, s); s->async_bh = qemu_bh_new(ehci_frame_timer, s);
s->device = dev;
qemu_register_reset(ehci_reset, s); qemu_register_reset(ehci_reset, s);
qemu_add_vm_change_state_handler(usb_ehci_vm_state_change, s); qemu_add_vm_change_state_handler(usb_ehci_vm_state_change, s);

1
hw/usb/hcd-ehci.h
View File

@ -255,6 +255,7 @@ typedef QTAILQ_HEAD(EHCIQueueHead, EHCIQueue) EHCIQueueHead;
struct EHCIState { struct EHCIState {
USBBus bus; USBBus bus;
DeviceState *device;
qemu_irq irq; qemu_irq irq;
MemoryRegion mem; MemoryRegion mem;
AddressSpace *as; AddressSpace *as;