Commit 3cb99f41 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Block layer patches:

- auto-read-only option to fix commit job when used with -blockdev
- Fix help text related qemu-iotests failure (by improving the help text
  and updating the reference output)
- quorum: Add missing checks when adding/removing child nodes
- Don't take address of fields in packed structs
- vvfat: Fix crash when reporting error about too many files in directory

# gpg: Signature made Mon 05 Nov 2018 15:35:25 GMT
# gpg:                using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream: (36 commits)
  include: Add a comment to explain the origin of sizes' lookup table
  vdi: Use a literal number of bytes for DEFAULT_CLUSTER_SIZE
  fw_cfg: Drop newline in @file description
  object: Make option help nicer to read
  qdev-monitor: Make device options help nicer
  chardev: Indent list of chardevs
  option: Make option help nicer to read
  qemu-iotests: Test auto-read-only with -drive and -blockdev
  block: Make auto-read-only=on default for -drive
  iscsi: Support auto-read-only option
  gluster: Support auto-read-only option
  curl: Support auto-read-only option
  file-posix: Support auto-read-only option
  nbd: Support auto-read-only option
  block: Require auto-read-only for existing fallbacks
  rbd: Close image in qemu_rbd_open() error path
  block: Add auto-read-only option
  block: Update flags in bdrv_set_read_only()
  iotest: Test x-blockdev-change on a Quorum
  quorum: Forbid adding children in blkverify mode
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b2f7a038 1240ac55

block.c

+48 −12
Original line number Diff line number Diff line
@@ -266,22 +266,41 @@ int bdrv_can_set_read_only(BlockDriverState *bs, bool read_only, 
    return 0;

}



/* TODO Remove (deprecated since 2.11)

 * Block drivers are not supposed to automatically change bs->read_only.

 * Instead, they should just check whether they can provide what the user

 * explicitly requested and error out if read-write is requested, but they can

 * only provide read-only access. */

int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)

/*

 * Called by a driver that can only provide a read-only image.

 *

 * Returns 0 if the node is already read-only or it could switch the node to

 * read-only because BDRV_O_AUTO_RDONLY is set.

 *

 * Returns -EACCES if the node is read-write and BDRV_O_AUTO_RDONLY is not set

 * or bdrv_can_set_read_only() forbids making the node read-only. If @errmsg

 * is not NULL, it is used as the error message for the Error object.

 */

int bdrv_apply_auto_read_only(BlockDriverState *bs, const char *errmsg,

                              Error **errp)

{

    int ret = 0;



    ret = bdrv_can_set_read_only(bs, read_only, false, errp);

    if (!(bs->open_flags & BDRV_O_RDWR)) {

        return 0;

    }

    if (!(bs->open_flags & BDRV_O_AUTO_RDONLY)) {

        goto fail;

    }



    ret = bdrv_can_set_read_only(bs, true, false, NULL);

    if (ret < 0) {

        return ret;

        goto fail;

    }



    bs->read_only = read_only;

    bs->read_only = true;

    bs->open_flags &= ~BDRV_O_RDWR;



    return 0;



fail:

    error_setg(errp, "%s", errmsg ?: "Image is read-only");

    return -EACCES;

}



void bdrv_get_full_backing_filename_from_filename(const char *backed,
@@ -923,6 +942,7 @@ static void bdrv_inherited_options(int *child_flags, QDict *child_options, 


    /* Inherit the read-only option from the parent if it's not set */

    qdict_copy_default(child_options, parent_options, BDRV_OPT_READ_ONLY);

    qdict_copy_default(child_options, parent_options, BDRV_OPT_AUTO_READ_ONLY);



    /* Our block drivers take care to send flushes and respect unmap policy,

     * so we can default to enable both on lower layers regardless of the
@@ -1046,6 +1066,7 @@ static void bdrv_backing_options(int *child_flags, QDict *child_options, 


    /* backing files always opened read-only */

    qdict_set_default_str(child_options, BDRV_OPT_READ_ONLY, "on");

    qdict_set_default_str(child_options, BDRV_OPT_AUTO_READ_ONLY, "off");

    flags &= ~BDRV_O_COPY_ON_READ;



    /* snapshot=on is handled on the top layer */
@@ -1135,6 +1156,10 @@ static void update_flags_from_options(int *flags, QemuOpts *opts) 
        *flags |= BDRV_O_RDWR;

    }



    assert(qemu_opt_find(opts, BDRV_OPT_AUTO_READ_ONLY));

    if (qemu_opt_get_bool_del(opts, BDRV_OPT_AUTO_READ_ONLY, false)) {

        *flags |= BDRV_O_AUTO_RDONLY;

    }

}



static void update_options_from_flags(QDict *options, int flags)
@@ -1149,6 +1174,10 @@ static void update_options_from_flags(QDict *options, int flags) 
    if (!qdict_haskey(options, BDRV_OPT_READ_ONLY)) {

        qdict_put_bool(options, BDRV_OPT_READ_ONLY, !(flags & BDRV_O_RDWR));

    }

    if (!qdict_haskey(options, BDRV_OPT_AUTO_READ_ONLY)) {

        qdict_put_bool(options, BDRV_OPT_AUTO_READ_ONLY,

                       flags & BDRV_O_AUTO_RDONLY);

    }

}



static void bdrv_assign_node_name(BlockDriverState *bs,
@@ -1321,13 +1350,18 @@ QemuOptsList bdrv_runtime_opts = { 
            .type = QEMU_OPT_BOOL,

            .help = "Node is opened in read-only mode",

        },

        {

            .name = BDRV_OPT_AUTO_READ_ONLY,

            .type = QEMU_OPT_BOOL,

            .help = "Node can become read-only if opening read-write fails",

        },

        {

            .name = "detect-zeroes",

            .type = QEMU_OPT_STRING,

            .help = "try to optimize zero writes (off, on, unmap)",

        },

        {

            .name = "discard",

            .name = BDRV_OPT_DISCARD,

            .type = QEMU_OPT_STRING,

            .help = "discard operation (ignore/off, unmap/on)",

        },
@@ -1432,7 +1466,7 @@ static int bdrv_open_common(BlockDriverState *bs, BlockBackend *file, 
        }

    }



    discard = qemu_opt_get(opts, "discard");

    discard = qemu_opt_get(opts, BDRV_OPT_DISCARD);

    if (discard != NULL) {

        if (bdrv_parse_discard_flags(discard, &bs->open_flags) != 0) {

            error_setg(errp, "Invalid discard option");
@@ -2479,6 +2513,8 @@ BlockDriverState *bdrv_open_blockdev_ref(BlockdevRef *ref, Error **errp) 
        qdict_set_default_str(qdict, BDRV_OPT_CACHE_DIRECT, "off");

        qdict_set_default_str(qdict, BDRV_OPT_CACHE_NO_FLUSH, "off");

        qdict_set_default_str(qdict, BDRV_OPT_READ_ONLY, "off");

        qdict_set_default_str(qdict, BDRV_OPT_AUTO_READ_ONLY, "off");



    }



    bs = bdrv_open_inherit(NULL, reference, qdict, 0, NULL, NULL, errp);
@@ -3186,7 +3222,7 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue, 


    update_flags_from_options(&reopen_state->flags, opts);



    discard = qemu_opt_get_del(opts, "discard");

    discard = qemu_opt_get_del(opts, BDRV_OPT_DISCARD);

    if (discard != NULL) {

        if (bdrv_parse_discard_flags(discard, &reopen_state->flags) != 0) {

            error_setg(errp, "Invalid discard option");

block/block-backend.c

+4 −4
Original line number Diff line number Diff line
@@ -1708,7 +1708,7 @@ void blk_error_action(BlockBackend *blk, BlockErrorAction action, 
    }

}



int blk_is_read_only(BlockBackend *blk)

bool blk_is_read_only(BlockBackend *blk)

{

    BlockDriverState *bs = blk_bs(blk);
@@ -1719,18 +1719,18 @@ int blk_is_read_only(BlockBackend *blk) 
    }

}



int blk_is_sg(BlockBackend *blk)

bool blk_is_sg(BlockBackend *blk)

{

    BlockDriverState *bs = blk_bs(blk);



    if (!bs) {

        return 0;

        return false;

    }



    return bdrv_is_sg(bs);

}



int blk_enable_write_cache(BlockBackend *blk)

bool blk_enable_write_cache(BlockBackend *blk)

{

    return blk->enable_write_cache;

}

block/bochs.c

+6 −11
Original line number Diff line number Diff line
@@ -105,23 +105,18 @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags, 
    struct bochs_header bochs;

    int ret;



    /* No write support yet */

    ret = bdrv_apply_auto_read_only(bs, NULL, errp);

    if (ret < 0) {

        return ret;

    }



    bs->file = bdrv_open_child(NULL, options, "file", bs, &child_file,

                               false, errp);

    if (!bs->file) {

        return -EINVAL;

    }



    if (!bdrv_is_read_only(bs)) {

        error_report("Opening bochs images without an explicit read-only=on "

                     "option is deprecated. Future versions will refuse to "

                     "open the image instead of automatically marking the "

                     "image read-only.");

        ret = bdrv_set_read_only(bs, true, errp); /* no write support yet */

        if (ret < 0) {

            return ret;

        }

    }



    ret = bdrv_pread(bs->file, 0, &bochs, sizeof(bochs));

    if (ret < 0) {

        return ret;

block/cloop.c

+5 −11
Original line number Diff line number Diff line
@@ -67,23 +67,17 @@ static int cloop_open(BlockDriverState *bs, QDict *options, int flags, 
    uint32_t offsets_size, max_compressed_block_size = 1, i;

    int ret;



    ret = bdrv_apply_auto_read_only(bs, NULL, errp);

    if (ret < 0) {

        return ret;

    }



    bs->file = bdrv_open_child(NULL, options, "file", bs, &child_file,

                               false, errp);

    if (!bs->file) {

        return -EINVAL;

    }



    if (!bdrv_is_read_only(bs)) {

        error_report("Opening cloop images without an explicit read-only=on "

                     "option is deprecated. Future versions will refuse to "

                     "open the image instead of automatically marking the "

                     "image read-only.");

        ret = bdrv_set_read_only(bs, true, errp);

        if (ret < 0) {

            return ret;

        }

    }



    /* read header */

    ret = bdrv_pread(bs->file, 128, &s->block_size, 4);

    if (ret < 0) {

block/curl.c

+4 −4
Original line number Diff line number Diff line
@@ -684,10 +684,10 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags, 
    const char *protocol_delimiter;

    int ret;





    if (flags & BDRV_O_RDWR) {

        error_setg(errp, "curl block device does not support writes");

        return -EROFS;

    ret = bdrv_apply_auto_read_only(bs, "curl driver does not support writes",

                                    errp);

    if (ret < 0) {

        return ret;

    }



    if (!libcurl_initialized) {