From: Jason Wang <jasowang@redhat.com>
To: peter.maydell@linaro.org, qemu-devel@nongnu.org
Cc: Thomas Huth <thuth@redhat.com>, Jason Wang <jasowang@redhat.com>
Subject: [Qemu-devel] [PULL 01/17] net/slirp: Tell the users when they are using deprecated options
Date: Tue, 2 Feb 2016 10:36:05 +0800 [thread overview]
Message-ID: <1454380581-7881-2-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1454380581-7881-1-git-send-email-jasowang@redhat.com>
From: Thomas Huth <thuth@redhat.com>
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>
---
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 <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 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
next prev parent reply other threads:[~2016-02-02 2:36 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-02 2:36 [Qemu-devel] [PULL 00/17] Net patches Jason Wang
2016-02-02 2:36 ` Jason Wang [this message]
2016-02-02 2:36 ` [Qemu-devel] [PULL 02/17] qemu-doc: Do not promote deprecated -smb and -redir options Jason Wang
2016-02-02 2:36 ` [Qemu-devel] [PULL 03/17] net: cadence_gem: check packet size in gem_recieve Jason Wang
2016-02-02 2:36 ` [Qemu-devel] [PULL 04/17] cadence_gem: fix buffer overflow Jason Wang
2016-02-02 2:36 ` [Qemu-devel] [PULL 05/17] slirp: goto bad in udp_input if sosendto fails Jason Wang
2016-02-02 2:36 ` [Qemu-devel] [PULL 06/17] slirp: Generalizing and neutralizing ARP code Jason Wang
2016-02-02 2:36 ` [Qemu-devel] [PULL 07/17] slirp: Adding address family switch for produced frames Jason Wang
2016-02-02 2:36 ` [Qemu-devel] [PULL 08/17] slirp: Make Socket structure IPv6 compatible Jason Wang
2016-02-02 2:36 ` [Qemu-devel] [PULL 09/17] slirp: Factorizing address translation Jason Wang
2016-02-02 2:36 ` [Qemu-devel] [PULL 10/17] slirp: Factorizing and cleaning solookup() Jason Wang
2016-02-02 2:36 ` [Qemu-devel] [PULL 11/17] slirp: Add sockaddr_equal, make solookup family-agnostic Jason Wang
2016-02-02 2:36 ` [Qemu-devel] [PULL 12/17] slirp: Make udp_attach IPv6 compatible Jason Wang
2016-02-02 2:36 ` [Qemu-devel] [PULL 13/17] slirp: Adding family argument to tcp_fconnect() Jason Wang
2016-02-02 2:36 ` [Qemu-devel] [PULL 14/17] e1000: eliminate infinite loops on out-of-bounds transfer start Jason Wang
2016-02-02 2:36 ` [Qemu-devel] [PULL 15/17] net: netmap: use nm_open() to open netmap ports Jason Wang
2016-02-02 2:36 ` [Qemu-devel] [PULL 16/17] net: always walk through filters in reverse if traffic is egress Jason Wang
2016-02-02 2:36 ` [Qemu-devel] [PULL 17/17] net/filter: Fix the output information for command 'info network' Jason Wang
2016-02-02 11:05 ` [Qemu-devel] [PULL 00/17] Net patches Peter Maydell
2016-02-03 4:52 ` Jason Wang
2016-02-03 9:09 ` Samuel Thibault
2016-02-04 8:20 ` Jason Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1454380581-7881-2-git-send-email-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.