From patchwork Thu Feb 21 09:59:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 222232 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 602D02C0092 for ; Thu, 21 Feb 2013 20:59:55 +1100 (EST) Received: from localhost ([::1]:40841 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U8SwT-0003TZ-9L for incoming@patchwork.ozlabs.org; Thu, 21 Feb 2013 04:59:53 -0500 Received: from eggs.gnu.org ([208.118.235.92]:35130) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U8Sw1-0003H8-Jx for qemu-devel@nongnu.org; Thu, 21 Feb 2013 04:59:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U8Svt-0001w1-Q8 for qemu-devel@nongnu.org; Thu, 21 Feb 2013 04:59:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33116) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U8Svt-0001vU-H4 for qemu-devel@nongnu.org; Thu, 21 Feb 2013 04:59:17 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r1L9xGtv030044 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 21 Feb 2013 04:59:16 -0500 Received: from rincewind.home.kraxel.org (ovpn-116-21.ams2.redhat.com [10.36.116.21]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r1L9xFvl018418; Thu, 21 Feb 2013 04:59:16 -0500 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 18EAD41AF1; Thu, 21 Feb 2013 10:59:14 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 21 Feb 2013 10:59:06 +0100 Message-Id: <1361440753-13413-8-git-send-email-kraxel@redhat.com> In-Reply-To: <1361440753-13413-1-git-send-email-kraxel@redhat.com> References: <1361440753-13413-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Anthony Liguori , Gerd Hoffmann Subject: [Qemu-devel] [PATCH 07/14] usb-host: remove usb_host_device_close 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 Nobody implements that anyway. Signed-off-by: Gerd Hoffmann --- hw/usb.h | 1 - hw/usb/host-bsd.c | 6 ------ hw/usb/host-linux.c | 24 ------------------------ hw/usb/host-stub.c | 5 ----- vl.c | 5 +++-- 5 files changed, 3 insertions(+), 38 deletions(-) diff --git a/hw/usb.h b/hw/usb.h index bc42639..90024a4 100644 --- a/hw/usb.h +++ b/hw/usb.h @@ -434,7 +434,6 @@ int set_usb_string(uint8_t *buf, const char *str); /* usb-linux.c */ USBDevice *usb_host_device_open(USBBus *bus, const char *devname); -int usb_host_device_close(const char *devname); void usb_host_info(Monitor *mon, const QDict *qdict); /* usb-bt.c */ diff --git a/hw/usb/host-bsd.c b/hw/usb/host-bsd.c index 07f0e01..39f2281 100644 --- a/hw/usb/host-bsd.c +++ b/hw/usb/host-bsd.c @@ -637,9 +637,3 @@ void usb_host_info(Monitor *mon, const QDict *qdict) { usb_host_scan(mon, usb_host_info_device); } - -/* XXX add this */ -int usb_host_device_close(const char *devname) -{ - return 0; -} diff --git a/hw/usb/host-linux.c b/hw/usb/host-linux.c index c18a6c8..b67aeba 100644 --- a/hw/usb/host-linux.c +++ b/hw/usb/host-linux.c @@ -1540,30 +1540,6 @@ static void usb_host_register_types(void) type_init(usb_host_register_types) -int usb_host_device_close(const char *devname) -{ -#if 0 - char product_name[PRODUCT_NAME_SZ]; - int bus_num, addr; - USBHostDevice *s; - - if (strstr(devname, "auto:")) { - return usb_host_auto_del(devname); - } - if (usb_host_find_device(&bus_num, &addr, product_name, - sizeof(product_name), devname) < 0) { - return -1; - } - s = hostdev_find(bus_num, addr); - if (s) { - usb_device_delete_addr(s->bus_num, s->dev.addr); - return 0; - } -#endif - - return -1; -} - /* * Read sys file-system device file * diff --git a/hw/usb/host-stub.c b/hw/usb/host-stub.c index 8affba7..28d8032 100644 --- a/hw/usb/host-stub.c +++ b/hw/usb/host-stub.c @@ -45,8 +45,3 @@ USBDevice *usb_host_device_open(USBBus *bus, const char *devname) { return NULL; } - -int usb_host_device_close(const char *devname) -{ - return 0; -} diff --git a/vl.c b/vl.c index c5b0eea..955d2ff 100644 --- a/vl.c +++ b/vl.c @@ -1427,8 +1427,9 @@ static int usb_device_del(const char *devname) int bus_num, addr; const char *p; - if (strstart(devname, "host:", &p)) - return usb_host_device_close(p); + if (strstart(devname, "host:", &p)) { + return -1; + } if (!usb_enabled(false)) { return -1;