Commit 17c8a219 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2016-01-13' into staging 



Error reporting patches for 2016-01-13

# gpg: Signature made Wed 13 Jan 2016 14:21:48 GMT using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"

* remotes/armbru/tags/pull-error-2016-01-13: (41 commits)
  checkpatch: Detect newlines in error_report and other error functions
  error: Consistently name Error * objects err, and not errp
  s390/sclp: Simplify control flow in sclp_realize()
  hw/s390x: Rename local variables Error *l_err to just err
  error: Clean up errors with embedded newlines (again)
  vhdx: Fix "log that needs to be replayed" error message
  pci-assign: Clean up "Failed to assign" error messages
  vmdk: Clean up "Invalid extent lines" error message
  vmdk: Clean up control flow in vmdk_parse_extents() a bit
  error: Strip trailing '\n' from error string arguments (again)
  qemu-io qemu-nbd: Use error_report() etc. instead of fprintf()
  migration: Use error_reportf_err() instead of monitor_printf()
  spapr: Use error_reportf_err()
  error: Use error_prepend() where it makes obvious sense
  error: Use error_reportf_err() where it makes obvious sense
  error: Don't decorate original error message when adding to it
  error: New error_prepend(), error_reportf_err()
  test-throttle: Simplify qemu_init_main_loop() error handling
  qemu-nbd: Clean up "Failed to load snapshot" error message
  block: Clean up "Could not create temporary overlay" error message
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents cd0b19a2 5d596c24

arch_init.c

+1 −3
Original line number Diff line number Diff line
@@ -258,9 +258,7 @@ void do_acpitable_option(const QemuOpts *opts) 


    acpi_table_add(opts, &err);

    if (err) {

        error_report("Wrong acpi table provided: %s",

                     error_get_pretty(err));

        error_free(err);

        error_reportf_err(err, "Wrong acpi table provided: ");

        exit(1);

    }

#endif

audio/audio.c

+2 −9
Original line number Diff line number Diff line
@@ -1806,9 +1806,6 @@ static void audio_init (void) 
    atexit (audio_atexit);



    s->ts = timer_new_ns(QEMU_CLOCK_VIRTUAL, audio_timer, s);

    if (!s->ts) {

        hw_error("Could not create audio timer\n");

    }



    audio_process_options ("AUDIO", audio_options);
@@ -1859,13 +1856,9 @@ static void audio_init (void) 


    if (!done) {

        done = !audio_driver_init (s, &no_audio_driver);

        if (!done) {

            hw_error("Could not initialize audio subsystem\n");

        }

        else {

        assert(done);

        dolog("warning: Using timer based audio emulation\n");

    }

    }



    if (conf.period.hertz <= 0) {

        if (conf.period.hertz < 0) {

block.c

+8 −12
Original line number Diff line number Diff line
@@ -1349,12 +1349,10 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *parent_options, 
    ret = bdrv_open_inherit(&backing_hd,

                            *backing_filename ? backing_filename : NULL,

                            reference, options, 0, bs, &child_backing,

                            &local_err);

                            errp);

    if (ret < 0) {

        bs->open_flags |= BDRV_O_NO_BACKING;

        error_setg(errp, "Could not open backing file: %s",

                   error_get_pretty(local_err));

        error_free(local_err);

        error_prepend(errp, "Could not open backing file: ");

        goto free_exit;

    }
@@ -1460,13 +1458,11 @@ int bdrv_append_temp_snapshot(BlockDriverState *bs, int flags, Error **errp) 
    opts = qemu_opts_create(bdrv_qcow2.create_opts, NULL, 0,

                            &error_abort);

    qemu_opt_set_number(opts, BLOCK_OPT_SIZE, total_size, &error_abort);

    ret = bdrv_create(&bdrv_qcow2, tmp_filename, opts, &local_err);

    ret = bdrv_create(&bdrv_qcow2, tmp_filename, opts, errp);

    qemu_opts_del(opts);

    if (ret < 0) {

        error_setg_errno(errp, -ret, "Could not create temporary overlay "

                         "'%s': %s", tmp_filename,

                         error_get_pretty(local_err));

        error_free(local_err);

        error_prepend(errp, "Could not create temporary overlay '%s': ",

                      tmp_filename);

        goto out;

    }
@@ -3730,9 +3726,9 @@ bool bdrv_op_is_blocked(BlockDriverState *bs, BlockOpType op, Error **errp) 
    if (!QLIST_EMPTY(&bs->op_blockers[op])) {

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

        if (errp) {

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

                       bdrv_get_device_or_node_name(bs),

                       error_get_pretty(blocker->reason));

            *errp = error_copy(blocker->reason);

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

                          bdrv_get_device_or_node_name(bs));

        }

        return true;

    }

block/qcow2.c

+2 −3
Original line number Diff line number Diff line
@@ -1762,9 +1762,8 @@ static void qcow2_invalidate_cache(BlockDriverState *bs, Error **errp) 
    ret = qcow2_open(bs, options, flags, &local_err);

    QDECREF(options);

    if (local_err) {

        error_setg(errp, "Could not reopen qcow2 layer: %s",

                   error_get_pretty(local_err));

        error_free(local_err);

        error_propagate(errp, local_err);

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

        return;

    } else if (ret < 0) {

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

block/qed.c

+2 −3
Original line number Diff line number Diff line
@@ -1611,9 +1611,8 @@ static void bdrv_qed_invalidate_cache(BlockDriverState *bs, Error **errp) 
    memset(s, 0, sizeof(BDRVQEDState));

    ret = bdrv_qed_open(bs, NULL, bs->open_flags, &local_err);

    if (local_err) {

        error_setg(errp, "Could not reopen qed layer: %s",

                   error_get_pretty(local_err));

        error_free(local_err);

        error_propagate(errp, local_err);

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

        return;

    } else if (ret < 0) {

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