[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/9] usb: Deprecate the legacy -usbdevice option
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 2/9] usb: Deprecate the legacy -usbdevice option |
Date: |
Mon, 29 May 2017 15:09:49 +0200 |
From: Thomas Huth <address@hidden>
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 <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
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
- [Qemu-devel] [PULL 0/9] usb patch queue, Gerd Hoffmann, 2017/05/29
- [Qemu-devel] [PULL 3/9] usb: Deprecate HMP commands usb_add and usb_del, Gerd Hoffmann, 2017/05/29
- [Qemu-devel] [PULL 2/9] usb: Deprecate the legacy -usbdevice option,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 1/9] ehci: fix overflow in frame timer code, Gerd Hoffmann, 2017/05/29
- [Qemu-devel] [PULL 9/9] ehci: fix frame timer invocation., Gerd Hoffmann, 2017/05/29
- [Qemu-devel] [PULL 5/9] xhci: split into multiple files, Gerd Hoffmann, 2017/05/29
- [Qemu-devel] [PULL 8/9] usb: don't wakeup during coldplug, Gerd Hoffmann, 2017/05/29
- [Qemu-devel] [PULL 4/9] usb: Simplify the parameter parsing of the legacy usb serial device, Gerd Hoffmann, 2017/05/29
- [Qemu-devel] [PULL 7/9] usb-hub: set PORT_STAT_C_SUSPEND on host-initiated wake-up, Gerd Hoffmann, 2017/05/29
- [Qemu-devel] [PULL 6/9] xhci: add CONFIG_USB_XHCI_NEC option, Gerd Hoffmann, 2017/05/29
- Re: [Qemu-devel] [PULL 0/9] usb patch queue, Stefan Hajnoczi, 2017/05/30