X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=block_int.h;h=8d0da7cfd7a6f90fe6399cd5c1be6ed1c56728b4;hb=f452095e3f8d03b87d8df939a370ab767f221c36;hp=0820ed1d5c2b4289d7b74f105885dc6d9b0e55a6;hpb=73c632edc4e28d0a8cae3b34abf7ae46fa33bf1e;p=qemu diff --git a/block_int.h b/block_int.h index 0820ed1..8d0da7c 100644 --- a/block_int.h +++ b/block_int.h @@ -67,8 +67,6 @@ struct BlockDriver { BlockDriverAIOCB *(*bdrv_aio_writev)(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, BlockDriverCompletionFunc *cb, void *opaque); - void (*bdrv_aio_cancel)(BlockDriverAIOCB *acb); - int aiocb_size; const char *protocol_name; int (*bdrv_truncate)(BlockDriverState *bs, int64_t offset); @@ -102,8 +100,6 @@ struct BlockDriver { unsigned long int req, void *buf, BlockDriverCompletionFunc *cb, void *opaque); - AIOPool aio_pool; - /* List of options for creating images, terminated by name == NULL */ QEMUOptionParameter *create_options; @@ -173,13 +169,8 @@ struct BlockDriverAIOCB { void get_tmp_filename(char *filename, int size); -void aio_pool_init(AIOPool *pool, int aiocb_size, - void (*cancel)(BlockDriverAIOCB *acb)); - -void *qemu_aio_get(BlockDriverState *bs, BlockDriverCompletionFunc *cb, - void *opaque); -void *qemu_aio_get_pool(AIOPool *pool, BlockDriverState *bs, - BlockDriverCompletionFunc *cb, void *opaque); +void *qemu_aio_get(AIOPool *pool, BlockDriverState *bs, + BlockDriverCompletionFunc *cb, void *opaque); void qemu_aio_release(void *p); void *qemu_blockalign(BlockDriverState *bs, size_t size);