From patchwork Tue May 31 09:35:24 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 97985 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7B8FDB6F6C for ; Tue, 31 May 2011 19:37:00 +1000 (EST) Received: from localhost ([::1]:56725 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QRLNh-0007sK-Uw for incoming@patchwork.ozlabs.org; Tue, 31 May 2011 05:36:57 -0400 Received: from eggs.gnu.org ([140.186.70.92]:48727) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QRLMO-0005UV-Or for qemu-devel@nongnu.org; Tue, 31 May 2011 05:35:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QRLMN-0002lU-OK for qemu-devel@nongnu.org; Tue, 31 May 2011 05:35:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61445) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QRLMN-0002lK-GG for qemu-devel@nongnu.org; Tue, 31 May 2011 05:35:35 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p4V9ZYhj007942 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 31 May 2011 05:35:34 -0400 Received: from shalem.localdomain.com (vpn1-4-207.ams2.redhat.com [10.36.4.207]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p4V9ZLI6032330; Tue, 31 May 2011 05:35:33 -0400 From: Hans de Goede To: qemu-devel@nongnu.org Date: Tue, 31 May 2011 11:35:24 +0200 Message-Id: <1306834530-12763-9-git-send-email-hdegoede@redhat.com> In-Reply-To: <1306834530-12763-1-git-send-email-hdegoede@redhat.com> References: <1306834530-12763-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 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 Subject: [Qemu-devel] [PATCH 08/14] usb-linux: Don't try to open the same device twice 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 If a user wants to redirect 2 identical usb sticks, in theory this is possible by doing: usb_add host:1234:5678 usb_add host:1234:5678 But this will lead to us trying to open the first stick twice, since we don't break the loop after having found a match in our filter list, so the next' filter list entry will result in us trying to open the same device again. Fix this by adding the missing break. --- usb-linux.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/usb-linux.c b/usb-linux.c index 334012e..eb9805b 100644 --- a/usb-linux.c +++ b/usb-linux.c @@ -1689,6 +1689,7 @@ static int usb_host_auto_scan(void *opaque, int bus_num, int addr, char *port, a qdev from its initfn is not allowed. */ s->open_failed = ret; } + break; } return 0;