proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-17 19:39:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

blockdev: Move parsing of 'boot' option to drive_init

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

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Kevin Wolf 2013-09-09 17:01:03 +02:00
parent b41a7338cf
commit 2692929802
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
blockdev.c
View File

@ -452,12 +452,6 @@ static DriveInfo *blockdev_init(QDict *bs_opts,
return NULL; 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; on_write_error = BLOCKDEV_ON_ERROR_ENOSPC;
if ((buf = qemu_opt_get(opts, "werror")) != NULL) { if ((buf = qemu_opt_get(opts, "werror")) != NULL) {
if (type != IF_IDE && type != IF_SCSI && type != IF_VIRTIO && type != IF_NONE) { if (type != IF_IDE && type != IF_SCSI && type != IF_VIRTIO && type != IF_NONE) {
@ -709,6 +703,10 @@ QemuOptsList qemu_legacy_drive_opts = {
.name = "trans", .name = "trans",
.type = QEMU_OPT_STRING, .type = QEMU_OPT_STRING,
.help = "chs translation (auto, lba, none)", .help = "chs translation (auto, lba, none)",
},{
.name = "boot",
.type = QEMU_OPT_BOOL,
.help = "(deprecated, ignored)",
}, },
{ /* end of list */ } { /* end of list */ }
}, },
@ -784,6 +782,13 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)
goto fail; 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 */ /* Media type */
value = qemu_opt_get(legacy_opts, "media"); value = qemu_opt_get(legacy_opts, "media");
if (value) { if (value) {
@ -2328,10 +2333,6 @@ QemuOptsList qemu_common_drive_opts = {
.name = "copy-on-read", .name = "copy-on-read",
.type = QEMU_OPT_BOOL, .type = QEMU_OPT_BOOL,
.help = "copy read data from backing file into image file", .help = "copy read data from backing file into image file",
},{
.name = "boot",
.type = QEMU_OPT_BOOL,
.help = "(deprecated, ignored)",
}, },
{ /* end of list */ } { /* end of list */ }
}, },