diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-02-06 12:57:54 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-02-06 12:57:54 +0000 |
| commit | 2021b7c9716cd579e20b4993ed75842f4e0deb34 (patch) | |
| tree | 11474943c7e154794cd207afbb08bf5046f173ea /docs/interop | |
| parent | 418fa86dd465b4fd8394373cf83db8fa65d7611c (diff) | |
| parent | 8ef350b32fe08d254f92a3a7efe89809397fff77 (diff) | |
| download | qemu-2021b7c9716cd579e20b4993ed75842f4e0deb34.zip qemu-2021b7c9716cd579e20b4993ed75842f4e0deb34.tar.gz qemu-2021b7c9716cd579e20b4993ed75842f4e0deb34.tar.bz2 | |
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging
trivial patches 20200206
# gpg: Signature made Thu 06 Feb 2020 12:49:19 GMT
# gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg: issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/trivial-branch-pull-request:
MAINTAINERS: Cc the qemu-arm@nongnu.org for the ARM machines
aspeed/i2c: Prevent uninitialized warning
hw/pci/pci_bridge: Fix typo in comment
qemu-img: Place the '-i aio' option in alphabetical order
qemu-options: replace constant 1 with HAS_ARG
MAINTAINERS: Cover hppa-softmmu.mak in the HP-PARISC Machines section
hw/i386/vmmouse: Fix crash when using the vmmouse on a machine without vmport
hw/bt: Remove empty Kconfig file
hw/timer/m48t59: Convert debug printf()s to trace events
MAINTAINERS: update Leif Lindholm's address
monitor: fix memory leak in monitor_fdset_dup_fd_find_remove
hw/smbios/smbios: Remove unused include
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs/interop')
| -rw-r--r-- | docs/interop/qemu-img.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/interop/qemu-img.rst b/docs/interop/qemu-img.rst index fa27e5c..42e4451 100644 --- a/docs/interop/qemu-img.rst +++ b/docs/interop/qemu-img.rst @@ -247,7 +247,7 @@ Command description: Amends the image format specific *OPTIONS* for the image file *FILENAME*. Not all file formats support this operation. -.. option:: bench [-c COUNT] [-d DEPTH] [-f FMT] [--flush-interval=FLUSH_INTERVAL] [-n] [-i AIO] [--no-drain] [-o OFFSET] [--pattern=PATTERN] [-q] [-s BUFFER_SIZE] [-S STEP_SIZE] [-t CACHE] [-w] [-U] FILENAME +.. option:: bench [-c COUNT] [-d DEPTH] [-f FMT] [--flush-interval=FLUSH_INTERVAL] [-i AIO] [-n] [--no-drain] [-o OFFSET] [--pattern=PATTERN] [-q] [-s BUFFER_SIZE] [-S STEP_SIZE] [-t CACHE] [-w] [-U] FILENAME Run a simple sequential I/O benchmark on the specified image. If ``-w`` is specified, a write test is performed, otherwise a read test is performed. @@ -264,13 +264,13 @@ Command description: ``--no-drain`` is specified, a flush is issued without draining the request queue first. + if ``-i`` is specified, *AIO* option can be used to specify different + AIO backends: ``threads``, ``native`` or ``io_uring``. + If ``-n`` is specified, the native AIO backend is used if possible. On Linux, this option only works if ``-t none`` or ``-t directsync`` is specified as well. - if ``-i`` is specified, *AIO* option can be used to specify different - AIO backends: ``threads``, ``native`` or ``io_uring``. - For write tests, by default a buffer filled with zeros is written. This can be overridden with a pattern byte specified by *PATTERN*. |