From patchwork Fri Mar 30 07:53:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 149582 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 30D55B6EF4 for ; Fri, 30 Mar 2012 18:52:17 +1100 (EST) Received: from localhost ([::1]:47275 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SDWd5-0004mO-09 for incoming@patchwork.ozlabs.org; Fri, 30 Mar 2012 03:52:15 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46906) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SDWcp-0004bl-2K for qemu-devel@nongnu.org; Fri, 30 Mar 2012 03:52:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SDWci-0004eh-DH for qemu-devel@nongnu.org; Fri, 30 Mar 2012 03:51:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63834) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SDWci-0004eX-5l for qemu-devel@nongnu.org; Fri, 30 Mar 2012 03:51:52 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q2U7po9T030966 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 30 Mar 2012 03:51:50 -0400 Received: from shalem.localdomain.com (vpn1-6-251.ams2.redhat.com [10.36.6.251]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q2U7plEL026017; Fri, 30 Mar 2012 03:51:49 -0400 From: Hans de Goede To: Gerd Hoffmann Date: Fri, 30 Mar 2012 09:53:54 +0200 Message-Id: <1333094034-3682-2-git-send-email-hdegoede@redhat.com> In-Reply-To: <1333094034-3682-1-git-send-email-hdegoede@redhat.com> References: <1333094034-3682-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Hans de Goede , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 2/2] usb-redir: Notify our peer when we reject a device due to a speed mismatch X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Also cleanup (reset) our device state when we reject a device due to a speed mismatch. Signed-off-by: Hans de Goede --- hw/usb/redirect.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index 8e9f175..c9d22e4 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -835,7 +835,13 @@ static void usbredir_do_attach(void *opaque) { USBRedirDevice *dev = opaque; - usb_device_attach(&dev->dev); + if (usb_device_attach(&dev->dev) != 0) { + usbredir_device_disconnect(dev); + if (usbredirparser_peer_has_cap(dev->parser, usb_redir_cap_filter)) { + usbredirparser_send_filter_reject(dev->parser); + usbredirparser_do_write(dev->parser); + } + } } /*