From d2aea775d4ab1a3d8fb92587881dc6fa55819f62 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Thu, 11 Mar 2021 10:28:29 +0100 Subject: [PATCH] usb: Remove "-usbdevice ccid" "-usbdevice ccid" was not documented and -usbdevice itself was marked as deprecated before QEMU v6.0. And searching for "-usbdevice ccid" in the internet does not show any useful results, so likely nobody was using the ccid device via the -usbdevice option. Remove it now. Signed-off-by: Thomas Huth Message-Id: <20210311092829.1479051-1-thuth@redhat.com> Signed-off-by: Gerd Hoffmann --- docs/system/removed-features.rst | 6 ++++++ hw/usb/dev-smartcard-reader.c | 1 - qemu-options.hx | 3 --- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/system/removed-features.rst b/docs/system/removed-features.rst index f28387f183..29e90601a5 100644 --- a/docs/system/removed-features.rst +++ b/docs/system/removed-features.rst @@ -120,6 +120,12 @@ Drives with interface types other than ``if=none`` are for onboard devices. Drives the board doesn't pick up can no longer be used with -device. Use ``if=none`` instead. +``-usbdevice ccid`` (removed in 6.0) +''''''''''''''''''''''''''''''''''''' + +This option was undocumented and not used in the field. +Use `-device usb-ccid`` instead. + QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index 80109fa551..bc3d94092a 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -1492,7 +1492,6 @@ static void ccid_register_types(void) type_register_static(&ccid_bus_info); type_register_static(&ccid_card_type_info); type_register_static(&ccid_info); - usb_legacy_register(TYPE_USB_CCID_DEV, "ccid", NULL); } type_init(ccid_register_types) diff --git a/qemu-options.hx b/qemu-options.hx index d60a03d3a9..fd21002bd6 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1743,9 +1743,6 @@ SRST corresponding ``braille`` chardev automatically beside the ``usb-braille`` USB device). - ``ccid`` - Smartcard reader device - ``keyboard`` Standard USB keyboard. Will override the PS/2 keyboard (if present).