Commit 4e200cf8 authored by Alberto Garcia's avatar Alberto Garcia Committed by Kevin Wolf
Browse files

block: rename "read-only" to BDRV_OPT_READ_ONLY 



There were a few instances left. After this patch we're using the
macro in all places.

Signed-off-by: default avatarAlberto Garcia <berto@igalia.com>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 0fe282bb

blockdev.c

+5 −5
Original line number Diff line number Diff line
@@ -807,7 +807,7 @@ QemuOptsList qemu_legacy_drive_opts = { 


        /* Options that are passed on, but have special semantics with -drive */

        {

            .name = "read-only",

            .name = BDRV_OPT_READ_ONLY,

            .type = QEMU_OPT_BOOL,

            .help = "open drive file as read-only",

        },{
@@ -873,7 +873,7 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type) 


        { "group",          "throttling.group" },



        { "readonly",       "read-only" },

        { "readonly",       BDRV_OPT_READ_ONLY },

    };



    for (i = 0; i < ARRAY_SIZE(opt_renames); i++) {
@@ -945,7 +945,7 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type) 
    }



    /* copy-on-read is disabled with a warning for read-only devices */

    read_only |= qemu_opt_get_bool(legacy_opts, "read-only", false);

    read_only |= qemu_opt_get_bool(legacy_opts, BDRV_OPT_READ_ONLY, false);

    copy_on_read = qemu_opt_get_bool(legacy_opts, "copy-on-read", false);



    if (read_only && copy_on_read) {
@@ -953,7 +953,7 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type) 
        copy_on_read = false;

    }



    qdict_put(bs_opts, "read-only",

    qdict_put(bs_opts, BDRV_OPT_READ_ONLY,

              qstring_from_str(read_only ? "on" : "off"));

    qdict_put(bs_opts, "copy-on-read",

              qstring_from_str(copy_on_read ? "on" :"off"));
@@ -4042,7 +4042,7 @@ QemuOptsList qemu_common_drive_opts = { 
            .type = QEMU_OPT_STRING,

            .help = "write error action",

        },{

            .name = "read-only",

            .name = BDRV_OPT_READ_ONLY,

            .type = QEMU_OPT_BOOL,

            .help = "open drive file as read-only",

        },{