Commit ad1db3b3 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'kwolf/for-anthony' into staging 



* kwolf/for-anthony: (26 commits)
  qemu-io: Use bdrv_drain_all instead of qemu_aio_flush
  megasas: Use bdrv_drain_all instead of qemu_aio_flush
  vmdk: Fix data corruption bug in WRITE and READ handling
  fdc: remove last usage of FD_STATE_SEEK
  fdc: fix typo in zero constant
  fdc: remove double affectation of FD_MSR_CMDBUSY flag
  fdc-tests: add tests for VERIFY command
  fdc: implement VERIFY command
  fdc-test: Check READ ID
  fdc: fix false FD_SR0_SEEK
  fdc: fix FD_SR0_SEEK for initial seek on DMA transfers
  fdc: fix FD_SR0_SEEK for non-DMA transfers and multi sectors transfers
  fdc: use status0 field instead of a local variable
  fdc-test: add tests for non-DMA READ command
  fdc-test: insert media before fuzzing registers
  fdc-test: split test_media_change() test, so insert part can be reused
  fdc: Remove status0 parameter from fdctrl_set_fifo()
  aio: rename AIOPool to AIOCBInfo
  aio: use g_slice_alloc() for AIOCB pooling
  aio: switch aiocb_size type int -> size_t
  ...

Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents 5cc82c2d e7c8b094

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -553,6 +553,7 @@ T: git git://github.com/kvaneesh/QEMU.git 


virtio-blk

M: Kevin Wolf <kwolf@redhat.com>

M: Stefan Hajnoczi <stefanha@redhat.com>

S: Supported

F: hw/virtio-blk*
@@ -583,6 +584,7 @@ F: audio/ 


Block

M: Kevin Wolf <kwolf@redhat.com>

M: Stefan Hajnoczi <stefanha@redhat.com>

S: Supported

F: block*

F: block/

block.c

+12 −19
Original line number Diff line number Diff line
@@ -3521,7 +3521,7 @@ int bdrv_aio_multiwrite(BlockDriverState *bs, BlockRequest *reqs, int num_reqs) 


void bdrv_aio_cancel(BlockDriverAIOCB *acb)

{

    acb->pool->cancel(acb);

    acb->aiocb_info->cancel(acb);

}



/* block I/O throttling */
@@ -3711,7 +3711,7 @@ static void bdrv_aio_cancel_em(BlockDriverAIOCB *blockacb) 
    qemu_aio_release(acb);

}



static AIOPool bdrv_em_aio_pool = {

static const AIOCBInfo bdrv_em_aiocb_info = {

    .aiocb_size         = sizeof(BlockDriverAIOCBSync),

    .cancel             = bdrv_aio_cancel_em,

};
@@ -3740,7 +3740,7 @@ static BlockDriverAIOCB *bdrv_aio_rw_vector(BlockDriverState *bs, 
{

    BlockDriverAIOCBSync *acb;



    acb = qemu_aio_get(&bdrv_em_aio_pool, bs, cb, opaque);

    acb = qemu_aio_get(&bdrv_em_aiocb_info, bs, cb, opaque);

    acb->is_write = is_write;

    acb->qiov = qiov;

    acb->bounce = qemu_blockalign(bs, qiov->size);
@@ -3785,7 +3785,7 @@ static void bdrv_aio_co_cancel_em(BlockDriverAIOCB *blockacb) 
    qemu_aio_flush();

}



static AIOPool bdrv_em_co_aio_pool = {

static const AIOCBInfo bdrv_em_co_aiocb_info = {

    .aiocb_size         = sizeof(BlockDriverAIOCBCoroutine),

    .cancel             = bdrv_aio_co_cancel_em,

};
@@ -3828,7 +3828,7 @@ static BlockDriverAIOCB *bdrv_co_aio_rw_vector(BlockDriverState *bs, 
    Coroutine *co;

    BlockDriverAIOCBCoroutine *acb;



    acb = qemu_aio_get(&bdrv_em_co_aio_pool, bs, cb, opaque);

    acb = qemu_aio_get(&bdrv_em_co_aiocb_info, bs, cb, opaque);

    acb->req.sector = sector_num;

    acb->req.nb_sectors = nb_sectors;

    acb->req.qiov = qiov;
@@ -3858,7 +3858,7 @@ BlockDriverAIOCB *bdrv_aio_flush(BlockDriverState *bs, 
    Coroutine *co;

    BlockDriverAIOCBCoroutine *acb;



    acb = qemu_aio_get(&bdrv_em_co_aio_pool, bs, cb, opaque);

    acb = qemu_aio_get(&bdrv_em_co_aiocb_info, bs, cb, opaque);

    co = qemu_coroutine_create(bdrv_aio_flush_co_entry);

    qemu_coroutine_enter(co, acb);
@@ -3884,7 +3884,7 @@ BlockDriverAIOCB *bdrv_aio_discard(BlockDriverState *bs, 


    trace_bdrv_aio_discard(bs, sector_num, nb_sectors, opaque);



    acb = qemu_aio_get(&bdrv_em_co_aio_pool, bs, cb, opaque);

    acb = qemu_aio_get(&bdrv_em_co_aiocb_info, bs, cb, opaque);

    acb->req.sector = sector_num;

    acb->req.nb_sectors = nb_sectors;

    co = qemu_coroutine_create(bdrv_aio_discard_co_entry);
@@ -3904,18 +3904,13 @@ void bdrv_init_with_whitelist(void) 
    bdrv_init();

}



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

void *qemu_aio_get(const AIOCBInfo *aiocb_info, BlockDriverState *bs,

                   BlockDriverCompletionFunc *cb, void *opaque)

{

    BlockDriverAIOCB *acb;



    if (pool->free_aiocb) {

        acb = pool->free_aiocb;

        pool->free_aiocb = acb->next;

    } else {

        acb = g_malloc0(pool->aiocb_size);

        acb->pool = pool;

    }

    acb = g_slice_alloc(aiocb_info->aiocb_size);

    acb->aiocb_info = aiocb_info;

    acb->bs = bs;

    acb->cb = cb;

    acb->opaque = opaque;
@@ -3924,10 +3919,8 @@ void *qemu_aio_get(AIOPool *pool, BlockDriverState *bs, 


void qemu_aio_release(void *p)

{

    BlockDriverAIOCB *acb = (BlockDriverAIOCB *)p;

    AIOPool *pool = acb->pool;

    acb->next = pool->free_aiocb;

    pool->free_aiocb = acb;

    BlockDriverAIOCB *acb = p;

    g_slice_free1(acb->aiocb_info->aiocb_size, acb);

}



/**************************************************************/

block/blkdebug.c

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ typedef struct BlkdebugAIOCB { 


static void blkdebug_aio_cancel(BlockDriverAIOCB *blockacb);



static AIOPool blkdebug_aio_pool = {

static const AIOCBInfo blkdebug_aiocb_info = {

    .aiocb_size = sizeof(BlkdebugAIOCB),

    .cancel     = blkdebug_aio_cancel,

};
@@ -335,7 +335,7 @@ static BlockDriverAIOCB *inject_error(BlockDriverState *bs, 
        return NULL;

    }



    acb = qemu_aio_get(&blkdebug_aio_pool, bs, cb, opaque);

    acb = qemu_aio_get(&blkdebug_aiocb_info, bs, cb, opaque);

    acb->ret = -error;



    bh = qemu_bh_new(error_callback_bh, acb);

block/blkverify.c

+2 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static void blkverify_aio_cancel(BlockDriverAIOCB *blockacb) 
    }

}



static AIOPool blkverify_aio_pool = {

static const AIOCBInfo blkverify_aiocb_info = {

    .aiocb_size         = sizeof(BlkverifyAIOCB),

    .cancel             = blkverify_aio_cancel,

};
@@ -233,7 +233,7 @@ static BlkverifyAIOCB *blkverify_aio_get(BlockDriverState *bs, bool is_write, 
                                         BlockDriverCompletionFunc *cb,

                                         void *opaque)

{

    BlkverifyAIOCB *acb = qemu_aio_get(&blkverify_aio_pool, bs, cb, opaque);

    BlkverifyAIOCB *acb = qemu_aio_get(&blkverify_aiocb_info, bs, cb, opaque);



    acb->bh = NULL;

    acb->is_write = is_write;

block/curl.c

+2 −2
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ static void curl_aio_cancel(BlockDriverAIOCB *blockacb) 
    // Do we have to implement canceling? Seems to work without...

}



static AIOPool curl_aio_pool = {

static const AIOCBInfo curl_aiocb_info = {

    .aiocb_size         = sizeof(CURLAIOCB),

    .cancel             = curl_aio_cancel,

};
@@ -505,7 +505,7 @@ static BlockDriverAIOCB *curl_aio_readv(BlockDriverState *bs, 
{

    CURLAIOCB *acb;



    acb = qemu_aio_get(&curl_aio_pool, bs, cb, opaque);

    acb = qemu_aio_get(&curl_aiocb_info, bs, cb, opaque);



    acb->qiov = qiov;

    acb->sector_num = sector_num;