diff options
| author | Thomas Huth <thuth@redhat.com> | 2016-01-13 09:05:32 +0100 |
|---|---|---|
| committer | Jason Wang <jasowang@redhat.com> | 2016-02-04 13:22:06 +0800 |
| commit | f853ac66c7b49a3a064ee838683c27fc3c9b86cc (patch) | |
| tree | 9b1fe8fadbb25f2faec42221391213cad2309be9 | |
| parent | 87574621b18f86eab295a2c207e0b42c77b5dfa0 (diff) | |
| download | focaccia-qemu-f853ac66c7b49a3a064ee838683c27fc3c9b86cc.tar.gz focaccia-qemu-f853ac66c7b49a3a064ee838683c27fc3c9b86cc.zip | |
net/slirp: Tell the users when they are using deprecated options
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 <thuth@redhat.com> Signed-off-by: Jason Wang <jasowang@redhat.com>
| -rw-r--r-- | net/slirp.c | 3 | ||||
| -rw-r--r-- | os-posix.c | 3 | ||||
| -rw-r--r-- | vl.c | 6 |
3 files changed, 12 insertions, 0 deletions
diff --git a/net/slirp.c b/net/slirp.c index f505570adb..eac4fc2506 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 e4da406f38..87e2a1696d 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 <sys/prctl.h> @@ -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 f043009f67..a12eabe8ea 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; |