qdev-properties-system.c: Allow vlan or netdev for -device, not both

[qemu.git] / docs / usb-storage.txt

diff --git a/docs/usb-storage.txt b/docs/usb-storage.txt
index e58e849d4d3a80368b6dc3cb1099cc899249fb5c..c5a3866eeb89a5fa1516f9eac034feedf84e3b89 100644 (file)
--- a/docs/usb-storage.txt
+++ b/docs/usb-storage.txt
@@ -2,10 +2,10 @@
 qemu usb storage emulation
 --------------------------
 
-QEMU has two emulations for usb storage devices.
+QEMU has three devices for usb storage emulation.
 
 Number one emulates the classic bulk-only transport protocol which is
-used by 99% of the usb sticks on the marked today and is called
+used by 99% of the usb sticks on the market today and is called
 "usb-storage".  Usage (hooking up to xhci, other host controllers work
 too):
 
@@ -31,6 +31,15 @@ with tree logical units:
        -device scsi-cd,bus=uas.0,scsi-id=0,lun=5,drive=uas-cdrom
 
 
+Number three emulates the classic bulk-only transport protocol too.
+It's called "usb-bot".  It shares most code with "usb-storage", and
+the guest will not be able to see the difference.  The qemu command
+line interface is simliar to usb-uas though, i.e. no automatic scsi
+disk creation.  It also features support for up to 16 LUNs.  The LUN
+numbers must be continuous, i.e. for three devices you must use 0+1+2.
+The 0+1+5 numbering from the "usb-uas" example isn't going to work
+with "usb-bot".
+
 enjoy,
   Gerd