Commit 8593efa4 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 Tue 01 Jul 2014 09:47:15 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/block-pull-request: (23 commits)
  block: add backing-file option to block-stream
  block: extend block-commit to accept a string for the backing file
  block: add helper function to determine if a BDS is in a chain
  block: add QAPI command to allow live backing file change
  qapi: Change back sector-count to sectors-count in quorum QAPI events.
  block/cow: Avoid use of uninitialized cow_bs in error path
  block: simplify bdrv_find_base() and bdrv_find_overlay()
  block: make 'top' argument to block-commit optional
  iotests: Add more tests to quick group
  iotests: Add qemu tests to quick group
  iotests: Simplify qemu-iotests-quick.sh
  qemu-img create: add 'nocow' option
  virtio-blk: remove need for explicit x-data-plane=on option
  qdev: drop iothread property type
  virtio-blk: replace x-iothread with iothread link property
  virtio-blk: move qdev properties into virtio-blk.c
  virtio: fix virtio-blk child refcount in transports
  virtio-blk: drop virtio_blk_set_conf()
  virtio-blk: use aliases instead of duplicate qdev properties
  qdev: add qdev_alias_all_properties()
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c26f3a0a 13d8cc51

block.c

+27 −37
Original line number Diff line number Diff line
@@ -2508,32 +2508,23 @@ int bdrv_change_backing_file(BlockDriverState *bs, 
 *

 * Returns NULL if bs is not found in active's image chain,

 * or if active == bs.

 *

 * Returns the bottommost base image if bs == NULL.

 */

BlockDriverState *bdrv_find_overlay(BlockDriverState *active,

                                    BlockDriverState *bs)

{

    BlockDriverState *overlay = NULL;

    BlockDriverState *intermediate;



    assert(active != NULL);

    assert(bs != NULL);



    /* if bs is the same as active, then by definition it has no overlay

     */

    if (active == bs) {

        return NULL;

    while (active && bs != active->backing_hd) {

        active = active->backing_hd;

    }



    intermediate = active;

    while (intermediate->backing_hd) {

        if (intermediate->backing_hd == bs) {

            overlay = intermediate;

            break;

        }

        intermediate = intermediate->backing_hd;

    return active;

}



    return overlay;

/* Given a BDS, searches for the base layer. */

BlockDriverState *bdrv_find_base(BlockDriverState *bs)

{

    return bdrv_find_overlay(bs, NULL);

}



typedef struct BlkIntermediateStates {
@@ -2564,12 +2555,15 @@ typedef struct BlkIntermediateStates { 
 *

 * base <- active

 *

 * If backing_file_str is non-NULL, it will be used when modifying top's

 * overlay image metadata.

 *

 * Error conditions:

 *  if active == top, that is considered an error

 *

 */

int bdrv_drop_intermediate(BlockDriverState *active, BlockDriverState *top,

                           BlockDriverState *base)

                           BlockDriverState *base, const char *backing_file_str)

{

    BlockDriverState *intermediate;

    BlockDriverState *base_bs = NULL;
@@ -2621,7 +2615,8 @@ int bdrv_drop_intermediate(BlockDriverState *active, BlockDriverState *top, 
    }



    /* success - we can delete the intermediate states, and link top->base */

    ret = bdrv_change_backing_file(new_top_bs, base_bs->filename,

    backing_file_str = backing_file_str ? backing_file_str : base_bs->filename;

    ret = bdrv_change_backing_file(new_top_bs, backing_file_str,

                                   base_bs->drv ? base_bs->drv->format_name : "");

    if (ret) {

        goto exit;
@@ -3783,6 +3778,17 @@ BlockDriverState *bdrv_lookup_bs(const char *device, 
    return NULL;

}



/* If 'base' is in the same chain as 'top', return true. Otherwise,

 * return false.  If either argument is NULL, return false. */

bool bdrv_chain_contains(BlockDriverState *top, BlockDriverState *base)

{

    while (top && top != base) {

        top = top->backing_hd;

    }



    return top != NULL;

}



BlockDriverState *bdrv_next(BlockDriverState *bs)

{

    if (!bs) {
@@ -4326,22 +4332,6 @@ int bdrv_get_backing_file_depth(BlockDriverState *bs) 
    return 1 + bdrv_get_backing_file_depth(bs->backing_hd);

}



BlockDriverState *bdrv_find_base(BlockDriverState *bs)

{

    BlockDriverState *curr_bs = NULL;



    if (!bs) {

        return NULL;

    }



    curr_bs = bs;



    while (curr_bs->backing_hd) {

        curr_bs = curr_bs->backing_hd;

    }

    return curr_bs;

}



/**************************************************************/

/* async I/Os */

block/commit.c

+6 −3
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ typedef struct CommitBlockJob { 
    BlockdevOnError on_error;

    int base_flags;

    int orig_overlay_flags;

    char *backing_file_str;

} CommitBlockJob;



static int coroutine_fn commit_populate(BlockDriverState *bs,
@@ -141,7 +142,7 @@ wait: 


    if (!block_job_is_cancelled(&s->common) && sector_num == end) {

        /* success */

        ret = bdrv_drop_intermediate(active, top, base);

        ret = bdrv_drop_intermediate(active, top, base, s->backing_file_str);

    }



exit_free_buf:
@@ -158,7 +159,7 @@ exit_restore_reopen: 
    if (overlay_bs && s->orig_overlay_flags != bdrv_get_flags(overlay_bs)) {

        bdrv_reopen(overlay_bs, s->orig_overlay_flags, NULL);

    }



    g_free(s->backing_file_str);

    block_job_completed(&s->common, ret);

}
@@ -182,7 +183,7 @@ static const BlockJobDriver commit_job_driver = { 
void commit_start(BlockDriverState *bs, BlockDriverState *base,

                  BlockDriverState *top, int64_t speed,

                  BlockdevOnError on_error, BlockDriverCompletionFunc *cb,

                  void *opaque, Error **errp)

                  void *opaque, const char *backing_file_str, Error **errp)

{

    CommitBlockJob *s;

    BlockReopenQueue *reopen_queue = NULL;
@@ -244,6 +245,8 @@ void commit_start(BlockDriverState *bs, BlockDriverState *base, 
    s->base_flags          = orig_base_flags;

    s->orig_overlay_flags  = orig_overlay_flags;



    s->backing_file_str = g_strdup(backing_file_str);



    s->on_error = on_error;

    s->common.co = qemu_coroutine_create(commit_run);

block/cow.c

+4 −3
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ static int cow_create(const char *filename, QemuOpts *opts, Error **errp) 
    char *image_filename = NULL;

    Error *local_err = NULL;

    int ret;

    BlockDriverState *cow_bs;

    BlockDriverState *cow_bs = NULL;



    /* Read out options */

    image_sectors = qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0) / 512;
@@ -344,7 +344,6 @@ static int cow_create(const char *filename, QemuOpts *opts, Error **errp) 
        goto exit;

    }



    cow_bs = NULL;

    ret = bdrv_open(&cow_bs, filename, NULL, NULL,

                    BDRV_O_RDWR | BDRV_O_PROTOCOL, NULL, &local_err);

    if (ret < 0) {
@@ -383,7 +382,9 @@ static int cow_create(const char *filename, QemuOpts *opts, Error **errp) 


exit:

    g_free(image_filename);

    if (cow_bs) {

        bdrv_unref(cow_bs);

    }

    return ret;

}

block/qed.c

+3 −3
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ static void bdrv_qed_close(BlockDriverState *bs) 
static int qed_create(const char *filename, uint32_t cluster_size,

                      uint64_t image_size, uint32_t table_size,

                      const char *backing_file, const char *backing_fmt,

                      Error **errp)

                      QemuOpts *opts, Error **errp)

{

    QEDHeader header = {

        .magic = QED_MAGIC,
@@ -586,7 +586,7 @@ static int qed_create(const char *filename, uint32_t cluster_size, 
    int ret = 0;

    BlockDriverState *bs;



    ret = bdrv_create_file(filename, NULL, &local_err);

    ret = bdrv_create_file(filename, opts, &local_err);

    if (ret < 0) {

        error_propagate(errp, local_err);

        return ret;
@@ -682,7 +682,7 @@ static int bdrv_qed_create(const char *filename, QemuOpts *opts, Error **errp) 
    }



    ret = qed_create(filename, cluster_size, image_size, table_size,

                     backing_file, backing_fmt, errp);

                     backing_file, backing_fmt, opts, errp);



finish:

    g_free(backing_file);

block/raw-posix.c

+25 −0
Original line number Diff line number Diff line
@@ -55,6 +55,9 @@ 
#include <linux/cdrom.h>

#include <linux/fd.h>

#include <linux/fs.h>

#ifndef FS_NOCOW_FL

#define FS_NOCOW_FL                     0x00800000 /* Do not cow file */

#endif

#endif

#ifdef CONFIG_FIEMAP

#include <linux/fiemap.h>
@@ -1278,12 +1281,14 @@ static int raw_create(const char *filename, QemuOpts *opts, Error **errp) 
    int fd;

    int result = 0;

    int64_t total_size = 0;

    bool nocow = false;



    strstart(filename, "file:", &filename);



    /* Read out options */

    total_size =

        qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0) / BDRV_SECTOR_SIZE;

    nocow = qemu_opt_get_bool(opts, BLOCK_OPT_NOCOW, false);



    fd = qemu_open(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY,

                   0644);
@@ -1291,6 +1296,21 @@ static int raw_create(const char *filename, QemuOpts *opts, Error **errp) 
        result = -errno;

        error_setg_errno(errp, -result, "Could not create file");

    } else {

        if (nocow) {

#ifdef __linux__

            /* Set NOCOW flag to solve performance issue on fs like btrfs.

             * This is an optimisation. The FS_IOC_SETFLAGS ioctl return value

             * will be ignored since any failure of this operation should not

             * block the left work.

             */

            int attr;

            if (ioctl(fd, FS_IOC_GETFLAGS, &attr) == 0) {

                attr |= FS_NOCOW_FL;

                ioctl(fd, FS_IOC_SETFLAGS, &attr);

            }

#endif

        }



        if (ftruncate(fd, total_size * BDRV_SECTOR_SIZE) != 0) {

            result = -errno;

            error_setg_errno(errp, -result, "Could not resize file");
@@ -1477,6 +1497,11 @@ static QemuOptsList raw_create_opts = { 
            .type = QEMU_OPT_SIZE,

            .help = "Virtual disk size"

        },

        {

            .name = BLOCK_OPT_NOCOW,

            .type = QEMU_OPT_BOOL,

            .help = "Turn off copy-on-write (valid only on btrfs)"

        },

        { /* end of list */ }

    }

};