From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8Tt7-00084X-57 for qemu-devel@nongnu.org; Wed, 10 May 2017 11:50:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8Tt6-0001wi-3j for qemu-devel@nongnu.org; Wed, 10 May 2017 11:50:53 -0400 From: Thomas Huth Date: Wed, 10 May 2017 17:50:42 +0200 Message-Id: <1494431442-25163-1-git-send-email-thuth@redhat.com> Subject: [Qemu-devel] [PATCH] blockdev: Print a warning for legacy drive options that belong to -device List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Kevin Wolf , Max Reitz Cc: qemu-block@nongnu.org, Markus Armbruster We likely do not want to carry these legacy -drive options along forever. Let's emit a deprecation warning for the -drive options that have a replacement with the -device option, so that the (hopefully few) remaining users are aware of this and can adapt their scripts / behaviour. Signed-off-by: Thomas Huth --- blockdev.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/blockdev.c b/blockdev.c index 4d8cded..87a025a 100644 --- a/blockdev.c +++ b/blockdev.c @@ -797,6 +797,9 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type) const char *filename; Error *local_err = NULL; int i; + const char *deprecated[] = { + "serial", "trans", "secs", "heads", "cyls" + }; /* Change legacy command line options into QMP ones */ static const struct { @@ -880,6 +883,14 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type) "update your scripts.\n"); } + /* Other deprecated options */ + for (i = 0; i < ARRAY_SIZE(deprecated); i++) { + if (qemu_opt_get(legacy_opts, deprecated[i]) != NULL) { + error_report("'%s' is deprecated, please use the corresponding " + "option of '-device' instead", deprecated[i]); + } + } + /* Media type */ value = qemu_opt_get(legacy_opts, "media"); if (value) { -- 1.8.3.1