On 01/13/2016 04:05 PM, Thomas Huth wrote:
> 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
> ---
> v2: Changed the texts to tell the users what options should be used instead.
Applied to my -net.
Thanks
>
> 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 5aaea77..71c4eee 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -3314,12 +3314,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;