Commit 5451316e authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging 



Pull request

v2:
 * Fix virtio 16lx -> HWADDR_PRIx format specifier [Peter]

# gpg: Signature made Mon 12 Oct 2015 11:19:06 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/block-pull-request:
  sdhci.c: Limit the maximum block size
  block: switch from g_slice allocator to malloc
  virtio dataplane: adapt dataplane for virtio Version 1
  virtio-blk: use blk_io_plug/unplug for Linux AIO batching
  sdhci: Pass drive parameter to sdhci-pci via qdev property

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 0bf224d5 9201bb9a

block/io.c

+2 −2
Original line number Diff line number Diff line
@@ -2218,7 +2218,7 @@ void *qemu_aio_get(const AIOCBInfo *aiocb_info, BlockDriverState *bs, 
{

    BlockAIOCB *acb;



    acb = g_slice_alloc(aiocb_info->aiocb_size);

    acb = g_malloc(aiocb_info->aiocb_size);

    acb->aiocb_info = aiocb_info;

    acb->bs = bs;

    acb->cb = cb;
@@ -2238,7 +2238,7 @@ void qemu_aio_unref(void *p) 
    BlockAIOCB *acb = p;

    assert(acb->refcnt > 0);

    if (--acb->refcnt == 0) {

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

        g_free(acb);

    }

}

block/mirror.c

+2 −2
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static void mirror_iteration_done(MirrorOp *op, int ret) 
    }



    qemu_iovec_destroy(&op->qiov);

    g_slice_free(MirrorOp, op);

    g_free(op);



    if (s->waiting_for_io) {

        qemu_coroutine_enter(s->common.co, NULL);
@@ -264,7 +264,7 @@ static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s) 
    } while (delay_ns == 0 && next_sector < end);



    /* Allocate a MirrorOp that is used as an AIO callback.  */

    op = g_slice_new(MirrorOp);

    op = g_new(MirrorOp, 1);

    op->s = s;

    op->sector_num = sector_num;

    op->nb_sectors = nb_sectors;

block/raw-posix.c

+4 −4
Original line number Diff line number Diff line
@@ -1259,7 +1259,7 @@ static int aio_worker(void *arg) 
        break;

    }



    g_slice_free(RawPosixAIOData, aiocb);

    g_free(aiocb);

    return ret;

}
@@ -1267,7 +1267,7 @@ static int paio_submit_co(BlockDriverState *bs, int fd, 
        int64_t sector_num, QEMUIOVector *qiov, int nb_sectors,

        int type)

{

    RawPosixAIOData *acb = g_slice_new(RawPosixAIOData);

    RawPosixAIOData *acb = g_new(RawPosixAIOData, 1);

    ThreadPool *pool;



    acb->bs = bs;
@@ -1292,7 +1292,7 @@ static BlockAIOCB *paio_submit(BlockDriverState *bs, int fd, 
        int64_t sector_num, QEMUIOVector *qiov, int nb_sectors,

        BlockCompletionFunc *cb, void *opaque, int type)

{

    RawPosixAIOData *acb = g_slice_new(RawPosixAIOData);

    RawPosixAIOData *acb = g_new(RawPosixAIOData, 1);

    ThreadPool *pool;



    acb->bs = bs;
@@ -2237,7 +2237,7 @@ static BlockAIOCB *hdev_aio_ioctl(BlockDriverState *bs, 
    if (fd_open(bs) < 0)

        return NULL;



    acb = g_slice_new(RawPosixAIOData);

    acb = g_new(RawPosixAIOData, 1);

    acb->bs = bs;

    acb->aio_type = QEMU_AIO_IOCTL;

    acb->aio_fildes = s->fd;

block/raw-win32.c

+2 −2
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static int aio_worker(void *arg) 
        break;

    }



    g_slice_free(RawWin32AIOData, aiocb);

    g_free(aiocb);

    return ret;

}
@@ -143,7 +143,7 @@ static BlockAIOCB *paio_submit(BlockDriverState *bs, HANDLE hfile, 
        int64_t sector_num, QEMUIOVector *qiov, int nb_sectors,

        BlockCompletionFunc *cb, void *opaque, int type)

{

    RawWin32AIOData *acb = g_slice_new(RawWin32AIOData);

    RawWin32AIOData *acb = g_new(RawWin32AIOData, 1);

    ThreadPool *pool;



    acb->bs = bs;

hw/block/virtio-blk.c

+6 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 


VirtIOBlockReq *virtio_blk_alloc_request(VirtIOBlock *s)

{

    VirtIOBlockReq *req = g_slice_new(VirtIOBlockReq);

    VirtIOBlockReq *req = g_new(VirtIOBlockReq, 1);

    req->dev = s;

    req->qiov.size = 0;

    req->in_len = 0;
@@ -42,7 +42,7 @@ VirtIOBlockReq *virtio_blk_alloc_request(VirtIOBlock *s) 
void virtio_blk_free_request(VirtIOBlockReq *req)

{

    if (req) {

        g_slice_free(VirtIOBlockReq, req);

        g_free(req);

    }

}
@@ -600,6 +600,8 @@ static void virtio_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq) 
        return;

    }



    blk_io_plug(s->blk);



    while ((req = virtio_blk_get_request(s))) {

        virtio_blk_handle_request(req, &mrb);

    }
@@ -607,6 +609,8 @@ static void virtio_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq) 
    if (mrb.num_reqs) {

        virtio_blk_submit_multireq(s->blk, &mrb);

    }



    blk_io_unplug(s->blk);

}



static void virtio_blk_dma_restart_bh(void *opaque)