Commit 692e01a2 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

block: Parse 'detect-zeroes' in bdrv_open_common() 



Amongst others, this means that you can now use the 'detect-zeroes'
option for non-top-level nodes in blockdev-add, like the QAPI schema
promises.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
parent 0a4279d9

block.c

+33 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include "qapi-event.h"

#include "qemu/cutils.h"

#include "qemu/id.h"

#include "qapi/util.h"



#ifdef CONFIG_BSD

#include <sys/ioctl.h>
@@ -954,6 +955,11 @@ static QemuOptsList bdrv_runtime_opts = { 
            .type = QEMU_OPT_BOOL,

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

        },

        {

            .name = "detect-zeroes",

            .type = QEMU_OPT_STRING,

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

        },

        { /* end of list */ }

    },

};
@@ -970,6 +976,7 @@ static int bdrv_open_common(BlockDriverState *bs, BdrvChild *file, 
    const char *filename;

    const char *driver_name = NULL;

    const char *node_name = NULL;

    const char *detect_zeroes;

    QemuOpts *opts;

    BlockDriver *drv;

    Error *local_err = NULL;
@@ -1038,6 +1045,32 @@ static int bdrv_open_common(BlockDriverState *bs, BdrvChild *file, 
        }

    }



    detect_zeroes = qemu_opt_get(opts, "detect-zeroes");

    if (detect_zeroes) {

        BlockdevDetectZeroesOptions value =

            qapi_enum_parse(BlockdevDetectZeroesOptions_lookup,

                            detect_zeroes,

                            BLOCKDEV_DETECT_ZEROES_OPTIONS__MAX,

                            BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF,

                            &local_err);

        if (local_err) {

            error_propagate(errp, local_err);

            ret = -EINVAL;

            goto fail_opts;

        }



        if (value == BLOCKDEV_DETECT_ZEROES_OPTIONS_UNMAP &&

            !(bs->open_flags & BDRV_O_UNMAP))

        {

            error_setg(errp, "setting detect-zeroes to unmap is not allowed "

                             "without setting discard operation to unmap");

            ret = -EINVAL;

            goto fail_opts;

        }



        bs->detect_zeroes = value;

    }



    if (filename != NULL) {

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

    } else {

blockdev.c

+1 −8
Original line number Diff line number Diff line
@@ -658,7 +658,6 @@ static BlockDriverState *bds_tree_init(QDict *bs_opts, Error **errp) 
    BlockDriverState *bs;

    QemuOpts *opts;

    Error *local_error = NULL;

    BlockdevDetectZeroesOptions detect_zeroes;

    int bdrv_flags = 0;



    opts = qemu_opts_create(&qemu_root_bds_opts, NULL, 1, errp);
@@ -673,7 +672,7 @@ static BlockDriverState *bds_tree_init(QDict *bs_opts, Error **errp) 
    }



    extract_common_blockdev_options(opts, &bdrv_flags, NULL, NULL,

                                    &detect_zeroes, &local_error);

                                    NULL, &local_error);

    if (local_error) {

        error_propagate(errp, local_error);

        goto fail;
@@ -695,8 +694,6 @@ static BlockDriverState *bds_tree_init(QDict *bs_opts, Error **errp) 
        goto fail_no_bs_opts;

    }



    bs->detect_zeroes = detect_zeroes;



fail_no_bs_opts:

    qemu_opts_del(opts);

    return bs;
@@ -4136,10 +4133,6 @@ static QemuOptsList qemu_root_bds_opts = { 
            .name = "copy-on-read",

            .type = QEMU_OPT_BOOL,

            .help = "copy read data from backing file into image file",

        },{

            .name = "detect-zeroes",

            .type = QEMU_OPT_STRING,

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

        },

        { /* end of list */ }

    },