|
 |
958e1b |
From fc1acb16e008aea013d59435fc14b967f1c8a144 Mon Sep 17 00:00:00 2001
|
|
|
958e1b |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
958e1b |
Date: Fri, 11 Jul 2014 14:20:49 +0200
|
|
|
958e1b |
Subject: [PATCH 15/43] usb-hcd-xhci: Remove unused cancelled member from
|
|
|
958e1b |
XHCITransfer
|
|
|
958e1b |
|
|
|
958e1b |
Message-id: <1405088470-24115-17-git-send-email-kraxel@redhat.com>
|
|
|
958e1b |
Patchwork-id: 59831
|
|
|
958e1b |
O-Subject: [RHEL-7.1 qemu-kvm PATCH 16/37] usb-hcd-xhci: Remove unused cancelled member from XHCITransfer
|
|
|
958e1b |
Bugzilla: 980747
|
|
|
958e1b |
RH-Acked-by: Dr. David Alan Gilbert (git) <dgilbert@redhat.com>
|
|
|
958e1b |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
958e1b |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
958e1b |
|
|
|
958e1b |
From: Hans de Goede <hdegoede@redhat.com>
|
|
|
958e1b |
|
|
|
958e1b |
Since qemu's USB model is geared towards emulated devices cancellation
|
|
|
958e1b |
is instanteneous, so no need to wait for cancellation to complete, as
|
|
|
958e1b |
such there is no wait for cancellation code, and the cancelled bool
|
|
|
958e1b |
as well as the bogus comment about it can be removed.
|
|
|
958e1b |
|
|
|
958e1b |
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
958e1b |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
958e1b |
(cherry picked from commit 8de1838afed4b5b05d18cc42a3e5a6fe9b19f29b)
|
|
|
958e1b |
---
|
|
|
958e1b |
hw/usb/hcd-xhci.c | 5 -----
|
|
|
958e1b |
1 file changed, 5 deletions(-)
|
|
|
958e1b |
|
|
|
958e1b |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
958e1b |
---
|
|
|
958e1b |
hw/usb/hcd-xhci.c | 5 -----
|
|
|
958e1b |
1 file changed, 5 deletions(-)
|
|
|
958e1b |
|
|
|
958e1b |
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
|
|
|
958e1b |
index af0c42d..3b4cd01 100644
|
|
|
958e1b |
--- a/hw/usb/hcd-xhci.c
|
|
|
958e1b |
+++ b/hw/usb/hcd-xhci.c
|
|
|
958e1b |
@@ -346,7 +346,6 @@ typedef struct XHCITransfer {
|
|
|
958e1b |
QEMUSGList sgl;
|
|
|
958e1b |
bool running_async;
|
|
|
958e1b |
bool running_retry;
|
|
|
958e1b |
- bool cancelled;
|
|
|
958e1b |
bool complete;
|
|
|
958e1b |
bool int_req;
|
|
|
958e1b |
unsigned int iso_pkts;
|
|
|
958e1b |
@@ -1312,8 +1311,6 @@ static int xhci_ep_nuke_one_xfer(XHCITransfer *t)
|
|
|
958e1b |
if (t->running_async) {
|
|
|
958e1b |
usb_cancel_packet(&t->packet);
|
|
|
958e1b |
t->running_async = 0;
|
|
|
958e1b |
- t->cancelled = 1;
|
|
|
958e1b |
- DPRINTF("xhci: cancelling transfer, waiting for it to complete\n");
|
|
|
958e1b |
killed = 1;
|
|
|
958e1b |
}
|
|
|
958e1b |
if (t->running_retry) {
|
|
|
958e1b |
@@ -1730,14 +1727,12 @@ static int xhci_complete_packet(XHCITransfer *xfer)
|
|
|
958e1b |
xfer->running_async = 1;
|
|
|
958e1b |
xfer->running_retry = 0;
|
|
|
958e1b |
xfer->complete = 0;
|
|
|
958e1b |
- xfer->cancelled = 0;
|
|
|
958e1b |
return 0;
|
|
|
958e1b |
} else if (xfer->packet.status == USB_RET_NAK) {
|
|
|
958e1b |
trace_usb_xhci_xfer_nak(xfer);
|
|
|
958e1b |
xfer->running_async = 0;
|
|
|
958e1b |
xfer->running_retry = 1;
|
|
|
958e1b |
xfer->complete = 0;
|
|
|
958e1b |
- xfer->cancelled = 0;
|
|
|
958e1b |
return 0;
|
|
|
958e1b |
} else {
|
|
|
958e1b |
xfer->running_async = 0;
|
|
|
958e1b |
--
|
|
|
958e1b |
1.8.3.1
|
|
|
958e1b |
|