From patchwork Tue May 31 09:35:23 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: 97989 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 5EBEAB6F6E for ; Tue, 31 May 2011 19:37:48 +1000 (EST) Received: from localhost ([::1]:60617 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QRLOT-0001Xd-OZ for incoming@patchwork.ozlabs.org; Tue, 31 May 2011 05:37:45 -0400 Received: from eggs.gnu.org ([140.186.70.92]:48716) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QRLMN-0005RY-FF for qemu-devel@nongnu.org; Tue, 31 May 2011 05:35:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QRLMM-0002lB-Hx for qemu-devel@nongnu.org; Tue, 31 May 2011 05:35:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39164) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QRLMM-0002l0-7Q for qemu-devel@nongnu.org; Tue, 31 May 2011 05:35:34 -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 p4V9ZXM3026141 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 31 May 2011 05:35:33 -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 p4V9ZLI5032330; Tue, 31 May 2011 05:35:32 -0400 From: Hans de Goede To: qemu-devel@nongnu.org Date: Tue, 31 May 2011 11:35:23 +0200 Message-Id: <1306834530-12763-8-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 07/14] usb-linux: If opening a device fails remove it from our filter list 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 So that we don't retry to open it every 2 seconds flooding stderr with error messages. --- usb-linux.c | 31 ++++++++++++++++++++++++++++--- 1 files changed, 28 insertions(+), 3 deletions(-) diff --git a/usb-linux.c b/usb-linux.c index e2f45d3..334012e 100644 --- a/usb-linux.c +++ b/usb-linux.c @@ -122,6 +122,7 @@ typedef struct USBHostDevice { int configuration; int ninterfaces; int closing; + int open_failed; Notifier exit; struct endp_data endp_table[MAX_ENDPOINTS]; @@ -1208,6 +1209,10 @@ static int usb_host_initfn(USBDevice *dev) s->exit.notify = usb_host_exit_notifier; qemu_add_exit_notifier(&s->exit); usb_host_auto_check(NULL); + if (s->open_failed) { + usb_host_handle_destroy(dev); + return s->open_failed; + } return 0; } @@ -1272,7 +1277,11 @@ USBDevice *usb_host_device_open(const char *devname) qdev_prop_set_uint32(&dev->qdev, "hostaddr", filter.addr); qdev_prop_set_uint32(&dev->qdev, "vendorid", filter.vendor_id); qdev_prop_set_uint32(&dev->qdev, "productid", filter.product_id); - qdev_init_nofail(&dev->qdev); + + if (qdev_init(&dev->qdev) != 0) { + return NULL; + } + return dev; fail: @@ -1637,6 +1646,7 @@ static int usb_host_auto_scan(void *opaque, int bus_num, int addr, char *port, { struct USBAutoFilter *f; struct USBHostDevice *s; + int ret; /* Ignore hubs */ if (class_id == 9) @@ -1670,7 +1680,15 @@ static int usb_host_auto_scan(void *opaque, int bus_num, int addr, char *port, } DPRINTF("husb: auto open: bus_num %d addr %d\n", bus_num, addr); - usb_host_open(s, bus_num, addr, port, product_name, speed); + ret = usb_host_open(s, bus_num, addr, port, product_name, speed); + if (ret) { + /* If we've found a match but failed to open the device we should + remove it from our auto-filter list, so we don't keep trying to + open it every 2 seconds. However we cannot destroy / free it + here, since we get called from usb_host_initfn, and destroying + a qdev from its initfn is not allowed. */ + s->open_failed = ret; + } } return 0; @@ -1678,9 +1696,16 @@ static int usb_host_auto_scan(void *opaque, int bus_num, int addr, char *port, static void usb_host_auto_check(void *unused) { - struct USBHostDevice *s; + struct USBHostDevice *s, *n; int unconnected = 0; + /* Cleanup devices wich failed to open last time, see usb_host_auto_scan + for why we don't do this after usb_host_auto_scan */ + QTAILQ_FOREACH_SAFE(s, &hostdevs, next, n) { + if (s->open_failed) + qdev_free(&s->dev.qdev); + } + usb_host_scan(NULL, usb_host_auto_scan); QTAILQ_FOREACH(s, &hostdevs, next) {