From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNKEQ-0007NZ-3A for qemu-devel@nongnu.org; Wed, 03 Apr 2013 05:43:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UNKEK-0003PE-Jy for qemu-devel@nongnu.org; Wed, 03 Apr 2013 05:43:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1172) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNKEK-0003Og-CZ for qemu-devel@nongnu.org; Wed, 03 Apr 2013 05:43:44 -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 r339hhjG028335 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 3 Apr 2013 05:43:43 -0400 From: Gerd Hoffmann Date: Wed, 3 Apr 2013 11:43:39 +0200 Message-Id: <1364982220-4755-10-git-send-email-kraxel@redhat.com> In-Reply-To: <1364982220-4755-1-git-send-email-kraxel@redhat.com> References: <1364982220-4755-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 09/10] usb: update docs for bus name change List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann At some point the default usb bus name changed from 'usb.0' to 'usb-bus.0' (probably as part of the qom conversion). Update the usb documentation accordingly. Signed-off-by: Gerd Hoffmann --- docs/usb2.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/usb2.txt b/docs/usb2.txt index 43dacde..c7a445a 100644 --- a/docs/usb2.txt +++ b/docs/usb2.txt @@ -11,7 +11,7 @@ one USB 2.0 bus driven by the EHCI controller. Devices must be attached to the correct controller manually. The '-usb' switch will make qemu create the UHCI controller as part of -the PIIX3 chipset. The USB 1.1 bus will carry the name "usb.0". +the PIIX3 chipset. The USB 1.1 bus will carry the name "usb-bus.0". You can use the standard -device switch to add a EHCI controller to your virtual machine. It is strongly recommended to specify an ID for @@ -27,7 +27,7 @@ a complete example: -drive if=none,id=usbstick,file=/path/to/image \ -usb \ -device usb-ehci,id=ehci \ - -device usb-tablet,bus=usb.0 \ + -device usb-tablet,bus=usb-bus.0 \ -device usb-storage,bus=ehci.0,drive=usbstick This attaches a usb tablet to the UHCI adapter and a usb mass storage @@ -88,22 +88,22 @@ ports (1-4), the emulated (1.1) USB hub has eight ports. Plugging a tablet into UHCI port 1 works like this: - -device usb-tablet,bus=usb.0,port=1 + -device usb-tablet,bus=usb-bus.0,port=1 Plugging a hub into UHCI port 2 works like this: - -device usb-hub,bus=usb.0,port=2 + -device usb-hub,bus=usb-bus.0,port=2 Plugging a virtual usb stick into port 4 of the hub just plugged works this way: - -device usb-storage,bus=usb.0,port=2.4,drive=... + -device usb-storage,bus=usb-bus.0,port=2.4,drive=... You can do basically the same in the monitor using the device_add command. If you want to unplug devices too you should specify some unique id which you can use to refer to the device ... - (qemu) device_add usb-tablet,bus=usb.0,port=1,id=my-tablet + (qemu) device_add usb-tablet,bus=usb-bus.0,port=1,id=my-tablet (qemu) device_del my-tablet ... when unplugging it with device_del. @@ -148,10 +148,10 @@ using for testing is bus 1 + port 1 for 2.0 devices and bus 3 + port 1 for 1.1 devices. Passing through any device plugged into that port and also assign them to the correct bus can be done this way: - qemu -M pc ${otheroptions} \ - -usb \ - -device usb-ehci,id=ehci \ - -device usb-host,bus=usb.0,hostbus=3,hostport=1 \ + qemu -M pc ${otheroptions} \ + -usb \ + -device usb-ehci,id=ehci \ + -device usb-host,bus=usb-bus.0,hostbus=3,hostport=1 \ -device usb-host,bus=ehci.0,hostbus=1,hostport=1 enjoy, -- 1.7.9.7