From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54387) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dFKQx-0007sN-QZ for qemu-devel@nongnu.org; Mon, 29 May 2017 09:10:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dFKQv-0002BX-Kk for qemu-devel@nongnu.org; Mon, 29 May 2017 09:10:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40542) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dFKQv-0002BQ-C4 for qemu-devel@nongnu.org; Mon, 29 May 2017 09:10:05 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 67C4F8123A for ; Mon, 29 May 2017 13:10:04 +0000 (UTC) From: Gerd Hoffmann Date: Mon, 29 May 2017 15:09:49 +0200 Message-Id: <20170529130956.20297-3-kraxel@redhat.com> In-Reply-To: <20170529130956.20297-1-kraxel@redhat.com> References: <20170529130956.20297-1-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 2/9] usb: Deprecate the legacy -usbdevice option List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Thomas Huth , Gerd Hoffmann , Paolo Bonzini From: Thomas Huth The '-usbdevice' option is 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 it is used to tell the user what to use instead. While we're at it, improve also some other minor USB-related spots in qemu-options.hx that were not up to date anymore. Signed-off-by: Thomas Huth Reviewed-by: Paolo Bonzini Message-id: 1495175716-12735-1-git-send-email-thuth@redhat.com Signed-off-by: Gerd Hoffmann --- vl.c | 2 ++ qemu-options.hx | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/vl.c b/vl.c index 3465121217..88d24d6b12 100644 --- a/vl.c +++ b/vl.c @@ -3759,6 +3759,8 @@ int main(int argc, char **argv, char **envp) 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); diff --git a/qemu-options.hx b/qemu-options.hx index f63f7dc946..91b3df6d97 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -980,12 +980,12 @@ 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). ETEXI DEF("usbdevice", HAS_ARG, QEMU_OPTION_usbdevice, @@ -995,7 +995,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 deprecated, +please use @code{-device usb-...} instead. @xref{usb_devices}. @table @option @@ -1373,7 +1374,7 @@ output such as guest graphics, guest console, and the QEMU monitor in a window. With this option, you can have QEMU listen on VNC display @var{display} and redirect the VGA display over the VNC session. It is very useful to enable the usb tablet device when using this option -(option @option{-usbdevice tablet}). When using the VNC display, you +(option @option{-device usb-tablet}). When using the VNC display, you must use the @option{-k} parameter to set the keyboard layout if you are not using en-us. Valid syntax for the @var{display} is -- 2.9.3