From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH] qemu-kvm: Deprecate drive parameter boot=on|off Date: Sat, 08 Oct 2011 09:46:37 +0200 Message-ID: <4E8FFFDD.9010601@web.de> References: <4E8EDF7D.2090701@siemens.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: kvm , Anthony Liguori To: Avi Kivity , Marcelo Tosatti Return-path: Received: from fmmailgate02.web.de ([217.72.192.227]:54308 "EHLO fmmailgate02.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750858Ab1JHHqm (ORCPT ); Sat, 8 Oct 2011 03:46:42 -0400 In-Reply-To: <4E8EDF7D.2090701@siemens.com> Sender: kvm-owner@vger.kernel.org List-ID: On 2011-10-07 13:16, Jan Kiszka wrote: > Except for booting from SCSI via the LSI controller, SeaBIOS has native > support for mass storage interfaces now. And SCSI can be worked around > via [1] - or someone finally adds the necessary bits to SeaBIOS if there > is a real need. > > As there might be still scripts around that append "boot=on", continue > to parse it, but ignore it and issue a deprecation warning instead. > > [1] http://thread.gmane.org/gmane.comp.emulators.qemu/78467 > > Signed-off-by: Jan Kiszka > --- > > Changes in v2: > - restore accidentally removed VAPIC option ROM installation > - continue to parse boot=on|off As a different version was merged now, here is the required delta patch: -----8<----- From: Jan Kiszka 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: Jan Kiszka --- blockdev.c | 6 ++++++ qemu-config.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/blockdev.c b/blockdev.c index 0827bf7..9678915 100644 --- a/blockdev.c +++ b/blockdev.c @@ -353,6 +353,12 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi) } } + 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) { diff --git a/qemu-config.c b/qemu-config.c index acab438..72e86b9 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -88,7 +88,7 @@ static QemuOptsList qemu_drive_opts = { },{ .name = "boot", .type = QEMU_OPT_BOOL, - .help = "make this a boot drive", + .help = "(deprecated, ignored)", }, { /* end of list */ } },