Commit de532ff1 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 Fri 18 Dec 2015 13:41:03 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"

* remotes/kevin/tags/for-upstream: (48 commits)
  block/qapi: allow best-effort query
  qemu-img: abort when full_backing_filename not present
  block/qapi: explicitly warn if !has_full_backing_filename
  block/qapi: always report full_backing_filename
  block/qapi: do not redundantly print "actual path"
  qemu-iotests: s390x: fix test 068
  qemu-iotests: s390x: fix test 051
  qemu-iotests: refine common.config
  block: fix bdrv_ioctl called from coroutine
  block: use drained section around bdrv_snapshot_delete
  iotests: Update comments for bdrv_swap() in 094
  block: Remove prototype of bdrv_swap from header
  raw-posix: Make aio=native option binding
  qcow2: insert assert into qcow2_get_specific_info()
  iotests: Extend test 112 for qemu-img amend
  qcow2: Point to amend function in check
  qcow2: Invoke refcount order amendment function
  qcow2: Add function for refcount order amendment
  qcow2: Use intermediate helper CB for amend
  qcow2: Split upgrade/downgrade paths for amend
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b06f904f 9d4a6cf0

block.c

+365 −98

File changed.

Preview size limit exceeded, changes collapsed.

block/blkdebug.c

+13 −11
Original line number Diff line number Diff line
@@ -674,17 +674,15 @@ static int blkdebug_truncate(BlockDriverState *bs, int64_t offset) 
    return bdrv_truncate(bs->file->bs, offset);

}



static void blkdebug_refresh_filename(BlockDriverState *bs)

static void blkdebug_refresh_filename(BlockDriverState *bs, QDict *options)

{

    QDict *opts;

    const QDictEntry *e;

    bool force_json = false;



    for (e = qdict_first(bs->options); e; e = qdict_next(bs->options, e)) {

    for (e = qdict_first(options); e; e = qdict_next(options, e)) {

        if (strcmp(qdict_entry_key(e), "config") &&

            strcmp(qdict_entry_key(e), "x-image") &&

            strcmp(qdict_entry_key(e), "image") &&

            strncmp(qdict_entry_key(e), "image.", strlen("image.")))

            strcmp(qdict_entry_key(e), "x-image"))

        {

            force_json = true;

            break;
@@ -700,7 +698,7 @@ static void blkdebug_refresh_filename(BlockDriverState *bs) 
    if (!force_json && bs->file->bs->exact_filename[0]) {

        snprintf(bs->exact_filename, sizeof(bs->exact_filename),

                 "blkdebug:%s:%s",

                 qdict_get_try_str(bs->options, "config") ?: "",

                 qdict_get_try_str(options, "config") ?: "",

                 bs->file->bs->exact_filename);

    }
@@ -710,11 +708,8 @@ static void blkdebug_refresh_filename(BlockDriverState *bs) 
    QINCREF(bs->file->bs->full_open_options);

    qdict_put_obj(opts, "image", QOBJECT(bs->file->bs->full_open_options));



    for (e = qdict_first(bs->options); e; e = qdict_next(bs->options, e)) {

        if (strcmp(qdict_entry_key(e), "x-image") &&

            strcmp(qdict_entry_key(e), "image") &&

            strncmp(qdict_entry_key(e), "image.", strlen("image.")))

        {

    for (e = qdict_first(options); e; e = qdict_next(options, e)) {

        if (strcmp(qdict_entry_key(e), "x-image")) {

            qobject_incref(qdict_entry_value(e));

            qdict_put_obj(opts, qdict_entry_key(e), qdict_entry_value(e));

        }
@@ -723,6 +718,12 @@ static void blkdebug_refresh_filename(BlockDriverState *bs) 
    bs->full_open_options = opts;

}



static int blkdebug_reopen_prepare(BDRVReopenState *reopen_state,

                                   BlockReopenQueue *queue, Error **errp)

{

    return 0;

}



static BlockDriver bdrv_blkdebug = {

    .format_name            = "blkdebug",

    .protocol_name          = "blkdebug",
@@ -731,6 +732,7 @@ static BlockDriver bdrv_blkdebug = { 
    .bdrv_parse_filename    = blkdebug_parse_filename,

    .bdrv_file_open         = blkdebug_open,

    .bdrv_close             = blkdebug_close,

    .bdrv_reopen_prepare    = blkdebug_reopen_prepare,

    .bdrv_getlength         = blkdebug_getlength,

    .bdrv_truncate          = blkdebug_truncate,

    .bdrv_refresh_filename  = blkdebug_refresh_filename,

block/blkverify.c

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ static void blkverify_attach_aio_context(BlockDriverState *bs, 
    bdrv_attach_aio_context(s->test_file->bs, new_context);

}



static void blkverify_refresh_filename(BlockDriverState *bs)

static void blkverify_refresh_filename(BlockDriverState *bs, QDict *options)

{

    BDRVBlkverifyState *s = bs->opaque;

block/io.c

+4 −3
Original line number Diff line number Diff line
@@ -2614,11 +2614,12 @@ int bdrv_ioctl(BlockDriverState *bs, unsigned long int req, void *buf) 
        bdrv_co_ioctl_entry(&data);

    } else {

        Coroutine *co = qemu_coroutine_create(bdrv_co_ioctl_entry);



        qemu_coroutine_enter(co, &data);

    }

        while (data.ret == -EINPROGRESS) {

            aio_poll(bdrv_get_aio_context(bs), true);

        }

    }

    return data.ret;

}

block/mirror.c

+29 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include "qapi/qmp/qerror.h"

#include "qemu/ratelimit.h"

#include "qemu/bitmap.h"

#include "qemu/error-report.h"



#define SLICE_TIME    100000000ULL /* ns */

#define MAX_IN_FLIGHT 16
@@ -370,11 +371,22 @@ static void mirror_exit(BlockJob *job, void *opaque) 
        if (s->to_replace) {

            to_replace = s->to_replace;

        }



        /* This was checked in mirror_start_job(), but meanwhile one of the

         * nodes could have been newly attached to a BlockBackend. */

        if (to_replace->blk && s->target->blk) {

            error_report("block job: Can't create node with two BlockBackends");

            data->ret = -EINVAL;

            goto out;

        }



        if (bdrv_get_flags(s->target) != bdrv_get_flags(to_replace)) {

            bdrv_reopen(s->target, bdrv_get_flags(to_replace), NULL);

        }

        bdrv_replace_in_backing_chain(to_replace, s->target);

    }



out:

    if (s->to_replace) {

        bdrv_op_unblock_all(s->to_replace, s->replace_blocker);

        error_free(s->replace_blocker);
@@ -640,7 +652,7 @@ static void mirror_complete(BlockJob *job, Error **errp) 
    Error *local_err = NULL;

    int ret;



    ret = bdrv_open_backing_file(s->target, NULL, &local_err);

    ret = bdrv_open_backing_file(s->target, NULL, "backing", &local_err);

    if (ret < 0) {

        error_propagate(errp, local_err);

        return;
@@ -705,6 +717,7 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target, 
                             bool is_none_mode, BlockDriverState *base)

{

    MirrorBlockJob *s;

    BlockDriverState *replaced_bs;



    if (granularity == 0) {

        granularity = bdrv_get_default_bitmap_granularity(target);
@@ -728,6 +741,21 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target, 
        buf_size = DEFAULT_MIRROR_BUF_SIZE;

    }



    /* We can't support this case as long as the block layer can't handle

     * multiple BlockBackends per BlockDriverState. */

    if (replaces) {

        replaced_bs = bdrv_lookup_bs(replaces, replaces, errp);

        if (replaced_bs == NULL) {

            return;

        }

    } else {

        replaced_bs = bs;

    }

    if (replaced_bs->blk && target->blk) {

        error_setg(errp, "Can't create node with two BlockBackends");

        return;

    }



    s = block_job_create(driver, bs, speed, cb, opaque, errp);

    if (!s) {

        return;