usb-redir: Device disconnect + re-connect robustness fixes
These fixes mainly target the other side sending some (error status) packets after a disconnect packet. In some cases these would get queued up and then reported to the controller when a new device gets connected. * Fully reset device state on disconnect * Don't allow a connect message when already connected * Ignore iso and interrupt status messages when disconnected Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
65f9d98673
commit
99f08100cd
22
usb-redir.c
22
usb-redir.c
|
@ -881,6 +881,11 @@ static void usbredir_device_connect(void *priv,
|
||||||
{
|
{
|
||||||
USBRedirDevice *dev = priv;
|
USBRedirDevice *dev = priv;
|
||||||
|
|
||||||
|
if (qemu_timer_pending(dev->attach_timer) || dev->dev.attached) {
|
||||||
|
ERROR("Received device connect while already connected\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
switch (device_connect->speed) {
|
switch (device_connect->speed) {
|
||||||
case usb_redir_speed_low:
|
case usb_redir_speed_low:
|
||||||
DPRINTF("attaching low speed device\n");
|
DPRINTF("attaching low speed device\n");
|
||||||
|
@ -909,19 +914,26 @@ static void usbredir_device_connect(void *priv,
|
||||||
static void usbredir_device_disconnect(void *priv)
|
static void usbredir_device_disconnect(void *priv)
|
||||||
{
|
{
|
||||||
USBRedirDevice *dev = priv;
|
USBRedirDevice *dev = priv;
|
||||||
|
int i;
|
||||||
|
|
||||||
/* Stop any pending attaches */
|
/* Stop any pending attaches */
|
||||||
qemu_del_timer(dev->attach_timer);
|
qemu_del_timer(dev->attach_timer);
|
||||||
|
|
||||||
if (dev->dev.attached) {
|
if (dev->dev.attached) {
|
||||||
usb_device_detach(&dev->dev);
|
usb_device_detach(&dev->dev);
|
||||||
usbredir_cleanup_device_queues(dev);
|
|
||||||
/*
|
/*
|
||||||
* Delay next usb device attach to give the guest a chance to see
|
* Delay next usb device attach to give the guest a chance to see
|
||||||
* see the detach / attach in case of quick close / open succession
|
* see the detach / attach in case of quick close / open succession
|
||||||
*/
|
*/
|
||||||
dev->next_attach_time = qemu_get_clock_ms(vm_clock) + 200;
|
dev->next_attach_time = qemu_get_clock_ms(vm_clock) + 200;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Reset state so that the next dev connected starts with a clean slate */
|
||||||
|
usbredir_cleanup_device_queues(dev);
|
||||||
|
memset(dev->endpoint, 0, sizeof(dev->endpoint));
|
||||||
|
for (i = 0; i < MAX_ENDPOINTS; i++) {
|
||||||
|
QTAILQ_INIT(&dev->endpoint[i].bufpq);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void usbredir_interface_info(void *priv,
|
static void usbredir_interface_info(void *priv,
|
||||||
|
@ -1013,6 +1025,10 @@ static void usbredir_iso_stream_status(void *priv, uint32_t id,
|
||||||
DPRINTF("iso status %d ep %02X id %u\n", iso_stream_status->status,
|
DPRINTF("iso status %d ep %02X id %u\n", iso_stream_status->status,
|
||||||
ep, id);
|
ep, id);
|
||||||
|
|
||||||
|
if (!dev->dev.attached) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
dev->endpoint[EP2I(ep)].iso_error = iso_stream_status->status;
|
dev->endpoint[EP2I(ep)].iso_error = iso_stream_status->status;
|
||||||
if (iso_stream_status->status == usb_redir_stall) {
|
if (iso_stream_status->status == usb_redir_stall) {
|
||||||
DPRINTF("iso stream stopped by peer ep %02X\n", ep);
|
DPRINTF("iso stream stopped by peer ep %02X\n", ep);
|
||||||
|
@ -1030,6 +1046,10 @@ static void usbredir_interrupt_receiving_status(void *priv, uint32_t id,
|
||||||
DPRINTF("interrupt recv status %d ep %02X id %u\n",
|
DPRINTF("interrupt recv status %d ep %02X id %u\n",
|
||||||
interrupt_receiving_status->status, ep, id);
|
interrupt_receiving_status->status, ep, id);
|
||||||
|
|
||||||
|
if (!dev->dev.attached) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
dev->endpoint[EP2I(ep)].interrupt_error =
|
dev->endpoint[EP2I(ep)].interrupt_error =
|
||||||
interrupt_receiving_status->status;
|
interrupt_receiving_status->status;
|
||||||
if (interrupt_receiving_status->status == usb_redir_stall) {
|
if (interrupt_receiving_status->status == usb_redir_stall) {
|
||||||
|
|
Loading…
Reference in a new issue