Commit 628a746c authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Block patches

# gpg: Signature made Sun 09 Feb 2014 08:12:51 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"

* remotes/kevin/tags/for-anthony:
  block: Fix 32 bit truncation in mark_request_serialising()
  blkdebug: Don't leak bs->file on failure
  block: Don't call ROUND_UP with negative values
  block: bdrv_aligned_pwritev: Assert overlap range
  block: Fix memory leaks in bdrv_co_do_pwritev()
  raw: Fix BlockLimits passthrough
  qemu-iotests: add test for qcow2 preallocation with different cluster sizes
  qcow2: check for NULL l2meta
  qcow2: fix offset overflow in qcow2_alloc_clusters_at()
  qcow2: remove n_start and n_end of qcow2_alloc_cluster_offset()
  block/iscsi: always fill bs->bl.opt_transfer_length
  block: Fail gracefully with missing filename
  qemu-iotests: enable support for NFS protocol
  qemu-iotests: enable test 016 and 025 to work with NFS protocol
  qemu-iotests: blacklist test 020 for NFS protocol
  qemu-iotests: change _supported_proto to file for various tests
  block: add native support for NFS
  qemu-iotest: Make 077 raw-only

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

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -937,6 +937,11 @@ M: Peter Lieven <pl@kamp.de> 
S: Supported

F: block/iscsi.c



NFS

M: Peter Lieven <pl@kamp.de>

S: Maintained

F: block/nfs.c



SSH

M: Richard W.M. Jones <rjones@redhat.com>

S: Supported

block.c

+15 −12
Original line number Diff line number Diff line
@@ -832,6 +832,12 @@ static int bdrv_open_common(BlockDriverState *bs, BlockDriverState *file, 
        filename = qdict_get_try_str(options, "filename");

    }



    if (drv->bdrv_needs_filename && !filename) {

        error_setg(errp, "The '%s' block driver requires a file name",

                   drv->format_name);

        return -EINVAL;

    }



    trace_bdrv_open_common(bs, filename ?: "", flags, drv->format_name);



    node_name = qdict_get_try_str(options, "node-name");
@@ -1031,11 +1037,6 @@ int bdrv_file_open(BlockDriverState **pbs, const char *filename, 
            goto fail;

        }

        qdict_del(options, "filename");

    } else if (drv->bdrv_needs_filename && !filename) {

        error_setg(errp, "The '%s' block driver requires a file name",

                   drv->format_name);

        ret = -EINVAL;

        goto fail;

    }



    if (!drv->bdrv_file_open) {
@@ -2239,10 +2240,10 @@ static void tracked_request_begin(BdrvTrackedRequest *req, 
    QLIST_INSERT_HEAD(&bs->tracked_requests, req, list);

}



static void mark_request_serialising(BdrvTrackedRequest *req, size_t align)

static void mark_request_serialising(BdrvTrackedRequest *req, uint64_t align)

{

    int64_t overlap_offset = req->offset & ~(align - 1);

    int overlap_bytes = ROUND_UP(req->offset + req->bytes, align)

    unsigned int overlap_bytes = ROUND_UP(req->offset + req->bytes, align)

                               - overlap_offset;



    if (!req->serialising) {
@@ -2914,8 +2915,8 @@ static int coroutine_fn bdrv_aligned_preadv(BlockDriverState *bs, 
        }



        total_sectors = DIV_ROUND_UP(len, BDRV_SECTOR_SIZE);

        max_nb_sectors = MAX(0, ROUND_UP(total_sectors - sector_num,

                                         align >> BDRV_SECTOR_BITS));

        max_nb_sectors = ROUND_UP(MAX(0, total_sectors - sector_num),

                                  align >> BDRV_SECTOR_BITS);

        if (max_nb_sectors > 0) {

            ret = drv->bdrv_co_readv(bs, sector_num,

                                     MIN(nb_sectors, max_nb_sectors), qiov);
@@ -3133,6 +3134,8 @@ static int coroutine_fn bdrv_aligned_pwritev(BlockDriverState *bs, 


    waited = wait_serialising_requests(req);

    assert(!waited || !req->serialising);

    assert(req->overlap_offset <= offset);

    assert(offset + bytes <= req->overlap_offset + req->overlap_bytes);



    ret = notifier_with_return_list_notify(&bs->before_write_notifiers, req);
@@ -3278,9 +3281,9 @@ fail: 


    if (use_local_qiov) {

        qemu_iovec_destroy(&local_qiov);

    }

    qemu_vfree(head_buf);

    qemu_vfree(tail_buf);

    }



    return ret;

}

block/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o 
ifeq ($(CONFIG_POSIX),y)

block-obj-y += nbd.o nbd-client.o sheepdog.o

block-obj-$(CONFIG_LIBISCSI) += iscsi.o

block-obj-$(CONFIG_LIBNFS) += nfs.o

block-obj-$(CONFIG_CURL) += curl.o

block-obj-$(CONFIG_RBD) += rbd.o

block-obj-$(CONFIG_GLUSTERFS) += gluster.o

block/blkdebug.c

+9 −5
Original line number Diff line number Diff line
@@ -396,14 +396,14 @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags, 
    if (error_is_set(&local_err)) {

        error_propagate(errp, local_err);

        ret = -EINVAL;

        goto fail;

        goto out;

    }



    /* Read rules from config file or command line options */

    config = qemu_opt_get(opts, "config");

    ret = read_config(s, config, options, errp);

    if (ret) {

        goto fail;

        goto out;

    }



    /* Set initial state */
@@ -414,7 +414,7 @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags, 
                          flags, true, false, &local_err);

    if (ret < 0) {

        error_propagate(errp, local_err);

        goto fail;

        goto out;

    }



    /* Set request alignment */
@@ -424,11 +424,15 @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags, 
    } else {

        error_setg(errp, "Invalid alignment");

        ret = -EINVAL;

        goto fail;

        goto fail_unref;

    }



    ret = 0;

fail:

    goto out;



fail_unref:

    bdrv_unref(bs->file);

out:

    qemu_opts_del(opts);

    return ret;

}

block/iscsi.c

+2 −3
Original line number Diff line number Diff line
@@ -1330,10 +1330,9 @@ static int iscsi_refresh_limits(BlockDriverState *bs) 
        }

        bs->bl.write_zeroes_alignment = sector_lun2qemu(iscsilun->bl.opt_unmap_gran,

                                                        iscsilun);



    }

    bs->bl.opt_transfer_length = sector_lun2qemu(iscsilun->bl.opt_xfer_len,

                                                 iscsilun);

    }

    return 0;

}