diff options
| author | Peter Maydell | 2016-07-26 19:22:49 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-07-26 19:22:49 +0200 |
| commit | c1fdfe9fcaf4e47ec3def98c5a7c52d2cae6c511 (patch) | |
| tree | e930fed8593d6842ea04099bf29867b1ec2e65f4 /include/block/aio.h | |
| parent | Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.7-20160726' into... (diff) | |
| parent | iotest: fix python based IO tests (diff) | |
| download | qemu-c1fdfe9fcaf4e47ec3def98c5a7c52d2cae6c511.tar.gz qemu-c1fdfe9fcaf4e47ec3def98c5a7c52d2cae6c511.tar.xz qemu-c1fdfe9fcaf4e47ec3def98c5a7c52d2cae6c511.zip | |
Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2016-07-26' into staging
Block patches for 2.7.0-rc1
# gpg: Signature made Tue 26 Jul 2016 18:11:36 BST
# gpg: using RSA key 0x3BB14202E838ACAD
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>"
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1 1829 F407 DB00 61D5 CF40
# Subkey fingerprint: 58B3 81CE 2DC8 9CF9 9730 EE64 3BB1 4202 E838 ACAD
* remotes/maxreitz/tags/pull-block-2016-07-26:
iotest: fix python based IO tests
block: export LUKS specific data to qemu-img info
crypto: add support for querying parameters for block encryption
AioContext: correct comments
qcow2: do not allocate extra memory
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/block/aio.h')
| -rw-r--r-- | include/block/aio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/block/aio.h b/include/block/aio.h index 209551deb2..173c1ed404 100644 --- a/include/block/aio.h +++ b/include/block/aio.h @@ -74,7 +74,7 @@ struct AioContext { * event_notifier_set necessary. * * Bit 0 is reserved for GSource usage of the AioContext, and is 1 - * between a call to aio_ctx_check and the next call to aio_ctx_dispatch. + * between a call to aio_ctx_prepare and the next call to aio_ctx_check. * Bits 1-31 simply count the number of active calls to aio_poll * that are in the prepare or poll phase. * |