From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54680) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aItLq-0004Ku-Ak for qemu-devel@nongnu.org; Tue, 12 Jan 2016 02:26:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aItLl-0008Uh-GK for qemu-devel@nongnu.org; Tue, 12 Jan 2016 02:26:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43346) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aItLl-0008UW-8J for qemu-devel@nongnu.org; Tue, 12 Jan 2016 02:26:41 -0500 References: <1450168559-9181-1-git-send-email-thuth@redhat.com> <5693D08E.70108@redhat.com> <56947643.2090302@redhat.com> From: Thomas Huth Message-ID: <5694AAAC.7080405@redhat.com> Date: Tue, 12 Jan 2016 08:26:36 +0100 MIME-Version: 1.0 In-Reply-To: <56947643.2090302@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] net/slirp: Tell the users when they are using deprecated options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jason Wang , Jan Kiszka , qemu-devel@nongnu.org Cc: Paolo Bonzini , avocado-devel@redhat.com, Markus Armbruster On 12.01.2016 04:42, Jason Wang wrote: >=20 > 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 >>> --- >>> 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_lis= t, const char *optarg, int *ret >>> return 0; >>> } >>> =20 >>> + error_report("The -net channel option is deprecated and " >>> + "will be removed in a future version."); >>> + >>> /* handle legacy -net channel,port:chr */ >>> optarg +=3D strlen("channel,"); >>> =20 >>> 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" >>> =20 >>> #ifdef CONFIG_LINUX >>> #include >>> @@ -139,6 +140,8 @@ void os_parse_cmd_args(int index, const char *opt= arg) >>> 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 =3D optarg; >>> break; >>> case QEMU_OPTION_bootp: >>> + error_report("The -bootp option is deprecated and " >>> + "will be removed in a future version.")= ; >>> legacy_bootp_filename =3D 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 ;-) >=20 > 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/qem= u_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=3D" in devices.get_help_text(): return "" else: return " -tftp '%s'" % filename ... def add_net(devices, vlan, nettype, ifname=3DNone, tftp=3DNone, bootfile=3DNone, hostfwd=3D[], netdev_id=3DNone, netdev_extra_params=3DNone, tapfds=3DNone, script=3DN= one, downscript=3DNone, vhost=3DNone, queues=3DNone, vhost= fds=3DNone, add_queues=3DNone, helper=3DNone, add_tapfd=3DNone, add_vhostfd=3DNone, vhostforce=3DNone): ... elif mode =3D=3D "user": if tftp and "[,tftp=3D" in devices.get_help_text(): cmd +=3D ",tftp=3D'%s'" % tftp cmd_nd =3D cmd ... etc ... So I think that avocado should be fine already. Thomas