From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58321) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bonp5-0007Yw-Hl for qemu-devel@nongnu.org; Tue, 27 Sep 2016 04:33:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bonp0-0007zz-6h for qemu-devel@nongnu.org; Tue, 27 Sep 2016 04:33:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58526) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bonoz-0007zY-U7 for qemu-devel@nongnu.org; Tue, 27 Sep 2016 04:33:02 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 629086363D for ; Tue, 27 Sep 2016 08:33:01 +0000 (UTC) From: Gerd Hoffmann Date: Tue, 27 Sep 2016 10:32:49 +0200 Message-Id: <1474965172-30321-6-git-send-email-kraxel@redhat.com> In-Reply-To: <1474965172-30321-1-git-send-email-kraxel@redhat.com> References: <1474965172-30321-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 5/8] xhci: drop XHCITransfer->xhci List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Use XHCITransfer->epctx->xhci instead. Signed-off-by: Gerd Hoffmann --- hw/usb/hcd-xhci.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index d8e4074..da249f7 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -342,7 +342,6 @@ typedef struct XHCIPort { } XHCIPort; typedef struct XHCITransfer { - XHCIState *xhci; XHCIEPContext *epctx; USBPacket packet; QEMUSGList sgl; @@ -1439,7 +1438,6 @@ static XHCITransfer *xhci_ep_alloc_xfer(XHCIEPContext *epctx, } xfer = g_new0(XHCITransfer, 1); - xfer->xhci = epctx->xhci; xfer->epctx = epctx; xfer->slotid = epctx->slotid; xfer->epid = epctx->epid; @@ -1478,10 +1476,9 @@ static int xhci_ep_nuke_one_xfer(XHCITransfer *t, TRBCCode report) killed = 1; } if (t->running_retry) { - XHCIEPContext *epctx = t->xhci->slots[t->slotid-1].eps[t->epid-1]; - if (epctx) { - epctx->retry = NULL; - timer_del(epctx->kick_timer); + if (t->epctx) { + t->epctx->retry = NULL; + timer_del(t->epctx->kick_timer); } t->running_retry = 0; killed = 1; @@ -1711,7 +1708,7 @@ static TRBCCode xhci_set_ep_dequeue(XHCIState *xhci, unsigned int slotid, static int xhci_xfer_create_sgl(XHCITransfer *xfer, int in_xfer) { - XHCIState *xhci = xfer->xhci; + XHCIState *xhci = xfer->epctx->xhci; int i; xfer->int_req = false; @@ -1770,7 +1767,7 @@ static void xhci_xfer_report(XHCITransfer *xfer) bool reported = 0; bool shortpkt = 0; XHCIEvent event = {ER_TRANSFER, CC_SUCCESS}; - XHCIState *xhci = xfer->xhci; + XHCIState *xhci = xfer->epctx->xhci; int i; left = xfer->packet.actual_length; @@ -1844,9 +1841,8 @@ static void xhci_xfer_report(XHCITransfer *xfer) static void xhci_stall_ep(XHCITransfer *xfer) { - XHCIState *xhci = xfer->xhci; - XHCISlot *slot = &xhci->slots[xfer->slotid-1]; - XHCIEPContext *epctx = slot->eps[xfer->epid-1]; + XHCIEPContext *epctx = xfer->epctx; + XHCIState *xhci = epctx->xhci; uint32_t err; XHCIStreamContext *sctx; @@ -1870,7 +1866,7 @@ static int xhci_submit(XHCIState *xhci, XHCITransfer *xfer, static int xhci_setup_packet(XHCITransfer *xfer) { - XHCIState *xhci = xfer->xhci; + XHCIState *xhci = xfer->epctx->xhci; USBEndpoint *ep; int dir; @@ -3480,7 +3476,7 @@ static void xhci_complete(USBPort *port, USBPacket *packet) return; } xhci_complete_packet(xfer); - xhci_kick_ep(xfer->xhci, xfer->slotid, xfer->epid, xfer->streamid); + xhci_kick_ep(xfer->epctx->xhci, xfer->slotid, xfer->epid, xfer->streamid); if (xfer->complete) { xhci_ep_free_xfer(xfer); } -- 1.8.3.1