From patchwork Tue May 10 10:30:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 94965 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 AE241B6F06 for ; Tue, 10 May 2011 20:31:14 +1000 (EST) Received: from localhost ([::1]:52963 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJkDf-0003jX-To for incoming@patchwork.ozlabs.org; Tue, 10 May 2011 06:31:11 -0400 Received: from eggs.gnu.org ([140.186.70.92]:53819) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJkDG-0003hA-Po for qemu-devel@nongnu.org; Tue, 10 May 2011 06:30:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QJkDF-00054y-QM for qemu-devel@nongnu.org; Tue, 10 May 2011 06:30:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41319) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJkDF-00054m-FF for qemu-devel@nongnu.org; Tue, 10 May 2011 06:30:45 -0400 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 p4AAUi9d014259 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 10 May 2011 06:30:44 -0400 Received: from rincewind.home.kraxel.org (dhcp-160-144.ber.redhat.com [10.32.160.144]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p4AAUiJE006531; Tue, 10 May 2011 06:30:44 -0400 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 96C4F41F3A; Tue, 10 May 2011 12:30:43 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 10 May 2011 12:30:43 +0200 Message-Id: <1305023443-8722-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1305023443-8722-1-git-send-email-kraxel@redhat.com> References: <1305023443-8722-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: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 2/2] usb-linux: add hostport property 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 This patch adds a hostport property which allows to specify the host usb devices to pass through by bus number and physical port. This means you can basically hand over one (or more) of the usb plugs on your host to the guest and whatever device is plugged in there will show up in the guest. Usage: -device usb-host,hostbus=1,hostport=1 You can figure the port numbers by plugging in some usb device, then find it in "info usbhost" and pick bus and port specified there. Signed-off-by: Gerd Hoffmann --- usb-linux.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/usb-linux.c b/usb-linux.c index 9543a69..5f50767 100644 --- a/usb-linux.c +++ b/usb-linux.c @@ -135,6 +135,7 @@ struct ctrl_struct { struct USBAutoFilter { uint32_t bus_num; uint32_t addr; + char *port; uint32_t vendor_id; uint32_t product_id; }; @@ -1416,6 +1417,7 @@ static struct USBDeviceInfo usb_host_dev_info = { .qdev.props = (Property[]) { DEFINE_PROP_UINT32("hostbus", USBHostDevice, match.bus_num, 0), DEFINE_PROP_UINT32("hostaddr", USBHostDevice, match.addr, 0), + DEFINE_PROP_STRING("hostport", USBHostDevice, match.port), DEFINE_PROP_HEX32("vendorid", USBHostDevice, match.vendor_id, 0), DEFINE_PROP_HEX32("productid", USBHostDevice, match.product_id, 0), DEFINE_PROP_END_OF_LIST(), @@ -1838,6 +1840,9 @@ static int usb_host_auto_scan(void *opaque, int bus_num, int addr, char *port, if (f->addr > 0 && f->addr != addr) { continue; } + if (f->port != NULL && (port == NULL || strcmp(f->port, port) != 0)) { + continue; + } if (f->vendor_id > 0 && f->vendor_id != vendor_id) { continue; @@ -2063,7 +2068,7 @@ void usb_host_info(Monitor *mon) dec2str(f->addr, addr, sizeof(addr)); hex2str(f->vendor_id, vid, sizeof(vid)); hex2str(f->product_id, pid, sizeof(pid)); - monitor_printf(mon, " Device %s.%s ID %s:%s\n", - bus, addr, vid, pid); + monitor_printf(mon, " Bus %s, Addr %s, Port %s, ID %s:%s\n", + bus, addr, f->port ? f->port : "*", vid, pid); } }