From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48586) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQQpY-0007F8-9W for qemu-devel@nongnu.org; Mon, 01 Feb 2016 21:36:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aQQpX-0008UI-EQ for qemu-devel@nongnu.org; Mon, 01 Feb 2016 21:36:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50808) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQQpX-0008Tr-9L for qemu-devel@nongnu.org; Mon, 01 Feb 2016 21:36:35 -0500 From: Jason Wang Date: Tue, 2 Feb 2016 10:36:05 +0800 Message-Id: <1454380581-7881-2-git-send-email-jasowang@redhat.com> In-Reply-To: <1454380581-7881-1-git-send-email-jasowang@redhat.com> References: <1454380581-7881-1-git-send-email-jasowang@redhat.com> Subject: [Qemu-devel] [PULL 01/17] net/slirp: Tell the users when they are using deprecated options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org, qemu-devel@nongnu.org Cc: Thomas Huth , Jason Wang From: Thomas Huth We don't want to support the legacy -tftp, -bootp, -smb and -net channel options forever. So let's start telling the users that they are deprecated and what option should be used instead. Signed-off-by: Thomas Huth Signed-off-by: Jason Wang --- net/slirp.c | 3 +++ os-posix.c | 3 +++ vl.c | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/net/slirp.c b/net/slirp.c index f505570..eac4fc2 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -784,6 +784,9 @@ int net_slirp_parse_legacy(QemuOptsList *opts_list, const char *optarg, int *ret return 0; } + error_report("The '-net channel' option is deprecated. " + "Please use '-netdev user,guestfwd=...' instead."); + /* handle legacy -net channel,port:chr */ optarg += strlen("channel,"); diff --git a/os-posix.c b/os-posix.c index e4da406..87e2a16 100644 --- a/os-posix.c +++ b/os-posix.c @@ -40,6 +40,7 @@ #include "net/slirp.h" #include "qemu-options.h" #include "qemu/rcu.h" +#include "qemu/error-report.h" #ifdef CONFIG_LINUX #include @@ -139,6 +140,8 @@ void os_parse_cmd_args(int index, const char *optarg) switch (index) { #ifdef CONFIG_SLIRP case QEMU_OPTION_smb: + error_report("The -smb option is deprecated. " + "Please use '-netdev user,smb=...' instead."); if (net_slirp_smb(optarg) < 0) exit(1); break; diff --git a/vl.c b/vl.c index f043009..a12eabe 100644 --- a/vl.c +++ b/vl.c @@ -3308,12 +3308,18 @@ int main(int argc, char **argv, char **envp) #endif #ifdef CONFIG_SLIRP case QEMU_OPTION_tftp: + error_report("The -tftp option is deprecated. " + "Please use '-netdev user,tftp=...' instead."); legacy_tftp_prefix = optarg; break; case QEMU_OPTION_bootp: + error_report("The -bootp option is deprecated. " + "Please use '-netdev user,bootfile=...' instead."); legacy_bootp_filename = optarg; break; case QEMU_OPTION_redir: + error_report("The -redir option is deprecated. " + "Please use '-netdev user,hostfwd=...' instead."); if (net_slirp_redir(optarg) < 0) exit(1); break; -- 2.5.0