Commit 13399aad authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2018-10-22' into staging 



Error reporting patches for 2018-10-22

# gpg: Signature made Mon 22 Oct 2018 13:20:23 BST
# gpg:                using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-error-2018-10-22: (40 commits)
  error: Drop bogus "use error_setg() instead" admonitions
  vpc: Fail open on bad header checksum
  block: Clean up bdrv_img_create()'s error reporting
  vl: Simplify call of parse_name()
  vl: Fix exit status for -drive format=help
  blockdev: Convert drive_new() to Error
  vl: Assert drive_new() does not fail in default_drive()
  fsdev: Clean up error reporting in qemu_fsdev_add()
  spice: Clean up error reporting in add_channel()
  tpm: Clean up error reporting in tpm_init_tpmdev()
  numa: Clean up error reporting in parse_numa()
  vnc: Clean up error reporting in vnc_init_func()
  ui: Convert vnc_display_init(), init_keyboard_layout() to Error
  ui/keymaps: Fix handling of erroneous include files
  vl: Clean up error reporting in device_init_func()
  vl: Clean up error reporting in parse_fw_cfg()
  vl: Clean up error reporting in mon_init_func()
  vl: Clean up error reporting in machine_set_property()
  vl: Clean up error reporting in chardev_init_func()
  qom: Clean up error reporting in user_creatable_add_opts_foreach()
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 9b29b44e 80313fb5

block.c

+3 −6
Original line number Diff line number Diff line
@@ -4697,8 +4697,8 @@ bool bdrv_op_is_blocked(BlockDriverState *bs, BlockOpType op, Error **errp) 
    assert((int) op >= 0 && op < BLOCK_OP_TYPE_MAX);

    if (!QLIST_EMPTY(&bs->op_blockers[op])) {

        blocker = QLIST_FIRST(&bs->op_blockers[op]);

        error_propagate(errp, error_copy(blocker->reason));

        error_prepend(errp, "Node '%s' is busy: ",

        error_propagate_prepend(errp, error_copy(blocker->reason),

                                "Node '%s' is busy: ",

                                bdrv_get_device_or_node_name(bs));

        return true;

    }
@@ -4803,9 +4803,6 @@ void bdrv_img_create(const char *filename, const char *fmt, 
    if (options) {

        qemu_opts_do_parse(opts, options, NULL, &local_err);

        if (local_err) {

            error_report_err(local_err);

            local_err = NULL;

            error_setg(errp, "Invalid options for file format '%s'", fmt);

            goto out;

        }

    }

block/iscsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1844,7 +1844,7 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags, 
    iscsi_set_timeout(iscsi, timeout);

#else

    if (timeout) {

        error_report("iSCSI: ignoring timeout value for libiscsi <1.15.0");

        warn_report("iSCSI: ignoring timeout value for libiscsi <1.15.0");

    }

#endif

block/qcow2.c

+2 −2
Original line number Diff line number Diff line
@@ -2208,8 +2208,8 @@ static void coroutine_fn qcow2_co_invalidate_cache(BlockDriverState *bs, 
    qemu_co_mutex_unlock(&s->lock);

    qobject_unref(options);

    if (local_err) {

        error_propagate(errp, local_err);

        error_prepend(errp, "Could not reopen qcow2 layer: ");

        error_propagate_prepend(errp, local_err,

                                "Could not reopen qcow2 layer: ");

        bs->drv = NULL;

        return;

    } else if (ret < 0) {

block/qed.c

+2 −2
Original line number Diff line number Diff line
@@ -1606,8 +1606,8 @@ static void coroutine_fn bdrv_qed_co_invalidate_cache(BlockDriverState *bs, 
    ret = bdrv_qed_do_open(bs, NULL, bs->open_flags, &local_err);

    qemu_co_mutex_unlock(&s->table_lock);

    if (local_err) {

        error_propagate(errp, local_err);

        error_prepend(errp, "Could not reopen qed layer: ");

        error_propagate_prepend(errp, local_err,

                                "Could not reopen qed layer: ");

        return;

    } else if (ret < 0) {

        error_setg_errno(errp, -ret, "Could not reopen qed layer");

block/rbd.c

+2 −2
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags, 
        /* Take care whenever deciding to actually deprecate; once this ability

         * is removed, we will not be able to open any images with legacy-styled

         * backing image strings. */

        error_report("RBD options encoded in the filename as keyvalue pairs "

        warn_report("RBD options encoded in the filename as keyvalue pairs "

                    "is deprecated");

    }