diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-22 13:05:57 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-22 13:05:57 -0500 |
| commit | cecd77ae6df060bbe8f0eea6691112097e680a52 (patch) | |
| tree | 4c82bcf59884c6555cb0199a1f96a26a2dfaf83a /docs | |
| parent | f9308207040dc4a1484cee459bedaec03645b935 (diff) | |
| parent | 01ed1d527c59356e6c4c9d54b5710a3c9e78ce4e (diff) | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
# By liguang (2) and others
# Via Stefan Hajnoczi
* stefanha/trivial-patches:
qdev: remove redundant abort()
gitignore: ignore more files
Use proper term in TCG README
serial: Fix debug format strings
Fix typos and misspellings
Advertise --libdir in configure --help output
memory: fix a bug of detection of memory region collision
MinGW: Replace setsockopt by qemu_setsocketopt
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/usb-storage.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/usb-storage.txt b/docs/usb-storage.txt index fa93111cf6..c5a3866eeb 100644 --- a/docs/usb-storage.txt +++ b/docs/usb-storage.txt @@ -5,7 +5,7 @@ qemu usb storage emulation 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): @@ -36,7 +36,7 @@ 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 continous, i.e. for three devices you must use 0+1+2. +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". |