diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-11-18 12:16:14 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-11-18 12:16:14 +0000 |
| commit | 6b79f253a37708f21e8d1cd2831b8d8c03f58989 (patch) | |
| tree | d49b4539828e9c93e16dab41bd7a87225e0c4787 /include | |
| parent | 55db5eeeb7aa3328515817dc4e45728580e517a0 (diff) | |
| parent | d66a8fa83b00b3b3d631a0e28cdce8c9b5698822 (diff) | |
| download | qemu-6b79f253a37708f21e8d1cd2831b8d8c03f58989.zip qemu-6b79f253a37708f21e8d1cd2831b8d8c03f58989.tar.gz qemu-6b79f253a37708f21e8d1cd2831b8d8c03f58989.tar.bz2 | |
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
# gpg: Signature made Tue 17 Nov 2015 20:06:58 GMT using RSA key ID AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
* remotes/jnsnow/tags/ide-pull-request:
ide: enable buffered requests for PIO read requests
ide: enable buffered requests for ATAPI devices
ide: orphan all buffered requests on DMA cancel
ide: add support for IDEBufferedRequest
block: add blk_abort_aio_request
ide/atapi: make PIO read requests async
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sysemu/block-backend.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index f4a68e2..fb068ea4 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -184,5 +184,8 @@ int blk_save_vmstate(BlockBackend *blk, const uint8_t *buf, int blk_load_vmstate(BlockBackend *blk, uint8_t *buf, int64_t pos, int size); int blk_probe_blocksizes(BlockBackend *blk, BlockSizes *bsz); int blk_probe_geometry(BlockBackend *blk, HDGeometry *geo); +BlockAIOCB *blk_abort_aio_request(BlockBackend *blk, + BlockCompletionFunc *cb, + void *opaque, int ret); #endif |