From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40603) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5T0k-0005Ry-QL for qemu-devel@nongnu.org; Tue, 02 May 2017 04:18:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d5T0h-00077e-L0 for qemu-devel@nongnu.org; Tue, 02 May 2017 04:18:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47466) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d5T0h-00076n-C9 for qemu-devel@nongnu.org; Tue, 02 May 2017 04:18:15 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2A9A93C7811 for ; Tue, 2 May 2017 08:18:14 +0000 (UTC) References: <1493712420-22480-1-git-send-email-thuth@redhat.com> From: Paolo Bonzini Message-ID: <614ac73b-37f3-0e5e-535c-ac4d9cb8f81e@redhat.com> Date: Tue, 2 May 2017 10:18:10 +0200 MIME-Version: 1.0 In-Reply-To: <1493712420-22480-1-git-send-email-thuth@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2] Print a warning message if the user specified a legacy USB option List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Thomas Huth , qemu-devel@nongnu.org, Gerd Hoffmann On 02/05/2017 10:07, Thomas Huth wrote: > '-usb' and '-usbdevice' are considered as deprecated nowadays and > we might want to remove these options in a future version of QEMU. > So mark this options as deprecated in the documenation and print out > a warning if they are used to tell the user what to use instead. > > Signed-off-by: Thomas Huth > --- > v2: Also update the documentation accordingly > > qemu-options.hx | 8 +++++--- > vl.c | 4 ++++ > 2 files changed, 9 insertions(+), 3 deletions(-) > > diff --git a/qemu-options.hx b/qemu-options.hx > index f68829f..57bacc5 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -946,12 +946,13 @@ STEXI > ETEXI > > DEF("usb", 0, QEMU_OPTION_usb, > - "-usb enable the USB driver (will be the default soon)\n", > + "-usb enable the USB driver (if it is not used by default yet)\n", > QEMU_ARCH_ALL) > STEXI > @item -usb > @findex -usb > -Enable the USB driver (will be the default soon) > +Enable the USB driver (if it is not used by default yet). Note that this > +option is deprecated, please use @code{-M usb=on} instead. This is pointless, "-usb" is just syntactic sugar and doesn't add any complex logic. > ETEXI > > DEF("usbdevice", HAS_ARG, QEMU_OPTION_usbdevice, > @@ -961,7 +962,8 @@ STEXI > > @item -usbdevice @var{devname} > @findex -usbdevice > -Add the USB device @var{devname}. @xref{usb_devices}. > +Add the USB device @var{devname}. Note that this option is deperecated, > +please use @code{-device usb-...} instead. See also @xref{usb_devices}. > > @table @option This makes sense, but the usb_devices section of the manual still documents -usbdevice instead of "-device usb-...". In general, docs/qdev-device-use.txt should be integrated in the manual before a serious attempt to deprecate "-usbdevice" and "-drive" is made. Thanks, Paolo > diff --git a/vl.c b/vl.c > index 42d4bce..0023298 100644 > --- a/vl.c > +++ b/vl.c > @@ -3748,10 +3748,14 @@ int main(int argc, char **argv, char **envp) > } > break; > case QEMU_OPTION_usb: > + error_report("'-usb' is deprecated, please use " > + "'-M usb=on' instead"); > olist = qemu_find_opts("machine"); > qemu_opts_parse_noisily(olist, "usb=on", false); > break; > case QEMU_OPTION_usbdevice: > + error_report("'-usbdevice' is deprecated, please use " > + "'-device usb-...' instead"); > olist = qemu_find_opts("machine"); > qemu_opts_parse_noisily(olist, "usb=on", false); > add_device_config(DEV_USB, optarg); >