Message ID | 20121003105509.614535373@amt.cnet |
---|---|
State | New |
Headers | show |
Marcelo Tosatti <mtosatti@redhat.com> writes: > Commit 841280b6c224ea2c6edc2f5afc2add513c85181d from qemu-kvm.git. > > From: Jan Kiszka <jan.kiszka@siemens.com> > > We do not want to maintain this option forever. It will be removed after > a grace period of a few releases. So warn the user that this option has > no effect and will become invalid soon. > > Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Reviewed-by: Anthony Liguori <aliguori@us.ibm.com> Regards, Anthony Liguori > > Index: qemu-compat-kvm/blockdev.c > =================================================================== > --- qemu-compat-kvm.orig/blockdev.c > +++ qemu-compat-kvm/blockdev.c > @@ -432,6 +432,12 @@ DriveInfo *drive_init(QemuOpts *opts, in > 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 = BLOCK_ERR_STOP_ENOSPC; > if ((buf = qemu_opt_get(opts, "werror")) != NULL) { > if (type != IF_IDE && type != IF_SCSI && type != IF_VIRTIO && type != IF_NONE) { > Index: qemu-compat-kvm/qemu-config.c > =================================================================== > --- qemu-compat-kvm.orig/qemu-config.c > +++ qemu-compat-kvm/qemu-config.c > @@ -114,6 +114,10 @@ static QemuOptsList qemu_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 */ } > }, > > > -- > To unsubscribe from this list: send the line "unsubscribe kvm" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
Index: qemu-compat-kvm/blockdev.c =================================================================== --- qemu-compat-kvm.orig/blockdev.c +++ qemu-compat-kvm/blockdev.c @@ -432,6 +432,12 @@ DriveInfo *drive_init(QemuOpts *opts, in 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 = BLOCK_ERR_STOP_ENOSPC; if ((buf = qemu_opt_get(opts, "werror")) != NULL) { if (type != IF_IDE && type != IF_SCSI && type != IF_VIRTIO && type != IF_NONE) { Index: qemu-compat-kvm/qemu-config.c =================================================================== --- qemu-compat-kvm.orig/qemu-config.c +++ qemu-compat-kvm/qemu-config.c @@ -114,6 +114,10 @@ static QemuOptsList qemu_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 */ } },