Commit 4c0c9bbe authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging 



* remotes/qmp-unstable/queue/qmp:
  monitor: Add object_add class argument completion.
  monitor: Add object_del id argument completion.
  monitor: Add device_add device argument completion.
  monitor: Add device_del id argument completion.
  qmp: expose list of supported character device backends
  Use error_is_set() only when necessary
  QMP: allow JSON dict arguments in qmp-shell
  hmp: migrate command (without -d) now blocks correctly

Conflicts:
	blockdev.c

[PMM: resolved trivial conflict in blockdev.c]
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 46eef33b 1094fd3a

block.c

+8 −8
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ static void coroutine_fn bdrv_create_co_entry(void *opaque) 
    assert(cco->drv);



    ret = cco->drv->bdrv_create(cco->filename, cco->options, &local_err);

    if (error_is_set(&local_err)) {

    if (local_err) {

        error_propagate(&cco->err, local_err);

    }

    cco->ret = ret;
@@ -460,7 +460,7 @@ int bdrv_create(BlockDriver *drv, const char* filename, 


    ret = cco.ret;

    if (ret < 0) {

        if (error_is_set(&cco.err)) {

        if (cco.err) {

            error_propagate(errp, cco.err);

        } else {

            error_setg_errno(errp, -ret, "Could not create image");
@@ -486,7 +486,7 @@ int bdrv_create_file(const char* filename, QEMUOptionParameter *options, 
    }



    ret = bdrv_create(drv, filename, options, &local_err);

    if (error_is_set(&local_err)) {

    if (local_err) {

        error_propagate(errp, local_err);

    }

    return ret;
@@ -916,7 +916,7 @@ static int bdrv_open_common(BlockDriverState *bs, BlockDriverState *file, 
    }



    if (ret < 0) {

        if (error_is_set(&local_err)) {

        if (local_err) {

            error_propagate(errp, local_err);

        } else if (bs->filename[0]) {

            error_setg_errno(errp, -ret, "Could not open '%s'", bs->filename);
@@ -1037,7 +1037,7 @@ int bdrv_file_open(BlockDriverState **pbs, const char *filename, 
    /* Parse the filename and open it */

    if (drv->bdrv_parse_filename && filename) {

        drv->bdrv_parse_filename(filename, options, &local_err);

        if (error_is_set(&local_err)) {

        if (local_err) {

            error_propagate(errp, local_err);

            ret = -EINVAL;

            goto fail;
@@ -1406,7 +1406,7 @@ fail: 
    QDECREF(bs->options);

    QDECREF(options);

    bs->options = NULL;

    if (error_is_set(&local_err)) {

    if (local_err) {

        error_propagate(errp, local_err);

    }

    return ret;
@@ -1414,7 +1414,7 @@ fail: 
close_and_fail:

    bdrv_close(bs);

    QDECREF(options);

    if (error_is_set(&local_err)) {

    if (local_err) {

        error_propagate(errp, local_err);

    }

    return ret;
@@ -5340,7 +5340,7 @@ out: 
    free_option_parameters(create_options);

    free_option_parameters(param);



    if (error_is_set(&local_err)) {

    if (local_err) {

        error_propagate(errp, local_err);

    }

}

block/blkdebug.c

+2 −2
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ static int read_config(BDRVBlkdebugState *s, const char *filename, 
    }



    qemu_config_parse_qdict(options, config_groups, &local_err);

    if (error_is_set(&local_err)) {

    if (local_err) {

        error_propagate(errp, local_err);

        ret = -EINVAL;

        goto fail;
@@ -393,7 +393,7 @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags, 


    opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);

    qemu_opts_absorb_qdict(opts, options, &local_err);

    if (error_is_set(&local_err)) {

    if (local_err) {

        error_propagate(errp, local_err);

        ret = -EINVAL;

        goto out;

block/blkverify.c

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static int blkverify_open(BlockDriverState *bs, QDict *options, int flags, 


    opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);

    qemu_opts_absorb_qdict(opts, options, &local_err);

    if (error_is_set(&local_err)) {

    if (local_err) {

        error_propagate(errp, local_err);

        ret = -EINVAL;

        goto fail;

block/curl.c

+1 −1
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags, 


    opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);

    qemu_opts_absorb_qdict(opts, options, &local_err);

    if (error_is_set(&local_err)) {

    if (local_err) {

        qerror_report_err(local_err);

        error_free(local_err);

        goto out_noclean;

block/gluster.c

+1 −1
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ static int qemu_gluster_open(BlockDriverState *bs, QDict *options, 


    opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);

    qemu_opts_absorb_qdict(opts, options, &local_err);

    if (error_is_set(&local_err)) {

    if (local_err) {

        qerror_report_err(local_err);

        error_free(local_err);

        ret = -EINVAL;