Commit d109f80a authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging 



Block patches for 2.3

# gpg: Signature made Fri 23 Jan 2015 17:53:06 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"

* remotes/kevin/tags/for-upstream:
  iotests: Lower 064's memory usage
  block: vhdx - force FileOffsetMB field to '0' for certain block states
  block: update string sizes for filename,backing_file,exact_filename
  block: mirror - change string allocation to 2-bytes
  block: remove unused variable in bdrv_commit
  block: qapi - move string allocation from stack to the heap
  block: vmdk - move string allocations from stack to the heap
  block: vmdk - make ret variable usage clear
  iotests: Add tests for more corruption cases
  qcow2: Add two more unalignment checks
  virtio-blk: Use blk_aio_ioctl
  virtio-blk: Pass req to virtio_blk_handle_scsi_req

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

block.c

+0 −3
Original line number Diff line number Diff line
@@ -2207,7 +2207,6 @@ int bdrv_commit(BlockDriverState *bs) 
    int n, ro, open_flags;

    int ret = 0;

    uint8_t *buf = NULL;

    char filename[PATH_MAX];



    if (!drv)

        return -ENOMEDIUM;
@@ -2222,8 +2221,6 @@ int bdrv_commit(BlockDriverState *bs) 
    }



    ro = bs->backing_hd->read_only;

    /* Use pstrcpy (not strncpy): filename must be NUL-terminated. */

    pstrcpy(filename, sizeof(filename), bs->backing_hd->filename);

    open_flags =  bs->backing_hd->open_flags;



    if (ro) {

block/mirror.c

+2 −1
Original line number Diff line number Diff line
@@ -378,7 +378,8 @@ static void coroutine_fn mirror_run(void *opaque) 
    int64_t sector_num, end, sectors_per_chunk, length;

    uint64_t last_pause_ns;

    BlockDriverInfo bdi;

    char backing_filename[1024];

    char backing_filename[2]; /* we only need 2 characters because we are only

                                 checking for a NULL string */

    int ret = 0;

    int n;

block/qapi.c

+4 −3
Original line number Diff line number Diff line
@@ -175,7 +175,6 @@ void bdrv_query_image_info(BlockDriverState *bs, 
{

    int64_t size;

    const char *backing_filename;

    char backing_filename2[1024];

    BlockDriverInfo bdi;

    int ret;

    Error *err = NULL;
@@ -211,13 +210,14 @@ void bdrv_query_image_info(BlockDriverState *bs, 


    backing_filename = bs->backing_file;

    if (backing_filename[0] != '\0') {

        char *backing_filename2 = g_malloc0(PATH_MAX);

        info->backing_filename = g_strdup(backing_filename);

        info->has_backing_filename = true;

        bdrv_get_full_backing_filename(bs, backing_filename2,

                                       sizeof(backing_filename2), &err);

        bdrv_get_full_backing_filename(bs, backing_filename2, PATH_MAX, &err);

        if (err) {

            error_propagate(errp, err);

            qapi_free_ImageInfo(info);

            g_free(backing_filename2);

            return;

        }
@@ -231,6 +231,7 @@ void bdrv_query_image_info(BlockDriverState *bs, 
            info->backing_filename_format = g_strdup(bs->backing_format);

            info->has_backing_filename_format = true;

        }

        g_free(backing_filename2);

    }



    ret = bdrv_query_snapshot_info_list(bs, &info->snapshots, &err);

block/qcow.c

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags, 
    /* read the backing file name */

    if (header.backing_file_offset != 0) {

        len = header.backing_file_size;

        if (len > 1023) {

        if (len > 1023 || len > sizeof(bs->backing_file)) {

            error_setg(errp, "Backing file name too long");

            ret = -EINVAL;

            goto fail;

block/qcow2-cluster.c

+21 −0
Original line number Diff line number Diff line
@@ -1651,6 +1651,14 @@ static int expand_zero_clusters_in_l1(BlockDriverState *bs, uint64_t *l1_table, 
            continue;

        }



        if (offset_into_cluster(s, l2_offset)) {

            qcow2_signal_corruption(bs, true, -1, -1, "L2 table offset %#"

                                    PRIx64 " unaligned (L1 index: %#x)",

                                    l2_offset, i);

            ret = -EIO;

            goto fail;

        }



        if (is_active_l1) {

            /* get active L2 tables from cache */

            ret = qcow2_cache_get(bs, s->l2_table_cache, l2_offset,
@@ -1709,6 +1717,19 @@ static int expand_zero_clusters_in_l1(BlockDriverState *bs, uint64_t *l1_table, 
                }

            }



            if (offset_into_cluster(s, offset)) {

                qcow2_signal_corruption(bs, true, -1, -1, "Data cluster offset "

                                        "%#" PRIx64 " unaligned (L2 offset: %#"

                                        PRIx64 ", L2 index: %#x)", offset,

                                        l2_offset, j);

                if (!preallocated) {

                    qcow2_free_clusters(bs, offset, s->cluster_size,

                                        QCOW2_DISCARD_ALWAYS);

                }

                ret = -EIO;

                goto fail;

            }



            ret = qcow2_pre_write_overlap_check(bs, 0, offset, s->cluster_size);

            if (ret < 0) {

                if (!preallocated) {