mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net/slirp: Tell the users when they are using deprecated options

Browse Source 
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>
This commit is contained in:
Thomas Huth 2016-01-13 09:05:32 +01:00 committed by Jason Wang
parent 87574621b1
commit f853ac66c7
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/slirp.c
View File

@ -784,6 +784,9 @@ int net_slirp_parse_legacy(QemuOptsList *opts_list, const char *optarg, int *ret
return 0; return 0;
} }
error_report("The '-net channel' option is deprecated. "
"Please use '-netdev user,guestfwd=...' instead.");
/* handle legacy -net channel,port:chr */ /* handle legacy -net channel,port:chr */
optarg += strlen("channel,"); optarg += strlen("channel,");

3
os-posix.c
View File

@ -40,6 +40,7 @@
#include "net/slirp.h" #include "net/slirp.h"
#include "qemu-options.h" #include "qemu-options.h"
#include "qemu/rcu.h" #include "qemu/rcu.h"
#include "qemu/error-report.h"
#ifdef CONFIG_LINUX #ifdef CONFIG_LINUX
#include <sys/prctl.h> #include <sys/prctl.h>
@ -139,6 +140,8 @@ void os_parse_cmd_args(int index, const char *optarg)
switch (index) { switch (index) {
#ifdef CONFIG_SLIRP #ifdef CONFIG_SLIRP
case QEMU_OPTION_smb: case QEMU_OPTION_smb:
error_report("The -smb option is deprecated. "
"Please use '-netdev user,smb=...' instead.");
if (net_slirp_smb(optarg) < 0) if (net_slirp_smb(optarg) < 0)
exit(1); exit(1);
break; break;

6
vl.c
View File

@ -3308,12 +3308,18 @@ int main(int argc, char **argv, char **envp)
#endif #endif
#ifdef CONFIG_SLIRP #ifdef CONFIG_SLIRP
case QEMU_OPTION_tftp: case QEMU_OPTION_tftp:
error_report("The -tftp option is deprecated. "
"Please use '-netdev user,tftp=...' instead.");
legacy_tftp_prefix = optarg; legacy_tftp_prefix = optarg;
break; break;
case QEMU_OPTION_bootp: case QEMU_OPTION_bootp:
error_report("The -bootp option is deprecated. "
"Please use '-netdev user,bootfile=...' instead.");
legacy_bootp_filename = optarg; legacy_bootp_filename = optarg;
break; break;
case QEMU_OPTION_redir: case QEMU_OPTION_redir:
error_report("The -redir option is deprecated. "
"Please use '-netdev user,hostfwd=...' instead.");
if (net_slirp_redir(optarg) < 0) if (net_slirp_redir(optarg) < 0)
exit(1); exit(1);
break; break;