usb: Un-deprecate -usbdevice (except for -usbdevice audio which gets removed)
When trying to remove the -usbdevice option, there were complaints that "-usbdevice braille" is still a very useful shortcut for some people. Thus we never remove this option. Since it's not such a big burden to keep it around, and it's also convenient in the sense that you don't have to worry to enable a host controller explicitly with this option, we should remove it from he deprecation list again. However, there is one exception: "-usbdevice audio" should go away, since audio devices without "audiodev=..." parameter are also on the deprecation list and you cannot use "-usbdevice audio" with "audiodev". Signed-off-by: Thomas Huth <thuth@redhat.com> Message-Id: <20210310173323.1422754-4-thuth@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
6523c96c9c
commit
6db34277e3
|
@ -21,15 +21,6 @@ deprecated.
|
||||||
System emulator command line arguments
|
System emulator command line arguments
|
||||||
--------------------------------------
|
--------------------------------------
|
||||||
|
|
||||||
``-usbdevice`` (since 2.10.0)
|
|
||||||
'''''''''''''''''''''''''''''
|
|
||||||
|
|
||||||
The ``-usbdevice DEV`` argument is now a synonym for setting
|
|
||||||
the ``-device usb-DEV`` argument instead. The deprecated syntax
|
|
||||||
would automatically enable USB support on the machine type.
|
|
||||||
If using the new syntax, USB support must be explicitly
|
|
||||||
enabled via the ``-machine usb=on`` argument.
|
|
||||||
|
|
||||||
``-drive file=json:{...{'driver':'file'}}`` (since 3.0)
|
``-drive file=json:{...{'driver':'file'}}`` (since 3.0)
|
||||||
'''''''''''''''''''''''''''''''''''''''''''''''''''''''
|
'''''''''''''''''''''''''''''''''''''''''''''''''''''''
|
||||||
|
|
||||||
|
|
|
@ -38,6 +38,14 @@ or ``-display default,show-cursor=on`` instead.
|
||||||
QEMU 5.0 introduced an alternative syntax to specify the size of the translation
|
QEMU 5.0 introduced an alternative syntax to specify the size of the translation
|
||||||
block cache, ``-accel tcg,tb-size=``.
|
block cache, ``-accel tcg,tb-size=``.
|
||||||
|
|
||||||
|
``-usbdevice audio`` (removed in 6.0)
|
||||||
|
'''''''''''''''''''''''''''''''''''''
|
||||||
|
|
||||||
|
This option lacked the possibility to specify an audio backend device.
|
||||||
|
Use ``-device usb-audio`` now instead (and specify a corresponding USB
|
||||||
|
host controller or ``-usb`` if necessary).
|
||||||
|
|
||||||
|
|
||||||
QEMU Machine Protocol (QMP) commands
|
QEMU Machine Protocol (QMP) commands
|
||||||
------------------------------------
|
------------------------------------
|
||||||
|
|
||||||
|
|
|
@ -1024,7 +1024,6 @@ static const TypeInfo usb_audio_info = {
|
||||||
static void usb_audio_register_types(void)
|
static void usb_audio_register_types(void)
|
||||||
{
|
{
|
||||||
type_register_static(&usb_audio_info);
|
type_register_static(&usb_audio_info);
|
||||||
usb_legacy_register(TYPE_USB_AUDIO, "audio", NULL);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type_init(usb_audio_register_types)
|
type_init(usb_audio_register_types)
|
||||||
|
|
|
@ -3180,8 +3180,6 @@ void qemu_init(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);
|
||||||
|
|
Loading…
Reference in New Issue