2012-10-28 18:05:07 +00:00
|
|
|
From 40d22426e0e12f26c7bfa5848cf0a9857d52dc99 Mon Sep 17 00:00:00 2001
|
2012-09-07 15:20:05 +00:00
|
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
|
|
Date: Tue, 28 Aug 2012 09:05:38 +0200
|
2012-10-28 18:05:07 +00:00
|
|
|
Subject: [PATCH] usb-redir: Get rid of local shadow copy of packet headers
|
2012-09-07 15:20:05 +00:00
|
|
|
|
|
|
|
The shadow copy only serves as an extra check (besides the packet-id) to
|
|
|
|
ensure the packet we get back is a reply to the packet we think it is.
|
|
|
|
|
|
|
|
This check has never triggered in all the time usb-redir is in use now,
|
|
|
|
and since the verified data in the returned packet-header is not used
|
|
|
|
otherwise, removing the check does not open any possibilities for the
|
|
|
|
usbredirhost to confuse us.
|
|
|
|
|
|
|
|
This is a preparation patch for completely getting rid of the async-packet
|
|
|
|
struct in usb-redir, instead relying on the (new) per ep queues in the
|
|
|
|
qemu usb core.
|
|
|
|
|
|
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
2012-10-28 18:05:07 +00:00
|
|
|
(cherry picked from commit 104981d52b63dc3d68f39d4442881c667f44bbb9)
|
|
|
|
|
|
|
|
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
2012-09-07 15:20:05 +00:00
|
|
|
---
|
|
|
|
hw/usb/redirect.c | 27 ---------------------------
|
|
|
|
1 file changed, 27 deletions(-)
|
|
|
|
|
|
|
|
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
|
2012-10-28 18:05:07 +00:00
|
|
|
index 2cae8c5..e4ef372 100644
|
2012-09-07 15:20:05 +00:00
|
|
|
--- a/hw/usb/redirect.c
|
|
|
|
+++ b/hw/usb/redirect.c
|
|
|
|
@@ -99,11 +99,6 @@ struct AsyncURB {
|
|
|
|
USBRedirDevice *dev;
|
|
|
|
USBPacket *packet;
|
|
|
|
uint32_t packet_id;
|
|
|
|
- union {
|
|
|
|
- struct usb_redir_control_packet_header control_packet;
|
|
|
|
- struct usb_redir_bulk_packet_header bulk_packet;
|
|
|
|
- struct usb_redir_interrupt_packet_header interrupt_packet;
|
|
|
|
- };
|
|
|
|
QTAILQ_ENTRY(AsyncURB)next;
|
|
|
|
};
|
|
|
|
|
2012-10-28 18:05:07 +00:00
|
|
|
@@ -500,7 +495,6 @@ static int usbredir_handle_bulk_data(USBRedirDevice *dev, USBPacket *p,
|
2012-09-07 15:20:05 +00:00
|
|
|
bulk_packet.endpoint = ep;
|
|
|
|
bulk_packet.length = p->iov.size;
|
|
|
|
bulk_packet.stream_id = 0;
|
|
|
|
- aurb->bulk_packet = bulk_packet;
|
|
|
|
|
|
|
|
if (ep & USB_DIR_IN) {
|
|
|
|
usbredirparser_send_bulk_packet(dev->parser, aurb->packet_id,
|
2012-10-28 18:05:07 +00:00
|
|
|
@@ -581,7 +575,6 @@ static int usbredir_handle_interrupt_data(USBRedirDevice *dev,
|
2012-09-07 15:20:05 +00:00
|
|
|
|
|
|
|
interrupt_packet.endpoint = ep;
|
|
|
|
interrupt_packet.length = p->iov.size;
|
|
|
|
- aurb->interrupt_packet = interrupt_packet;
|
|
|
|
|
|
|
|
usb_packet_copy(p, buf, p->iov.size);
|
|
|
|
usbredir_log_data(dev, "interrupt data out:", buf, p->iov.size);
|
2012-10-28 18:05:07 +00:00
|
|
|
@@ -762,7 +755,6 @@ static int usbredir_handle_control(USBDevice *udev, USBPacket *p,
|
2012-09-07 15:20:05 +00:00
|
|
|
control_packet.value = value;
|
|
|
|
control_packet.index = index;
|
|
|
|
control_packet.length = length;
|
|
|
|
- aurb->control_packet = control_packet;
|
|
|
|
|
|
|
|
if (control_packet.requesttype & USB_DIR_IN) {
|
|
|
|
usbredirparser_send_control_packet(dev->parser, aurb->packet_id,
|
2012-10-28 18:05:07 +00:00
|
|
|
@@ -1326,14 +1318,6 @@ static void usbredir_control_packet(void *priv, uint32_t id,
|
2012-09-07 15:20:05 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
- aurb->control_packet.status = control_packet->status;
|
|
|
|
- aurb->control_packet.length = control_packet->length;
|
|
|
|
- if (memcmp(&aurb->control_packet, control_packet,
|
|
|
|
- sizeof(*control_packet))) {
|
|
|
|
- ERROR("return control packet mismatch, please report this!\n");
|
|
|
|
- len = USB_RET_NAK;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
if (aurb->packet) {
|
|
|
|
len = usbredir_handle_status(dev, control_packet->status, len);
|
|
|
|
if (len > 0) {
|
2012-10-28 18:05:07 +00:00
|
|
|
@@ -1371,12 +1355,6 @@ static void usbredir_bulk_packet(void *priv, uint32_t id,
|
2012-09-07 15:20:05 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
- if (aurb->bulk_packet.endpoint != bulk_packet->endpoint ||
|
|
|
|
- aurb->bulk_packet.stream_id != bulk_packet->stream_id) {
|
|
|
|
- ERROR("return bulk packet mismatch, please report this!\n");
|
|
|
|
- len = USB_RET_NAK;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
if (aurb->packet) {
|
|
|
|
len = usbredir_handle_status(dev, bulk_packet->status, len);
|
|
|
|
if (len > 0) {
|
2012-10-28 18:05:07 +00:00
|
|
|
@@ -1455,11 +1433,6 @@ static void usbredir_interrupt_packet(void *priv, uint32_t id,
|
2012-09-07 15:20:05 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
- if (aurb->interrupt_packet.endpoint != interrupt_packet->endpoint) {
|
|
|
|
- ERROR("return int packet mismatch, please report this!\n");
|
|
|
|
- len = USB_RET_NAK;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
if (aurb->packet) {
|
|
|
|
aurb->packet->result = usbredir_handle_status(dev,
|
|
|
|
interrupt_packet->status, len);
|