* [Qemu-devel] [PATCH] net/slirp: Tell the users when they are using deprecated options
@ 2015-12-15 8:35 Thomas Huth
2016-01-11 15:55 ` Thomas Huth
0 siblings, 1 reply; 13+ messages in thread
From: Thomas Huth @ 2015-12-15 8:35 UTC (permalink / raw)
To: Jan Kiszka, qemu-devel; +Cc: Jason Wang
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;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [PATCH] net/slirp: Tell the users when they are using deprecated options
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
0 siblings, 2 replies; 13+ messages in thread
From: Thomas Huth @ 2016-01-11 15:55 UTC (permalink / raw)
To: Jan Kiszka, qemu-devel; +Cc: Paolo Bonzini, Jason Wang, Markus Armbruster
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 ;-)
Thomas
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [PATCH] net/slirp: Tell the users when they are using deprecated options
2016-01-11 15:55 ` Thomas Huth
@ 2016-01-11 21:15 ` Paolo Bonzini
2016-01-12 3:42 ` Jason Wang
1 sibling, 0 replies; 13+ messages in thread
From: Paolo Bonzini @ 2016-01-11 21:15 UTC (permalink / raw)
To: Thomas Huth, Jan Kiszka, qemu-devel; +Cc: Jason Wang, Markus Armbruster
On 11/01/2016 16:55, 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 ;-)
What replaces them? Put that in the error message and I have no issue
with deleting them now. :)
Paolo
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [PATCH] net/slirp: Tell the users when they are using deprecated options
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
1 sibling, 1 reply; 13+ messages in thread
From: Jason Wang @ 2016-01-12 3:42 UTC (permalink / raw)
To: Thomas Huth, Jan Kiszka, qemu-devel; +Cc: Paolo Bonzini, Markus Armbruster
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 ;-)
>
> Thomas
>
I vaguely remember autotest use those options in the past for guest os
installation. May need input from autotest guys.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [PATCH] net/slirp: Tell the users when they are using deprecated options
2016-01-12 3:42 ` Jason Wang
@ 2016-01-12 7:26 ` Thomas Huth
2016-01-12 11:45 ` Cleber Rosa
0 siblings, 1 reply; 13+ messages in thread
From: Thomas Huth @ 2016-01-12 7:26 UTC (permalink / raw)
To: Jason Wang, Jan Kiszka, qemu-devel
Cc: Paolo Bonzini, avocado-devel, Markus Armbruster
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.
Thomas
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [PATCH] net/slirp: Tell the users when they are using deprecated options
2016-01-12 7:26 ` Thomas Huth
@ 2016-01-12 11:45 ` Cleber Rosa
2016-01-13 2:58 ` Jason Wang
0 siblings, 1 reply; 13+ messages in thread
From: Cleber Rosa @ 2016-01-12 11:45 UTC (permalink / raw)
To: Thomas Huth
Cc: Jan Kiszka, Jason Wang, qemu-devel, Markus Armbruster,
avocado-devel, Paolo Bonzini
----- 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
>
>
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [PATCH] net/slirp: Tell the users when they are using deprecated options
2016-01-12 11:45 ` Cleber Rosa
@ 2016-01-13 2:58 ` Jason Wang
2016-01-13 3:13 ` [Qemu-devel] [Avocado-devel] " Jason Wang
0 siblings, 1 reply; 13+ messages in thread
From: Jason Wang @ 2016-01-13 2:58 UTC (permalink / raw)
To: Cleber Rosa, Thomas Huth
Cc: Jan Kiszka, avocado-devel, qemu-devel, Markus Armbruster, Paolo Bonzini
On 01/12/2016 07:45 PM, Cleber Rosa wrote:
>
> ----- 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.
Sounds very cool.
Apply this to my -net.
Thanks everyone.
>
>> Thomas
>>
>>
>>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [Avocado-devel] [PATCH] net/slirp: Tell the users when they are using deprecated options
2016-01-13 2:58 ` Jason Wang
@ 2016-01-13 3:13 ` Jason Wang
2016-01-13 7:24 ` Markus Armbruster
` (2 more replies)
0 siblings, 3 replies; 13+ messages in thread
From: Jason Wang @ 2016-01-13 3:13 UTC (permalink / raw)
To: Cleber Rosa, Thomas Huth
Cc: Jan Kiszka, avocado-devel, qemu-devel, Paolo Bonzini, Markus Armbruster
On 01/13/2016 10:58 AM, Jason Wang wrote:
>
> On 01/12/2016 07:45 PM, Cleber Rosa wrote:
>> ----- 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.
> Sounds very cool.
>
> Apply this to my -net.
>
> Thanks everyone.
Rethinking about this. I'm not quite sure we can remove those
especially "-net user". Google qemu "-net user" gives about 15,900
results (and the first link is qemu wiki). Maybe we can replace "will be
removed in a future version." with something like "was suggested to use
-netdev user,XXX" instead?
>
>>> Thomas
>>>
>>>
>>>
> _______________________________________________
> Avocado-devel mailing list
> Avocado-devel@redhat.com
> https://www.redhat.com/mailman/listinfo/avocado-devel
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [Avocado-devel] [PATCH] net/slirp: Tell the users when they are using deprecated options
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 7:27 ` Thomas Huth
2 siblings, 0 replies; 13+ messages in thread
From: Markus Armbruster @ 2016-01-13 7:24 UTC (permalink / raw)
To: Jason Wang
Cc: Thomas Huth, Jan Kiszka, qemu-devel, avocado-devel, Cleber Rosa,
Paolo Bonzini
Jason Wang <jasowang@redhat.com> writes:
> On 01/13/2016 10:58 AM, Jason Wang wrote:
>>
>> On 01/12/2016 07:45 PM, Cleber Rosa wrote:
>>> ----- 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>
[...]
> Rethinking about this. I'm not quite sure we can remove those
> especially "-net user". Google qemu "-net user" gives about 15,900
> results (and the first link is qemu wiki). Maybe we can replace "will be
> removed in a future version." with something like "was suggested to use
> -netdev user,XXX" instead?
A message like "FOO is deprecated" should always accompanied by advice
on preferred usage". Example:
$ qemu-img create -e
qemu-img: option -e is deprecated, please use '-o encryption' instead!
Nice and helpful (apart from the uncalled-for exclamation mark).
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [Avocado-devel] [PATCH] net/slirp: Tell the users when they are using deprecated options
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
2 siblings, 1 reply; 13+ messages in thread
From: Paolo Bonzini @ 2016-01-13 7:25 UTC (permalink / raw)
To: Jason Wang, Cleber Rosa, Thomas Huth
Cc: Jan Kiszka, avocado-devel, qemu-devel, Markus Armbruster
On 13/01/2016 04:13, Jason Wang wrote:
> Rethinking about this. I'm not quite sure we can remove those
> especially "-net user". Google qemu "-net user" gives about 15,900
> results (and the first link is qemu wiki). Maybe we can replace "will be
> removed in a future version." with something like "was suggested to use
> -netdev user,XXX" instead?
-net vs. -netdev was a completely separate topic, and I was very much
against removing -net or even listing it as deprecated.
"-net channel" seems to be an old version of guestfwd, and I can hardly
find any mention of it on the net.
Paolo
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [Avocado-devel] [PATCH] net/slirp: Tell the users when they are using deprecated options
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 7:27 ` Thomas Huth
2016-01-13 9:01 ` Jason Wang
2 siblings, 1 reply; 13+ messages in thread
From: Thomas Huth @ 2016-01-13 7:27 UTC (permalink / raw)
To: Jason Wang, Cleber Rosa
Cc: Jan Kiszka, avocado-devel, qemu-devel, Paolo Bonzini, Markus Armbruster
On 13.01.2016 04:13, Jason Wang wrote:
>
>
> On 01/13/2016 10:58 AM, Jason Wang wrote:
>>
>> On 01/12/2016 07:45 PM, Cleber Rosa wrote:
>>> ----- 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.
>> Sounds very cool.
>>
>> Apply this to my -net.
>>
>> Thanks everyone.
>
> Rethinking about this. I'm not quite sure we can remove those
> especially "-net user". Google qemu "-net user" gives about 15,900
> results (and the first link is qemu wiki). Maybe we can replace "will be
> removed in a future version." with something like "was suggested to use
> -netdev user,XXX" instead?
This patch was not about removing "-net user", only about removing the
standalone options "-tftp", "-smb", "-bootp", "-redir" and "-net
channel" which have equivalents with "-netdev user,..." (or
"-netd user,...").
Anyway, since Paolo requested to rework this patch to include hints for
what should be used instead (which is a good idea), I'm going to rewrite
my patch, so please stay tuned for a new version.
Thomas
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [Avocado-devel] [PATCH] net/slirp: Tell the users when they are using deprecated options
2016-01-13 7:25 ` Paolo Bonzini
@ 2016-01-13 8:59 ` Jason Wang
0 siblings, 0 replies; 13+ messages in thread
From: Jason Wang @ 2016-01-13 8:59 UTC (permalink / raw)
To: Paolo Bonzini, Cleber Rosa, Thomas Huth
Cc: Jan Kiszka, avocado-devel, qemu-devel, Markus Armbruster
On 01/13/2016 03:25 PM, Paolo Bonzini wrote:
>
> On 13/01/2016 04:13, Jason Wang wrote:
>> Rethinking about this. I'm not quite sure we can remove those
>> especially "-net user". Google qemu "-net user" gives about 15,900
>> results (and the first link is qemu wiki). Maybe we can replace "will be
>> removed in a future version." with something like "was suggested to use
>> -netdev user,XXX" instead?
> -net vs. -netdev was a completely separate topic, and I was very much
> against removing -net or even listing it as deprecated.
Right, I misread the patch.
>
> "-net channel" seems to be an old version of guestfwd, and I can hardly
> find any mention of it on the net.
>
> Paolo
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [Avocado-devel] [PATCH] net/slirp: Tell the users when they are using deprecated options
2016-01-13 7:27 ` Thomas Huth
@ 2016-01-13 9:01 ` Jason Wang
0 siblings, 0 replies; 13+ messages in thread
From: Jason Wang @ 2016-01-13 9:01 UTC (permalink / raw)
To: Thomas Huth, Cleber Rosa
Cc: Jan Kiszka, avocado-devel, qemu-devel, Paolo Bonzini, Markus Armbruster
On 01/13/2016 03:27 PM, Thomas Huth wrote:
> On 13.01.2016 04:13, Jason Wang wrote:
>>
>> On 01/13/2016 10:58 AM, Jason Wang wrote:
>>> On 01/12/2016 07:45 PM, Cleber Rosa wrote:
>>>> ----- 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.
>>> Sounds very cool.
>>>
>>> Apply this to my -net.
>>>
>>> Thanks everyone.
>> Rethinking about this. I'm not quite sure we can remove those
>> especially "-net user". Google qemu "-net user" gives about 15,900
>> results (and the first link is qemu wiki). Maybe we can replace "will be
>> removed in a future version." with something like "was suggested to use
>> -netdev user,XXX" instead?
> This patch was not about removing "-net user", only about removing the
> standalone options "-tftp", "-smb", "-bootp", "-redir" and "-net
> channel" which have equivalents with "-netdev user,..." (or
> "-netd user,...").
Right, I misread the patch. Sorry.
>
> Anyway, since Paolo requested to rework this patch to include hints for
> what should be used instead (which is a good idea),
I thought it was Markus :) ?
> I'm going to rewrite
> my patch, so please stay tuned for a new version.
>
> Thomas
>
Ok
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2016-01-13 9:02 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
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
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.