falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

usb: Deprecate the legacy -usbdevice option 

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 <thuth@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1495175716-12735-1-git-send-email-thuth@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Thomas Huth 2017-05-19 08:35:16 +02:00 committed by Gerd Hoffmann
parent 3ae7eb88c4
commit a358a3af45
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qemu-options.hx
View File

@ -980,12 +980,12 @@ STEXI
ETEXI ETEXI
DEF("usb", 0, QEMU_OPTION_usb, 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) QEMU_ARCH_ALL)
STEXI STEXI
@item -usb @item -usb
@findex -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 ETEXI
DEF("usbdevice", HAS_ARG, QEMU_OPTION_usbdevice, DEF("usbdevice", HAS_ARG, QEMU_OPTION_usbdevice,
@ -995,7 +995,8 @@ STEXI
@item -usbdevice @var{devname} @item -usbdevice @var{devname}
@findex -usbdevice @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 @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 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 @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 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 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 not using en-us. Valid syntax for the @var{display} is

2
vl.c
View File

@ -3759,6 +3759,8 @@ int main(int argc, char **argv, char **envp)
qemu_opts_parse_noisily(olist, "usb=on", false); qemu_opts_parse_noisily(olist, "usb=on", false);
break; break;
case QEMU_OPTION_usbdevice: case QEMU_OPTION_usbdevice:
error_report("'-usbdevice' is deprecated, please use "
"'-device usb-...' instead");
olist = qemu_find_opts("machine"); olist = qemu_find_opts("machine");
qemu_opts_parse_noisily(olist, "usb=on", false); qemu_opts_parse_noisily(olist, "usb=on", false);
add_device_config(DEV_USB, optarg); add_device_config(DEV_USB, optarg);