Commit 44e3a39f authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging 



Block pull request

# gpg: Signature made Fri 14 Feb 2014 17:26:30 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  block: Open by reference will try device then node_name.
  block: Relax bdrv_lookup_bs constraints.
  blockdev: Fix wrong usage of QDECREF causing snapshoted quorum to crash on close.
  block: mirror - use local_err to avoid NULL errp
  qemu-iotests: Don't run 005 on vmdk split formats
  block: qemu-iotests - add vhdx log replay tests for qemu-img
  block: qemu-iotests - fix test 070 (vhdx)
  block: Don't throw away errno via error_setg
  block: Add notes to iSCSI's .bdrv_open and .bdrv_reopen_prepare
  blockdev: Remove 'type' parameter from blockdev_init()
  sdhci: Drop unnecessary #include

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 90ce3d76 0c5e94ee

block.c

+19 −17
Original line number Diff line number Diff line
@@ -796,6 +796,13 @@ static int bdrv_assign_node_name(BlockDriverState *bs, 
        return -EINVAL;

    }



    /* takes care of avoiding namespaces collisions */

    if (bdrv_find(node_name)) {

        error_setg(errp, "node-name=%s is conflicting with a device id",

                   node_name);

        return -EINVAL;

    }



    /* takes care of avoiding duplicates node names */

    if (bdrv_find_node(node_name)) {

        error_setg(errp, "Duplicate node name");
@@ -977,9 +984,8 @@ int bdrv_file_open(BlockDriverState **pbs, const char *filename, 
        }

        QDECREF(options);



        bs = bdrv_find(reference);

        bs = bdrv_lookup_bs(reference, reference, errp);

        if (!bs) {

            error_setg(errp, "Cannot find block device '%s'", reference);

            return -ENODEV;

        }

        bdrv_ref(bs);
@@ -3574,30 +3580,26 @@ BlockDriverState *bdrv_lookup_bs(const char *device, 
{

    BlockDriverState *bs = NULL;



    if ((!device && !node_name) || (device && node_name)) {

        error_setg(errp, "Use either device or node-name but not both");

        return NULL;

    }



    if (device) {

        bs = bdrv_find(device);



        if (!bs) {

            error_set(errp, QERR_DEVICE_NOT_FOUND, device);

            return NULL;

        }



        if (bs) {

            return bs;

        }

    }



    if (node_name) {

        bs = bdrv_find_node(node_name);



    if (!bs) {

        error_set(errp, QERR_DEVICE_NOT_FOUND, node_name);

        return NULL;

        if (bs) {

            return bs;

        }

    }



    return bs;

    error_setg(errp, "Cannot find device=%s nor node_name=%s",

                     device ? device : "",

                     node_name ? node_name : "");

    return NULL;

}



BlockDriverState *bdrv_next(BlockDriverState *bs)

block/iscsi.c

+8 −2
Original line number Diff line number Diff line
@@ -1099,6 +1099,10 @@ fail: 
/*

 * We support iscsi url's on the form

 * iscsi://[<username>%<password>@]<host>[:<port>]/<targetname>/<lun>

 *

 * Note: flags are currently not used by iscsi_open.  If this function

 * is changed such that flags are used, please examine iscsi_reopen_prepare()

 * to see if needs to be changed as well.

 */

static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,

                      Error **errp)
@@ -1336,11 +1340,13 @@ static int iscsi_refresh_limits(BlockDriverState *bs) 
    return 0;

}



/* We have nothing to do for iSCSI reopen, stub just returns

 * success */

/* Since iscsi_open() ignores bdrv_flags, there is nothing to do here in

 * prepare.  Note that this will not re-establish a connection with an iSCSI

 * target - it is effectively a NOP.  */

static int iscsi_reopen_prepare(BDRVReopenState *state,

                                BlockReopenQueue *queue, Error **errp)

{

    /* NOP */

    return 0;

}

block/mirror.c

+13 −6
Original line number Diff line number Diff line
@@ -633,6 +633,8 @@ void commit_active_start(BlockDriverState *bs, BlockDriverState *base, 
{

    int64_t length, base_length;

    int orig_base_flags;

    int ret;

    Error *local_err = NULL;



    orig_base_flags = bdrv_get_flags(base);
@@ -642,19 +644,23 @@ void commit_active_start(BlockDriverState *bs, BlockDriverState *base, 


    length = bdrv_getlength(bs);

    if (length < 0) {

        error_setg(errp, "Unable to determine length of %s", bs->filename);

        error_setg_errno(errp, -length,

                         "Unable to determine length of %s", bs->filename);

        goto error_restore_flags;

    }



    base_length = bdrv_getlength(base);

    if (base_length < 0) {

        error_setg(errp, "Unable to determine length of %s", base->filename);

        error_setg_errno(errp, -base_length,

                         "Unable to determine length of %s", base->filename);

        goto error_restore_flags;

    }



    if (length > base_length) {

        if (bdrv_truncate(base, length) < 0) {

            error_setg(errp, "Top image %s is larger than base image %s, and "

        ret = bdrv_truncate(base, length);

        if (ret < 0) {

            error_setg_errno(errp, -ret,

                            "Top image %s is larger than base image %s, and "

                             "resize of base image failed",

                             bs->filename, base->filename);

            goto error_restore_flags;
@@ -663,9 +669,10 @@ void commit_active_start(BlockDriverState *bs, BlockDriverState *base, 


    bdrv_ref(base);

    mirror_start_job(bs, base, speed, 0, 0,

                     on_error, on_error, cb, opaque, errp,

                     on_error, on_error, cb, opaque, &local_err,

                     &commit_active_job_driver, false, base);

    if (error_is_set(errp)) {

    if (error_is_set(&local_err)) {

        error_propagate(errp, local_err);

        goto error_restore_flags;

    }

block/qcow2-snapshot.c

+5 −3
Original line number Diff line number Diff line
@@ -606,7 +606,8 @@ int qcow2_snapshot_delete(BlockDriverState *bs, 
    s->nb_snapshots--;

    ret = qcow2_write_snapshots(bs);

    if (ret < 0) {

        error_setg(errp, "Failed to remove snapshot from snapshot list");

        error_setg_errno(errp, -ret,

                         "Failed to remove snapshot from snapshot list");

        return ret;

    }
@@ -624,7 +625,7 @@ int qcow2_snapshot_delete(BlockDriverState *bs, 
    ret = qcow2_update_snapshot_refcount(bs, sn.l1_table_offset,

                                         sn.l1_size, -1);

    if (ret < 0) {

        error_setg(errp, "Failed to free the cluster and L1 table");

        error_setg_errno(errp, -ret, "Failed to free the cluster and L1 table");

        return ret;

    }

    qcow2_free_clusters(bs, sn.l1_table_offset, sn.l1_size * sizeof(uint64_t),
@@ -633,7 +634,8 @@ int qcow2_snapshot_delete(BlockDriverState *bs, 
    /* must update the copied flag on the current cluster offsets */

    ret = qcow2_update_snapshot_refcount(bs, s->l1_table_offset, s->l1_size, 0);

    if (ret < 0) {

        error_setg(errp, "Failed to update snapshot status in disk");

        error_setg_errno(errp, -ret,

                         "Failed to update snapshot status in disk");

        return ret;

    }

block/vmdk.c

+3 −3
Original line number Diff line number Diff line
@@ -1502,7 +1502,7 @@ static int vmdk_create_extent(const char *filename, int64_t filesize, 
    if (flat) {

        ret = bdrv_truncate(bs, filesize);

        if (ret < 0) {

            error_setg(errp, "Could not truncate file");

            error_setg_errno(errp, -ret, "Could not truncate file");

        }

        goto exit;

    }
@@ -1562,7 +1562,7 @@ static int vmdk_create_extent(const char *filename, int64_t filesize, 


    ret = bdrv_truncate(bs, le64_to_cpu(header.grain_offset) << 9);

    if (ret < 0) {

        error_setg(errp, "Could not truncate file");

        error_setg_errno(errp, -ret, "Could not truncate file");

        goto exit;

    }
@@ -1846,7 +1846,7 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options, 
    if (desc_offset == 0) {

        ret = bdrv_truncate(new_bs, desc_len);

        if (ret < 0) {

            error_setg(errp, "Could not truncate file");

            error_setg_errno(errp, -ret, "Could not truncate file");

        }

    }

exit: