Commit 26929298 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

blockdev: Move parsing of 'boot' option to drive_init 



It's already ignored and only prints a deprecation message. No use in
making it available in new interfaces.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent b41a7338

blockdev.c

+11 −10
Original line number Diff line number Diff line
@@ -452,12 +452,6 @@ static DriveInfo *blockdev_init(QDict *bs_opts, 
        return NULL;

    }



    if (qemu_opt_get(opts, "boot") != NULL) {

        fprintf(stderr, "qemu-kvm: boot=on|off is deprecated and will be "

                "ignored. Future versions will reject this parameter. Please "

                "update your scripts.\n");

    }



    on_write_error = BLOCKDEV_ON_ERROR_ENOSPC;

    if ((buf = qemu_opt_get(opts, "werror")) != NULL) {

        if (type != IF_IDE && type != IF_SCSI && type != IF_VIRTIO && type != IF_NONE) {
@@ -709,6 +703,10 @@ QemuOptsList qemu_legacy_drive_opts = { 
            .name = "trans",

            .type = QEMU_OPT_STRING,

            .help = "chs translation (auto, lba, none)",

        },{

            .name = "boot",

            .type = QEMU_OPT_BOOL,

            .help = "(deprecated, ignored)",

        },

        { /* end of list */ }

    },
@@ -784,6 +782,13 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type) 
        goto fail;

    }



    /* Deprecated option boot=[on|off] */

    if (qemu_opt_get(legacy_opts, "boot") != NULL) {

        fprintf(stderr, "qemu-kvm: boot=on|off is deprecated and will be "

                "ignored. Future versions will reject this parameter. Please "

                "update your scripts.\n");

    }



    /* Media type */

    value = qemu_opt_get(legacy_opts, "media");

    if (value) {
@@ -2328,10 +2333,6 @@ QemuOptsList qemu_common_drive_opts = { 
            .name = "copy-on-read",

            .type = QEMU_OPT_BOOL,

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

        },{

            .name = "boot",

            .type = QEMU_OPT_BOOL,

            .help = "(deprecated, ignored)",

        },

        { /* end of list */ }

    },