david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb-redir: Get rid of local shadow copy of packet headers

Browse Source 
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>
This commit is contained in:
Hans de Goede 2012-08-28 09:05:38 +02:00 committed by Gerd Hoffmann
parent cb897117cd
commit 104981d52b
1 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hw/usb/redirect.c
View File

@ -99,11 +99,6 @@ struct AsyncURB {
USBRedirDevice *dev; USBRedirDevice *dev;
USBPacket *packet; USBPacket *packet;
uint32_t packet_id; 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; QTAILQ_ENTRY(AsyncURB)next;
}; };
@ -500,7 +495,6 @@ static int usbredir_handle_bulk_data(USBRedirDevice *dev, USBPacket *p,
bulk_packet.endpoint = ep; bulk_packet.endpoint = ep;
bulk_packet.length = p->iov.size; bulk_packet.length = p->iov.size;
bulk_packet.stream_id = 0; bulk_packet.stream_id = 0;
aurb->bulk_packet = bulk_packet;
if (ep & USB_DIR_IN) { if (ep & USB_DIR_IN) {
usbredirparser_send_bulk_packet(dev->parser, aurb->packet_id, usbredirparser_send_bulk_packet(dev->parser, aurb->packet_id,
@ -581,7 +575,6 @@ static int usbredir_handle_interrupt_data(USBRedirDevice *dev,
interrupt_packet.endpoint = ep; interrupt_packet.endpoint = ep;
interrupt_packet.length = p->iov.size; interrupt_packet.length = p->iov.size;
aurb->interrupt_packet = interrupt_packet;
usb_packet_copy(p, buf, p->iov.size); usb_packet_copy(p, buf, p->iov.size);
usbredir_log_data(dev, "interrupt data out:", buf, p->iov.size); usbredir_log_data(dev, "interrupt data out:", buf, p->iov.size);
@ -762,7 +755,6 @@ static int usbredir_handle_control(USBDevice *udev, USBPacket *p,
control_packet.value = value; control_packet.value = value;
control_packet.index = index; control_packet.index = index;
control_packet.length = length; control_packet.length = length;
aurb->control_packet = control_packet;
if (control_packet.requesttype & USB_DIR_IN) { if (control_packet.requesttype & USB_DIR_IN) {
usbredirparser_send_control_packet(dev->parser, aurb->packet_id, usbredirparser_send_control_packet(dev->parser, aurb->packet_id,
@ -1326,14 +1318,6 @@ static void usbredir_control_packet(void *priv, uint32_t id,
return; 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) { if (aurb->packet) {
len = usbredir_handle_status(dev, control_packet->status, len); len = usbredir_handle_status(dev, control_packet->status, len);
if (len > 0) { if (len > 0) {
@ -1371,12 +1355,6 @@ static void usbredir_bulk_packet(void *priv, uint32_t id,
return; 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) { if (aurb->packet) {
len = usbredir_handle_status(dev, bulk_packet->status, len); len = usbredir_handle_status(dev, bulk_packet->status, len);
if (len > 0) { if (len > 0) {
@ -1455,11 +1433,6 @@ static void usbredir_interrupt_packet(void *priv, uint32_t id,
return; 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) { if (aurb->packet) {
aurb->packet->result = usbredir_handle_status(dev, aurb->packet->result = usbredir_handle_status(dev,
interrupt_packet->status, len); interrupt_packet->status, len);