From: Cleber Rosa <crosa@redhat.com>
To: Thomas Huth <thuth@redhat.com>
Cc: Jan Kiszka <jan.kiszka@siemens.com>,
Jason Wang <jasowang@redhat.com>,
qemu-devel@nongnu.org, Markus Armbruster <armbru@redhat.com>,
avocado-devel@redhat.com, Paolo Bonzini <pbonzini@redhat.com>
Subject: Re: [Qemu-devel] [PATCH] net/slirp: Tell the users when they are using deprecated options
Date: Tue, 12 Jan 2016 06:45:49 -0500 (EST) [thread overview]
Message-ID: <1763645294.7129685.1452599149096.JavaMail.zimbra@redhat.com> (raw)
In-Reply-To: <5694AAAC.7080405@redhat.com>
----- Original Message -----
> From: "Thomas Huth" <thuth@redhat.com>
> To: "Jason Wang" <jasowang@redhat.com>, "Jan Kiszka" <jan.kiszka@siemens.com>, qemu-devel@nongnu.org
> Cc: "Paolo Bonzini" <pbonzini@redhat.com>, avocado-devel@redhat.com, "Markus Armbruster" <armbru@redhat.com>
> Sent: Tuesday, January 12, 2016 5:26:36 AM
> Subject: Re: [Qemu-devel] [PATCH] net/slirp: Tell the users when they are using deprecated options
>
> On 12.01.2016 04:42, Jason Wang wrote:
> >
> > On 01/11/2016 11:55 PM, Thomas Huth wrote:
> >> On 15.12.2015 09:35, 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 will go away in a future version.
> >>>
> >>> Signed-off-by: Thomas Huth <thuth@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..65e3766 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 and "
> >>> + "will be removed in a future version.");
> >>> +
> >>> /* handle legacy -net channel,port:chr */
> >>> optarg += strlen("channel,");
> >>>
> >>> diff --git a/os-posix.c b/os-posix.c
> >>> index e4da406..3f62f7c 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 and "
> >>> + "will be removed in a future version.");
> >>> if (net_slirp_smb(optarg) < 0)
> >>> exit(1);
> >>> break;
> >>> diff --git a/vl.c b/vl.c
> >>> index 4211ff1..fa829c0 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 and "
> >>> + "will be removed in a future version.");
> >>> legacy_tftp_prefix = optarg;
> >>> break;
> >>> case QEMU_OPTION_bootp:
> >>> + error_report("The -bootp option is deprecated and "
> >>> + "will be removed in a future version.");
> >>> legacy_bootp_filename = optarg;
> >>> break;
> >>> case QEMU_OPTION_redir:
> >>> + error_report("The -redir option is deprecated and "
> >>> + "will be removed in a future version.");
> >>> if (net_slirp_redir(optarg) < 0)
> >>> exit(1);
> >>> break;
> >> *ping*
> >>
> >> Any comments on these old options? I hope Paolo does not want to keep
> >> them, too, forever ;-)
> >
> > I vaguely remember autotest use those options in the past for guest os
> > installation. May need input from autotest guys.
>
> Looking at
> https://github.com/avocado-framework/avocado-vt/blob/master/virttest/qemu_vm.py
> it seems like that latest incarnation of autotest is doing it
> right already:
> ...
> def add_tftp(devices, filename):
> # If the new syntax is supported, don't add -tftp
> if "[,tftp=" in devices.get_help_text():
> return ""
> else:
> return " -tftp '%s'" % filename
> ...
> def add_net(devices, vlan, nettype, ifname=None, tftp=None,
> bootfile=None, hostfwd=[], netdev_id=None,
> netdev_extra_params=None, tapfds=None, script=None,
> downscript=None, vhost=None, queues=None, vhostfds=None,
> add_queues=None, helper=None, add_tapfd=None,
> add_vhostfd=None, vhostforce=None):
> ...
> elif mode == "user":
> if tftp and "[,tftp=" in devices.get_help_text():
> cmd += ",tftp='%s'" % tftp
> cmd_nd = cmd
> ... etc ...
>
> So I think that avocado should be fine already.
It should.
Avocado-VT can usually handle whatever version of QEMU is thrown at it
because it usually checks for specific features and command syntax.
So, if a feature is removed and Avocado-VT is not handling that properly,
then it's a bug on "our" side.
Cleber.
>
> Thomas
>
>
>
next prev parent reply other threads:[~2016-01-12 11:46 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-15 8:35 [Qemu-devel] [PATCH] net/slirp: Tell the users when they are using deprecated options Thomas Huth
2016-01-11 15:55 ` Thomas Huth
2016-01-11 21:15 ` Paolo Bonzini
2016-01-12 3:42 ` Jason Wang
2016-01-12 7:26 ` Thomas Huth
2016-01-12 11:45 ` Cleber Rosa [this message]
2016-01-13 2:58 ` Jason Wang
2016-01-13 3:13 ` [Qemu-devel] [Avocado-devel] " Jason Wang
2016-01-13 7:24 ` Markus Armbruster
2016-01-13 7:25 ` Paolo Bonzini
2016-01-13 8:59 ` Jason Wang
2016-01-13 7:27 ` Thomas Huth
2016-01-13 9:01 ` 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=1763645294.7129685.1452599149096.JavaMail.zimbra@redhat.com \
--to=crosa@redhat.com \
--cc=armbru@redhat.com \
--cc=avocado-devel@redhat.com \
--cc=jan.kiszka@siemens.com \
--cc=jasowang@redhat.com \
--cc=pbonzini@redhat.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).