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

Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging 



Block layer patches

# gpg: Signature made Wed 13 Jul 2016 12:46:17 BST
# gpg:                using RSA key 0x7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream: (34 commits)
  iotests: Make 157 actually format-agnostic
  vvfat: Fix qcow write target driver specification
  hmp: show all of snapshot info on every block dev in output of 'info snapshots'
  hmp: use snapshot name to determine whether a snapshot is 'fully available'
  qemu-iotests: Test naming of throttling groups
  blockdev: Fix regression with the default naming of throttling groups
  vmdk: fix metadata write regression
  Improve block job rate limiting for small bandwidth values
  qcow2: Fix qcow2_get_cluster_offset()
  qemu-io: Use correct range limitations
  qcow2: Avoid making the L1 table too big
  qemu-img: Use strerror() for generic resize error
  block: Remove BB options from blockdev-add
  qemu-iotests: Test setting WCE with qdev
  block/qdev: Allow configuring rerror/werror with qdev properties
  commit: Fix use of error handling policy
  block/qdev: Allow configuring WCE with qdev properties
  block/qdev: Allow node name for drive properties
  coroutine: move entry argument to qemu_coroutine_create
  test-coroutine: prepare for the next patch
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 5bb2399f 543d7a42

block.c

+2 −2
Original line number Diff line number Diff line
@@ -329,8 +329,8 @@ int bdrv_create(BlockDriver *drv, const char* filename, 
        /* Fast-path if already in coroutine context */

        bdrv_create_co_entry(&cco);

    } else {

        co = qemu_coroutine_create(bdrv_create_co_entry);

        qemu_coroutine_enter(co, &cco);

        co = qemu_coroutine_create(bdrv_create_co_entry, &cco);

        qemu_coroutine_enter(co);

        while (cco.ret == NOT_DONE) {

            aio_poll(qemu_get_aio_context(), true);

        }

block/backup.c

+7 −6
Original line number Diff line number Diff line
@@ -474,9 +474,9 @@ static void coroutine_fn backup_run(void *opaque) 
    block_job_defer_to_main_loop(&job->common, backup_complete, data);

}



void backup_start(BlockDriverState *bs, BlockDriverState *target,

                  int64_t speed, MirrorSyncMode sync_mode,

                  BdrvDirtyBitmap *sync_bitmap,

void backup_start(const char *job_id, BlockDriverState *bs,

                  BlockDriverState *target, int64_t speed,

                  MirrorSyncMode sync_mode, BdrvDirtyBitmap *sync_bitmap,

                  BlockdevOnError on_source_error,

                  BlockdevOnError on_target_error,

                  BlockCompletionFunc *cb, void *opaque,
@@ -541,7 +541,8 @@ void backup_start(BlockDriverState *bs, BlockDriverState *target, 
        goto error;

    }



    job = block_job_create(&backup_job_driver, bs, speed, cb, opaque, errp);

    job = block_job_create(job_id, &backup_job_driver, bs, speed,

                           cb, opaque, errp);

    if (!job) {

        goto error;

    }
@@ -575,9 +576,9 @@ void backup_start(BlockDriverState *bs, BlockDriverState *target, 


    bdrv_op_block_all(target, job->common.blocker);

    job->common.len = len;

    job->common.co = qemu_coroutine_create(backup_run);

    job->common.co = qemu_coroutine_create(backup_run, job);

    block_job_txn_add_job(txn, &job->common);

    qemu_coroutine_enter(job->common.co, job);

    qemu_coroutine_enter(job->common.co);

    return;



 error:

block/blkdebug.c

+2 −2
Original line number Diff line number Diff line
@@ -621,7 +621,7 @@ static int blkdebug_debug_resume(BlockDriverState *bs, const char *tag) 


    QLIST_FOREACH_SAFE(r, &s->suspended_reqs, next, next) {

        if (!strcmp(r->tag, tag)) {

            qemu_coroutine_enter(r->co, NULL);

            qemu_coroutine_enter(r->co);

            return 0;

        }

    }
@@ -647,7 +647,7 @@ static int blkdebug_debug_remove_breakpoint(BlockDriverState *bs, 
    }

    QLIST_FOREACH_SAFE(r, &s->suspended_reqs, next, r_next) {

        if (!strcmp(r->tag, tag)) {

            qemu_coroutine_enter(r->co, NULL);

            qemu_coroutine_enter(r->co);

            ret = 0;

        }

    }

block/blkreplay.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static int64_t blkreplay_getlength(BlockDriverState *bs) 
static void blkreplay_bh_cb(void *opaque)

{

    Request *req = opaque;

    qemu_coroutine_enter(req->co, NULL);

    qemu_coroutine_enter(req->co);

    qemu_bh_delete(req->bh);

    g_free(req);

}

block/block-backend.c

+5 −4
Original line number Diff line number Diff line
@@ -836,8 +836,8 @@ static int blk_prw(BlockBackend *blk, int64_t offset, uint8_t *buf, 
        .ret    = NOT_DONE,

    };



    co = qemu_coroutine_create(co_entry);

    qemu_coroutine_enter(co, &rwco);

    co = qemu_coroutine_create(co_entry, &rwco);

    qemu_coroutine_enter(co);



    aio_context = blk_get_aio_context(blk);

    while (rwco.ret == NOT_DONE) {
@@ -950,8 +950,8 @@ static BlockAIOCB *blk_aio_prwv(BlockBackend *blk, int64_t offset, int bytes, 
    acb->bh = NULL;

    acb->has_returned = false;



    co = qemu_coroutine_create(co_entry);

    qemu_coroutine_enter(co, acb);

    co = qemu_coroutine_create(co_entry, acb);

    qemu_coroutine_enter(co);



    acb->has_returned = true;

    if (acb->rwco.ret != NOT_DONE) {
@@ -1173,6 +1173,7 @@ BlockErrorAction blk_get_error_action(BlockBackend *blk, bool is_read, 
        return BLOCK_ERROR_ACTION_REPORT;

    case BLOCKDEV_ON_ERROR_IGNORE:

        return BLOCK_ERROR_ACTION_IGNORE;

    case BLOCKDEV_ON_ERROR_AUTO:

    default:

        abort();

    }