From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Ladi Prosek <lprosek@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PULL 3/6] xhci: fix logging
Date: Fri, 12 May 2017 14:21:55 +0200 [thread overview]
Message-ID: <20170512122158.32032-4-kraxel@redhat.com> (raw)
In-Reply-To: <20170512122158.32032-1-kraxel@redhat.com>
From: Ladi Prosek <lprosek@redhat.com>
slotid and epid were deleted from XHCITransfer in commit d6fcb29.
Also deleting one unused forward declaration.
Signed-off-by: Ladi Prosek <lprosek@redhat.com>
Message-id: 20170511125314.24549-2-lprosek@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/usb/hcd-xhci.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index a2d3143bf4..d3d47bf925 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -1790,9 +1790,6 @@ static void xhci_stall_ep(XHCITransfer *xfer)
}
}
-static int xhci_submit(XHCIState *xhci, XHCITransfer *xfer,
- XHCIEPContext *epctx);
-
static int xhci_setup_packet(XHCITransfer *xfer)
{
USBEndpoint *ep;
@@ -1806,7 +1803,7 @@ static int xhci_setup_packet(XHCITransfer *xfer)
ep = xhci_epid_to_usbep(xfer->epctx);
if (!ep) {
DPRINTF("xhci: slot %d has no device\n",
- xfer->slotid);
+ xfer->epctx->slotid);
return -1;
}
}
@@ -1980,7 +1977,7 @@ static int xhci_submit(XHCIState *xhci, XHCITransfer *xfer, XHCIEPContext *epctx
{
uint64_t mfindex;
- DPRINTF("xhci_submit(slotid=%d,epid=%d)\n", xfer->slotid, xfer->epid);
+ DPRINTF("xhci_submit(slotid=%d,epid=%d)\n", epctx->slotid, epctx->epid);
xfer->in_xfer = epctx->type>>2;
--
2.9.3
next prev parent reply other threads:[~2017-05-12 12:22 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-12 12:21 [Qemu-devel] [PULL 0/6] usb patch queue Gerd Hoffmann
2017-05-12 12:21 ` [Qemu-devel] [PULL 1/6] qemu-doc: Update to use the new way of attaching USB devices Gerd Hoffmann
2017-05-12 12:21 ` [Qemu-devel] [PULL 2/6] usb-redir: fix stack overflow in usbredir_log_data Gerd Hoffmann
2017-05-12 12:21 ` Gerd Hoffmann [this message]
2017-05-12 12:21 ` [Qemu-devel] [PULL 4/6] usb-hub: clear PORT_STAT_SUSPEND on wakeup Gerd Hoffmann
2017-05-12 12:21 ` [Qemu-devel] [PULL 5/6] xhci: relax link check Gerd Hoffmann
2017-05-12 12:21 ` [Qemu-devel] [PULL 6/6] hw/usb/dev-serial: Do not try to set vendorid or productid properties Gerd Hoffmann
2017-05-18 12:00 ` Paolo Bonzini
2017-05-18 13:22 ` Thomas Huth
2017-05-18 13:35 ` Paolo Bonzini
2017-05-18 14:05 ` Thomas Huth
2017-05-18 16:12 ` Gerd Hoffmann
2017-05-19 5:54 ` Markus Armbruster
2017-05-19 6:20 ` Thomas Huth
2017-05-15 13:30 ` [Qemu-devel] [PULL 0/6] usb patch queue Stefan Hajnoczi
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=20170512122158.32032-4-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=lprosek@redhat.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).