From fda03da8a92f7ce5bcc51898f0375ce4311df172 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 23 Jun 2011 12:41:41 -0300 Subject: [RHEL6 qemu-kvm PATCH 066/115] uhci: keep uhci state pointer in async packet struct. RH-Author: Gerd Hoffmann Message-id: <1308832951-8995-66-git-send-email-kraxel@redhat.com> Patchwork-id: 28385 O-Subject: [RHEL-6.2 kvm PATCH 065/115] uhci: keep uhci state pointer in async packet struct. Bugzilla: 561414 632299 645351 711354 RH-Acked-by: Hans de Goede RH-Acked-by: Jes Sorensen RH-Acked-by: Paolo Bonzini RH-Acked-by: Kevin Wolf Signed-off-by: Gerd Hoffmann (cherry picked from commit 7b5a44c546d9b836859c48bcfb7f1d4ef57ac3e1) --- hw/usb-uhci.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) Signed-off-by: Eduardo Habkost --- hw/usb-uhci.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c index bf09c84..b58fd07 100644 --- a/hw/usb-uhci.c +++ b/hw/usb-uhci.c @@ -106,6 +106,8 @@ static void dump_data(const uint8_t *data, int len) static void dump_data(const uint8_t *data, int len) {} #endif +typedef struct UHCIState UHCIState; + /* * Pending async transaction. * 'packet' must be the first field because completion @@ -113,6 +115,7 @@ static void dump_data(const uint8_t *data, int len) {} */ typedef struct UHCIAsync { USBPacket packet; + UHCIState *uhci; QTAILQ_ENTRY(UHCIAsync) next; uint32_t td; uint32_t token; @@ -126,7 +129,7 @@ typedef struct UHCIPort { uint16_t ctrl; } UHCIPort; -typedef struct UHCIState { +struct UHCIState { PCIDevice dev; USBBus bus; uint16_t cmd; /* cmd register */ @@ -145,7 +148,7 @@ typedef struct UHCIState { /* Active packets */ QTAILQ_HEAD(,UHCIAsync) async_pending; uint8_t num_ports_vmstate; -} UHCIState; +}; typedef struct UHCI_TD { uint32_t link; @@ -164,6 +167,7 @@ static UHCIAsync *uhci_async_alloc(UHCIState *s) UHCIAsync *async = qemu_malloc(sizeof(UHCIAsync)); memset(&async->packet, 0, sizeof(async->packet)); + async->uhci = s; async->valid = 0; async->td = 0; async->token = 0; @@ -811,8 +815,8 @@ done: static void uhci_async_complete(USBPacket *packet, void *opaque) { - UHCIState *s = opaque; - UHCIAsync *async = (UHCIAsync *) packet; + UHCIAsync *async = container_of(packet, UHCIAsync, packet); + UHCIState *s = async->uhci; dprintf("uhci: async complete. td 0x%x token 0x%x\n", async->td, async->token); -- 1.7.3.2