Commit 85e8dab1 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Kevin Wolf
Browse files

aio: move BlockDriverAIOCB to qemu-aio.h 



And remove several block_int.h inclusions that should not be there.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 29cdb251

block.h

+0 −2
Original line number Diff line number Diff line
@@ -180,8 +180,6 @@ typedef struct BdrvCheckResult { 
int bdrv_check(BlockDriverState *bs, BdrvCheckResult *res);



/* async block I/O */

typedef struct BlockDriverAIOCB BlockDriverAIOCB;

typedef void BlockDriverCompletionFunc(void *opaque, int ret);

typedef void BlockDriverDirtyHandler(BlockDriverState *bs, int64_t sector,

                                     int sector_num);

BlockDriverAIOCB *bdrv_aio_readv(BlockDriverState *bs, int64_t sector_num,

block_int.h

+0 −18
Original line number Diff line number Diff line
@@ -53,12 +53,6 @@ 


typedef struct BdrvTrackedRequest BdrvTrackedRequest;



typedef struct AIOPool {

    void (*cancel)(BlockDriverAIOCB *acb);

    int aiocb_size;

    BlockDriverAIOCB *free_aiocb;

} AIOPool;



typedef struct BlockIOLimit {

    int64_t bps[3];

    int64_t iops[3];
@@ -302,20 +296,8 @@ struct BlockDriverState { 
    BlockJob *job;

};



struct BlockDriverAIOCB {

    AIOPool *pool;

    BlockDriverState *bs;

    BlockDriverCompletionFunc *cb;

    void *opaque;

    BlockDriverAIOCB *next;

};



void get_tmp_filename(char *filename, int size);



void *qemu_aio_get(AIOPool *pool, BlockDriverState *bs,

                   BlockDriverCompletionFunc *cb, void *opaque);

void qemu_aio_release(void *p);



void bdrv_set_io_limits(BlockDriverState *bs,

                        BlockIOLimit *io_limits);

dma-helpers.c

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
 */



#include "dma.h"

#include "block_int.h"

#include "trace.h"



void qemu_sglist_init(QEMUSGList *qsg, int alloc_hint)

hw/ide/core.c

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include "sysemu.h"

#include "dma.h"

#include "blockdev.h"

#include "block_int.h"



#include <hw/ide/internal.h>

hw/lsi53c895a.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include "hw.h"

#include "pci.h"

#include "scsi.h"

#include "block_int.h"

#include "dma.h"



//#define DEBUG_LSI