| Message ID | 1379678070-14346-11-git-send-email-kwolf@redhat.com |
|---|---|
| State | New |
| Headers | show |
Le Friday 20 Sep 2013 à 13:54:23 (+0200), Kevin Wolf a écrit : > 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> > --- > blockdev.c | 21 +++++++++++---------- > 1 file changed, 11 insertions(+), 10 deletions(-) > > diff --git a/blockdev.c b/blockdev.c > index ba8b6b4..33383be 100644 > --- a/blockdev.c > +++ b/blockdev.c > @@ -453,12 +453,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) { > @@ -710,6 +704,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 */ } > }, > @@ -785,6 +783,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) { > @@ -2325,10 +2330,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 */ } > }, > -- > 1.8.1.4 > > Reviewed-for-c-bugs-by: Benoit Canet <benoit@irqsave.net>
diff --git a/blockdev.c b/blockdev.c index ba8b6b4..33383be 100644 --- a/blockdev.c +++ b/blockdev.c @@ -453,12 +453,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) { @@ -710,6 +704,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 */ } }, @@ -785,6 +783,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) { @@ -2325,10 +2330,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 */ } },
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> --- blockdev.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)