Commit 0d688cf7 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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



Block patches

# gpg: Signature made Fri 24 Jan 2014 08:40:53 AM PST using RSA key ID C88F2FD6
# gpg: Can't check signature: public key not found

* kwolf/tags/for-anthony: (93 commits)
  block: Switch bdrv_io_limits_intercept() to byte granularity
  qemu-iotests: Test pwritev RMW logic
  qemu-io: New command 'sleep'
  blkdebug: Make required alignment configurable
  iscsi: Set bs->request_alignment
  block: Make bdrv_pwrite() a bdrv_prwv_co() wrapper
  block: Make bdrv_pread() a bdrv_prwv_co() wrapper
  block: Change coroutine wrapper to byte granularity
  block: Assert serialisation assumptions in pwritev
  block: Align requests in bdrv_co_do_pwritev()
  block: Allow wait_serialising_requests() at any point
  block: Make overlap range for serialisation dynamic
  block: Generalise and optimise COR serialisation
  block: Make zero-after-EOF work with larger alignment
  block: Allow waiting for overlapping requests between begin/end
  block: Switch BdrvTrackedRequest to byte granularity
  block: Introduce bdrv_co_do_pwritev()
  block: write: Handle COR dependency after I/O throttling
  block: Introduce bdrv_aligned_pwritev()
  block: Introduce bdrv_co_do_preadv()
  ...

Message-id: 1390584136-24703-1-git-send-email-kwolf@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@amazon.com>
parents 732c66ce d5103588

Makefile.objs

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ libcacard-y += libcacard/vcardt.o 
ifeq ($(CONFIG_SOFTMMU),y)

common-obj-y = $(block-obj-y) blockdev.o blockdev-nbd.o block/

common-obj-y += net/

common-obj-y += readline.o

common-obj-y += qdev-monitor.o device-hotplug.o

common-obj-$(CONFIG_WIN32) += os-win32.o

common-obj-$(CONFIG_POSIX) += os-posix.o

block.c

+778 −246

File changed.

Preview size limit exceeded, changes collapsed.

block/backup.c

+6 −1
Original line number Diff line number Diff line
@@ -181,8 +181,13 @@ static int coroutine_fn backup_before_write_notify( 
        void *opaque)

{

    BdrvTrackedRequest *req = opaque;

    int64_t sector_num = req->offset >> BDRV_SECTOR_BITS;

    int nb_sectors = req->bytes >> BDRV_SECTOR_BITS;



    return backup_do_cow(req->bs, req->sector_num, req->nb_sectors, NULL);

    assert((req->offset & (BDRV_SECTOR_SIZE - 1)) == 0);

    assert((req->bytes & (BDRV_SECTOR_SIZE - 1)) == 0);



    return backup_do_cow(req->bs, sector_num, nb_sectors, NULL);

}



static void backup_set_speed(BlockJob *job, int64_t speed, Error **errp)

block/blkdebug.c

+57 −24
Original line number Diff line number Diff line
@@ -186,6 +186,14 @@ static const char *event_names[BLKDBG_EVENT_MAX] = { 


    [BLKDBG_FLUSH_TO_OS]                    = "flush_to_os",

    [BLKDBG_FLUSH_TO_DISK]                  = "flush_to_disk",



    [BLKDBG_PWRITEV_RMW_HEAD]               = "pwritev_rmw.head",

    [BLKDBG_PWRITEV_RMW_AFTER_HEAD]         = "pwritev_rmw.after_head",

    [BLKDBG_PWRITEV_RMW_TAIL]               = "pwritev_rmw.tail",

    [BLKDBG_PWRITEV_RMW_AFTER_TAIL]         = "pwritev_rmw.after_tail",

    [BLKDBG_PWRITEV]                        = "pwritev",

    [BLKDBG_PWRITEV_ZERO]                   = "pwritev_zero",

    [BLKDBG_PWRITEV_DONE]                   = "pwritev_done",

};



static int get_event_by_name(const char *name, BlkDebugEvent *event)
@@ -271,19 +279,33 @@ static void remove_rule(BlkdebugRule *rule) 
    g_free(rule);

}



static int read_config(BDRVBlkdebugState *s, const char *filename)

static int read_config(BDRVBlkdebugState *s, const char *filename,

                       QDict *options, Error **errp)

{

    FILE *f;

    FILE *f = NULL;

    int ret;

    struct add_rule_data d;

    Error *local_err = NULL;



    if (filename) {

        f = fopen(filename, "r");

        if (f == NULL) {

            error_setg_errno(errp, errno, "Could not read blkdebug config file");

            return -errno;

        }



        ret = qemu_config_parse(f, config_groups, filename);

        if (ret < 0) {

            error_setg(errp, "Could not parse blkdebug config file");

            ret = -EINVAL;

            goto fail;

        }

    }



    qemu_config_parse_qdict(options, config_groups, &local_err);

    if (error_is_set(&local_err)) {

        error_propagate(errp, local_err);

        ret = -EINVAL;

        goto fail;

    }
@@ -298,7 +320,9 @@ static int read_config(BDRVBlkdebugState *s, const char *filename) 
fail:

    qemu_opts_reset(&inject_error_opts);

    qemu_opts_reset(&set_state_opts);

    if (f) {

        fclose(f);

    }

    return ret;

}
@@ -310,7 +334,9 @@ static void blkdebug_parse_filename(const char *filename, QDict *options, 


    /* Parse the blkdebug: prefix */

    if (!strstart(filename, "blkdebug:", &filename)) {

        error_setg(errp, "File name string must start with 'blkdebug:'");

        /* There was no prefix; therefore, all options have to be already

           present in the QDict (except for the filename) */

        qdict_put(options, "x-image", qstring_from_str(filename));

        return;

    }
@@ -346,6 +372,11 @@ static QemuOptsList runtime_opts = { 
            .type = QEMU_OPT_STRING,

            .help = "[internal use only, will be removed]",

        },

        {

            .name = "align",

            .type = QEMU_OPT_SIZE,

            .help = "Required alignment in bytes",

        },

        { /* end of list */ }

    },

};
@@ -356,7 +387,8 @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags, 
    BDRVBlkdebugState *s = bs->opaque;

    QemuOpts *opts;

    Error *local_err = NULL;

    const char *filename, *config;

    const char *config;

    uint64_t align;

    int ret;



    opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);
@@ -367,30 +399,31 @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags, 
        goto fail;

    }



    /* Read rules from config file */

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

    config = qemu_opt_get(opts, "config");

    if (config) {

        ret = read_config(s, config);

        if (ret < 0) {

            error_setg_errno(errp, -ret, "Could not read blkdebug config file");

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

    if (ret) {

        goto fail;

    }

    }



    /* Set initial state */

    s->state = 1;



    /* Open the backing file */

    filename = qemu_opt_get(opts, "x-image");

    if (filename == NULL) {

        error_setg(errp, "Could not retrieve image file name");

        ret = -EINVAL;

    ret = bdrv_open_image(&bs->file, qemu_opt_get(opts, "x-image"), options, "image",

                          flags, true, false, &local_err);

    if (ret < 0) {

        error_propagate(errp, local_err);

        goto fail;

    }



    ret = bdrv_file_open(&bs->file, filename, NULL, flags, &local_err);

    if (ret < 0) {

        error_propagate(errp, local_err);

    /* Set request alignment */

    align = qemu_opt_get_size(opts, "align", bs->request_alignment);

    if (align > 0 && align < INT_MAX && !(align & (align - 1))) {

        bs->request_alignment = align;

    } else {

        error_setg(errp, "Invalid alignment");

        ret = -EINVAL;

        goto fail;

    }

block/blkverify.c

+9 −22
Original line number Diff line number Diff line
@@ -78,7 +78,9 @@ static void blkverify_parse_filename(const char *filename, QDict *options, 


    /* Parse the blkverify: prefix */

    if (!strstart(filename, "blkverify:", &filename)) {

        error_setg(errp, "File name string must start with 'blkverify:'");

        /* There was no prefix; therefore, all options have to be already

           present in the QDict (except for the filename) */

        qdict_put(options, "x-image", qstring_from_str(filename));

        return;

    }
@@ -122,7 +124,6 @@ static int blkverify_open(BlockDriverState *bs, QDict *options, int flags, 
    BDRVBlkverifyState *s = bs->opaque;

    QemuOpts *opts;

    Error *local_err = NULL;

    const char *filename, *raw;

    int ret;



    opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);
@@ -133,33 +134,19 @@ static int blkverify_open(BlockDriverState *bs, QDict *options, int flags, 
        goto fail;

    }



    /* Parse the raw image filename */

    raw = qemu_opt_get(opts, "x-raw");

    if (raw == NULL) {

        error_setg(errp, "Could not retrieve raw image filename");

        ret = -EINVAL;

        goto fail;

    }



    ret = bdrv_file_open(&bs->file, raw, NULL, flags, &local_err);

    /* Open the raw file */

    ret = bdrv_open_image(&bs->file, qemu_opt_get(opts, "x-raw"), options,

                          "raw", flags, true, false, &local_err);

    if (ret < 0) {

        error_propagate(errp, local_err);

        goto fail;

    }



    /* Open the test file */

    filename = qemu_opt_get(opts, "x-image");

    if (filename == NULL) {

        error_setg(errp, "Could not retrieve test image filename");

        ret = -EINVAL;

        goto fail;

    }



    s->test_file = bdrv_new("");

    ret = bdrv_open(s->test_file, filename, NULL, flags, NULL, &local_err);

    ret = bdrv_open_image(&s->test_file, qemu_opt_get(opts, "x-image"), options,

                          "test", flags, false, false, &local_err);

    if (ret < 0) {

        error_propagate(errp, local_err);

        bdrv_unref(s->test_file);

        s->test_file = NULL;

        goto fail;

    }
@@ -417,7 +404,7 @@ static BlockDriver bdrv_blkverify = { 
    .bdrv_aio_writev        = blkverify_aio_writev,

    .bdrv_aio_flush         = blkverify_aio_flush,



    .bdrv_check_ext_snapshot = bdrv_check_ext_snapshot_forbidden,

    .authorizations         = { true, false },

};



static void bdrv_blkverify_init(void)