From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gonglei <arei.gonglei@huawei.com>, Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PULL 02/17] xhci: fix debug print compiling error
Date: Fri, 29 Aug 2014 14:03:37 +0200 [thread overview]
Message-ID: <1409313832-2514-3-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1409313832-2514-1-git-send-email-kraxel@redhat.com>
From: Gonglei <arei.gonglei@huawei.com>
after commit 003e15a180373048f0c1f4df0bfe303746eb2676
the DPRINTF will broke compiling, adjust its location.
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/usb/hcd-xhci.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index 58c4b11..aed8e9f 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -1380,14 +1380,11 @@ static void xhci_init_epctx(XHCIEPContext *epctx,
dequeue = xhci_addr64(ctx[2] & ~0xf, ctx[3]);
epctx->type = (ctx[1] >> EP_TYPE_SHIFT) & EP_TYPE_MASK;
- DPRINTF("xhci: endpoint %d.%d type is %d\n", epid/2, epid%2, epctx->type);
epctx->pctx = pctx;
epctx->max_psize = ctx[1]>>16;
epctx->max_psize *= 1+((ctx[1]>>8)&0xff);
epctx->max_pstreams = (ctx[0] >> 10) & 0xf;
epctx->lsa = (ctx[0] >> 15) & 1;
- DPRINTF("xhci: endpoint %d.%d max transaction (burst) size is %d\n",
- epid/2, epid%2, epctx->max_psize);
if (epctx->max_pstreams) {
xhci_alloc_streams(epctx, dequeue);
} else {
@@ -1418,6 +1415,9 @@ static TRBCCode xhci_enable_ep(XHCIState *xhci, unsigned int slotid,
slot->eps[epid-1] = epctx;
xhci_init_epctx(epctx, pctx, ctx);
+ DPRINTF("xhci: endpoint %d.%d type is %d, max transaction (burst) "
+ "size is %d\n", epid/2, epid%2, epctx->type, epctx->max_psize);
+
epctx->mfindex_last = 0;
epctx->state = EP_RUNNING;
--
1.8.3.1
next prev parent reply other threads:[~2014-08-29 12:04 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-29 12:03 [Qemu-devel] [PULL 00/17] usb patch queue Gerd Hoffmann
2014-08-29 12:03 ` [Qemu-devel] [PULL 01/17] usb: Fix bootindex for portnr > 9 Gerd Hoffmann
2014-08-29 12:03 ` Gerd Hoffmann [this message]
2014-08-29 12:03 ` [Qemu-devel] [PULL 03/17] Fix OHCI ISO TD state never being written back Gerd Hoffmann
2014-08-29 12:03 ` [Qemu-devel] [PULL 04/17] xhci: use (1u << i) Gerd Hoffmann
2014-08-29 12:03 ` [Qemu-devel] [PULL 05/17] Revert "xhci: Fix number of streams allocated when using streams" Gerd Hoffmann
2014-08-29 12:03 ` [Qemu-devel] [PULL 06/17] usb: add usb_bus_release function Gerd Hoffmann
2014-08-29 12:03 ` [Qemu-devel] [PULL 07/17] usb-ohci: Fix memory leak for ohci timer Gerd Hoffmann
2014-08-29 12:03 ` [Qemu-devel] [PULL 08/17] usb-ohci: add exit function Gerd Hoffmann
2014-08-29 12:03 ` [Qemu-devel] [PULL 09/17] usb-uhci: clean up uhci resource when pci-uhci exit Gerd Hoffmann
2014-08-29 12:03 ` [Qemu-devel] [PULL 10/17] usb-ehci: add vmstate properity for EHCIState Gerd Hoffmann
2014-08-29 12:03 ` [Qemu-devel] [PULL 11/17] usb-ehci: add ehci unrealize funciton Gerd Hoffmann
2014-08-29 12:03 ` [Qemu-devel] [PULL 12/17] usb-ehci: add ehci-pci device exit function Gerd Hoffmann
2014-08-29 12:03 ` [Qemu-devel] [PULL 13/17] usb-xhci: add " Gerd Hoffmann
2014-08-29 12:03 ` [Qemu-devel] [PULL 14/17] usb: add usb host adapters exit trace Gerd Hoffmann
2014-08-29 12:03 ` [Qemu-devel] [PULL 15/17] tests: add OHCI qtest Gerd Hoffmann
2014-08-29 12:03 ` [Qemu-devel] [PULL 16/17] tests: add UHCI qtest Gerd Hoffmann
2014-08-29 12:03 ` [Qemu-devel] [PULL 17/17] tests: add xHCI qtest Gerd Hoffmann
2014-08-29 13:12 ` [Qemu-devel] [PULL 00/17] usb patch queue Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1409313832-2514-3-git-send-email-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=arei.gonglei@huawei.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).