From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:44753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTZ6W-0008Mn-7c for qemu-devel@nongnu.org; Mon, 06 Jun 2011 08:40:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QTZ6U-0005ZH-0I for qemu-devel@nongnu.org; Mon, 06 Jun 2011 08:40:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59412) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTZ6T-0005Yo-Dx for qemu-devel@nongnu.org; Mon, 06 Jun 2011 08:40:21 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p56CeKa2013823 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 6 Jun 2011 08:40:20 -0400 From: Gerd Hoffmann Date: Mon, 6 Jun 2011 14:39:16 +0200 Message-Id: <1307363962-27223-26-git-send-email-kraxel@redhat.com> In-Reply-To: <1307363962-27223-1-git-send-email-kraxel@redhat.com> References: <1307363962-27223-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 25/31] usb: don't call usb_host_device_open from vl.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Not needed any more, usb-host is qdev-ified these days. Well, at least the linux version ... Signed-off-by: Gerd Hoffmann --- vl.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/vl.c b/vl.c index b362871..b432421 100644 --- a/vl.c +++ b/vl.c @@ -923,9 +923,13 @@ static int usb_device_add(const char *devname) goto done; /* the other ones */ +#ifndef CONFIG_LINUX + /* only the linux version is qdev-ified, usb-bsd still needs this */ if (strstart(devname, "host:", &p)) { dev = usb_host_device_open(p); - } else if (!strcmp(devname, "bt") || strstart(devname, "bt:", &p)) { + } else +#endif + if (!strcmp(devname, "bt") || strstart(devname, "bt:", &p)) { dev = usb_bt_init(devname[2] ? hci_init(p) : bt_new_hci(qemu_find_bt_vlan(0))); } else { -- 1.7.1