Commit 7fa124b2 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2016-06-20' into staging 



Error reporting patches for 2016-06-20

# gpg: Signature made Mon 20 Jun 2016 15:56:15 BST
# gpg:                using RSA key 0x3870B400EB918653
# 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-2016-06-20:
  log: Fix qemu_set_log_filename() error handling
  log: Fix qemu_set_dfilter_ranges() error reporting
  log: Plug memory leak on multiple -dfilter
  coccinelle: Remove unnecessary variables for function return value
  error: Remove unnecessary local_err variables
  error: Remove NULL checks on error_propagate() calls
  vl: Error messages need to go to stderr, fix some

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents fd2590bc daa76aa4

audio/audio.c

+2 −8
Original line number Diff line number Diff line
@@ -1131,8 +1131,6 @@ static void audio_timer (void *opaque) 
 */

int AUD_write (SWVoiceOut *sw, void *buf, int size)

{

    int bytes;



    if (!sw) {

        /* XXX: Consider options */

        return size;
@@ -1143,14 +1141,11 @@ int AUD_write (SWVoiceOut *sw, void *buf, int size) 
        return 0;

    }



    bytes = sw->hw->pcm_ops->write (sw, buf, size);

    return bytes;

    return sw->hw->pcm_ops->write(sw, buf, size);

}



int AUD_read (SWVoiceIn *sw, void *buf, int size)

{

    int bytes;



    if (!sw) {

        /* XXX: Consider options */

        return size;
@@ -1161,8 +1156,7 @@ int AUD_read (SWVoiceIn *sw, void *buf, int size) 
        return 0;

    }



    bytes = sw->hw->pcm_ops->read (sw, buf, size);

    return bytes;

    return sw->hw->pcm_ops->read(sw, buf, size);

}



int AUD_get_buffer_size_out (SWVoiceOut *sw)

block.c

+5 −15
Original line number Diff line number Diff line
@@ -301,9 +301,7 @@ static void coroutine_fn bdrv_create_co_entry(void *opaque) 
    assert(cco->drv);



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

    if (local_err) {

    error_propagate(&cco->err, local_err);

    }

    cco->ret = ret;

}
@@ -364,9 +362,7 @@ int bdrv_create_file(const char *filename, QemuOpts *opts, Error **errp) 
    }



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

    if (local_err) {

    error_propagate(errp, local_err);

    }

    return ret;

}
@@ -1763,18 +1759,14 @@ fail: 
    QDECREF(options);

    bs->options = NULL;

    bdrv_unref(bs);

    if (local_err) {

    error_propagate(errp, local_err);

    }

    return NULL;



close_and_fail:

    bdrv_unref(bs);

    QDECREF(snapshot_options);

    QDECREF(options);

    if (local_err) {

    error_propagate(errp, local_err);

    }

    return NULL;

}
@@ -3599,10 +3591,8 @@ void bdrv_img_create(const char *filename, const char *fmt, 
out:

    qemu_opts_del(opts);

    qemu_opts_free(create_opts);

    if (local_err) {

    error_propagate(errp, local_err);

}

}



AioContext *bdrv_get_aio_context(BlockDriverState *bs)

{

block/archipelago.c

+1 −3
Original line number Diff line number Diff line
@@ -974,11 +974,9 @@ err_exit2: 


static int64_t qemu_archipelago_getlength(BlockDriverState *bs)

{

    int64_t ret;

    BDRVArchipelagoState *s = bs->opaque;



    ret = archipelago_volume_info(s);

    return ret;

    return archipelago_volume_info(s);

}



static int qemu_archipelago_truncate(BlockDriverState *bs, int64_t offset)

block/qcow2-cluster.c

+2 −4
Original line number Diff line number Diff line
@@ -154,11 +154,9 @@ static int l2_load(BlockDriverState *bs, uint64_t l2_offset, 
    uint64_t **l2_table)

{

    BDRVQcow2State *s = bs->opaque;

    int ret;



    ret = qcow2_cache_get(bs, s->l2_table_cache, l2_offset, (void**) l2_table);



    return ret;

    return qcow2_cache_get(bs, s->l2_table_cache, l2_offset,

                           (void **)l2_table);

}



/*

block/qcow2-refcount.c

+2 −5
Original line number Diff line number Diff line
@@ -218,13 +218,10 @@ static int load_refcount_block(BlockDriverState *bs, 
                               void **refcount_block)

{

    BDRVQcow2State *s = bs->opaque;

    int ret;



    BLKDBG_EVENT(bs->file, BLKDBG_REFBLOCK_LOAD);

    ret = qcow2_cache_get(bs, s->refcount_block_cache, refcount_block_offset,

    return qcow2_cache_get(bs, s->refcount_block_cache, refcount_block_offset,

                           refcount_block);



    return ret;

}



/*