From 38c76d119ab9758a8220f2a314bd55735b7a1441 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 29 Feb 2012 12:39:18 +0100 Subject: [PATCH 03/35] usb-redir: Device disconnect + re-connect robustness fixes RH-Author: Gerd Hoffmann Message-id: <1330519171-24231-4-git-send-email-kraxel@redhat.com> Patchwork-id: 37763 O-Subject: [RHEL-6.3 qemu-kvm PATCH v2 03/16] usb-redir: Device disconnect + re-connect robustness fixes Bugzilla: 758104 RH-Acked-by: Paolo Bonzini RH-Acked-by: Markus Armbruster RH-Acked-by: Alex Williamson From: Hans de Goede 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 Signed-off-by: Anthony Liguori (cherry picked from commit 99f08100cd2b35a35e1c5b2e6b043911a568906c) --- usb-redir.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) Signed-off-by: Michal Novotny --- usb-redir.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/usb-redir.c b/usb-redir.c index 8d60db4..34c34d4 100644 --- a/usb-redir.c +++ b/usb-redir.c @@ -879,6 +879,11 @@ static void usbredir_device_connect(void *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) { case usb_redir_speed_low: DPRINTF("attaching low speed device\n"); @@ -907,13 +912,13 @@ static void usbredir_device_connect(void *priv, static void usbredir_device_disconnect(void *priv) { USBRedirDevice *dev = priv; + int i; /* Stop any pending attaches */ qemu_del_timer(dev->attach_timer); if (dev->dev.attached) { usb_device_detach(&dev->dev); - usbredir_cleanup_device_queues(dev); /* * Delay next usb device attach to give the guest a chance to see * see the detach / attach in case of quick close / open succession @@ -921,6 +926,13 @@ static void usbredir_device_disconnect(void *priv) dev->next_attach_time = qemu_get_clock(vm_clock) + get_ticks_per_sec() * 200 / 1000; /* 200 ms */ } + + /* 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, @@ -1012,6 +1024,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, ep, id); + if (!dev->dev.attached) { + return; + } + dev->endpoint[EP2I(ep)].iso_error = iso_stream_status->status; if (iso_stream_status->status == usb_redir_stall) { DPRINTF("iso stream stopped by peer ep %02X\n", ep); @@ -1029,6 +1045,10 @@ static void usbredir_interrupt_receiving_status(void *priv, uint32_t id, DPRINTF("interrupt recv status %d ep %02X id %u\n", interrupt_receiving_status->status, ep, id); + if (!dev->dev.attached) { + return; + } + dev->endpoint[EP2I(ep)].interrupt_error = interrupt_receiving_status->status; if (interrupt_receiving_status->status == usb_redir_stall) { -- 1.7.7.6