Commit 6b8aeca5 authored by Chen Gang's avatar Chen Gang Committed by Kevin Wolf
Browse files

block.c: Don't return success for bdrv_append_temp_snapshot() failure 



When failure occurs, 'ret' need be set, or may return 0 to indicate
success. Previously, an error was set in errp, but 0 was returned
anyway. So let bdrv_append_temp_snapshot() return an error code and
use that for the bdrv_open() return value.

Also, error_propagate() need be called only one time within a function.

Signed-off-by: default avatarChen Gang <gang.chen.5i5j@gmail.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent d88964ae

block.c

+4 −3
Original line number Diff line number Diff line
@@ -1278,7 +1278,7 @@ done: 
    return ret;

}



void bdrv_append_temp_snapshot(BlockDriverState *bs, int flags, Error **errp)

int bdrv_append_temp_snapshot(BlockDriverState *bs, int flags, Error **errp)

{

    /* TODO: extra byte is a hack to ensure MAX_PATH space on Windows. */

    char *tmp_filename = g_malloc0(PATH_MAX + 1);
@@ -1296,6 +1296,7 @@ void bdrv_append_temp_snapshot(BlockDriverState *bs, int flags, Error **errp) 
    /* Get the required size from the image */

    total_size = bdrv_getlength(bs);

    if (total_size < 0) {

        ret = total_size;

        error_setg_errno(errp, -total_size, "Could not get image size");

        goto out;

    }
@@ -1342,6 +1343,7 @@ void bdrv_append_temp_snapshot(BlockDriverState *bs, int flags, Error **errp) 


out:

    g_free(tmp_filename);

    return ret;

}



/*
@@ -1491,9 +1493,8 @@ int bdrv_open(BlockDriverState **pbs, const char *filename, 
    /* For snapshot=on, create a temporary qcow2 overlay. bs points to the

     * temporary snapshot afterwards. */

    if (snapshot_flags) {

        bdrv_append_temp_snapshot(bs, snapshot_flags, &local_err);

        ret = bdrv_append_temp_snapshot(bs, snapshot_flags, &local_err);

        if (local_err) {

            error_propagate(errp, local_err);

            goto close_and_fail;

        }

    }

include/block/block.h

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ int bdrv_open_image(BlockDriverState **pbs, const char *filename, 
                    bool allow_none, Error **errp);

void bdrv_set_backing_hd(BlockDriverState *bs, BlockDriverState *backing_hd);

int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp);

void bdrv_append_temp_snapshot(BlockDriverState *bs, int flags, Error **errp);

int bdrv_append_temp_snapshot(BlockDriverState *bs, int flags, Error **errp);

int bdrv_open(BlockDriverState **pbs, const char *filename,

              const char *reference, QDict *options, int flags,

              BlockDriver *drv, Error **errp);