From nobody Wed Nov 19 07:03:52 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615398111; cv=none; d=zohomail.com; s=zohoarc; b=QFZzERB4HOjtsuvP8cSsSLcc3fw0YvLS/pEW025srNDv3ZCXzKDJDr8EeNHpTa4seQYSfu9p4Csl0oKNhkuRWB1p0I2Euk9y1r49R5r3QiQS56X+d5ETKzMwQK/p0fE4PDp9jkYxnMILnW7wUQ3Hl3oRkW+gv27QIlKwROiaRrg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615398111; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+zve30dje/9XnSdNB4el5HXg0L8IB4L2l+Yz29v9zhM=; b=Ve9/uzlrRq/EVenTpdlyxZDLSyZZeu2gi+ha7sb+X9QjGqGnIPSbxaXJsT8P1W/Nr9vO13TuaVm/y57+RKlUDYfbsHOxYbDIQi4AudNYxtPjVhB4Olkq+e3Lz/JwXJ3hpexXMfMgFI2PrAXdITWv8xijdEsiaD+uZcVUReKgqAw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615398111020747.3893449165473; Wed, 10 Mar 2021 09:41:51 -0800 (PST) Received: from localhost ([::1]:54626 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK2qD-0005yK-Rx for importer@patchew.org; Wed, 10 Mar 2021 12:41:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41938) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK2iN-0007hi-0t for qemu-devel@nongnu.org; Wed, 10 Mar 2021 12:33:43 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:55416) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lK2iH-0006yY-7Y for qemu-devel@nongnu.org; Wed, 10 Mar 2021 12:33:42 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-191-LK4Ejn5GMM2fx0PpjUnjYA-1; Wed, 10 Mar 2021 12:33:34 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 883CF801817; Wed, 10 Mar 2021 17:33:33 +0000 (UTC) Received: from thuth.com (ovpn-112-19.ams2.redhat.com [10.36.112.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F1E860C13; Wed, 10 Mar 2021 17:33:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615397616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+zve30dje/9XnSdNB4el5HXg0L8IB4L2l+Yz29v9zhM=; b=AZxSLMU3is10lfBt+v4ZKmAWwdRLmH/GTVvEuZ01uutjOBqJZ6yJHjxKWHhAIR6yr8cQOF 1aqi02M+WFl4LRfxWZVQY/n6oqAbzAn5tYTGVyENigA/ykIDOT0xFnRw0Q/s/W/K7zxdLd aSdgGaUc99C23mt63M2bkdeeZGT+4XI= X-MC-Unique: LK4Ejn5GMM2fx0PpjUnjYA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Gerd Hoffmann Subject: [PATCH 1/4] usb: remove support for -usbdevice parameters Date: Wed, 10 Mar 2021 18:33:20 +0100 Message-Id: <20210310173323.1422754-2-thuth@redhat.com> In-Reply-To: <20210310173323.1422754-1-thuth@redhat.com> References: <20210310173323.1422754-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.243, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Markus Armbruster , Samuel Thibault Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Paolo Bonzini No device needs them anymore and in fact they're undocumented. Remove the code. The only change in behavior is that "-usbdevice braille:hello" now reports an error, which is a bugfix. Signed-off-by: Paolo Bonzini Cc: Gerd Hoffmann Signed-off-by: Thomas Huth --- hw/usb/bus.c | 32 +++++++------------------------- hw/usb/dev-serial.c | 2 +- include/hw/usb.h | 2 +- 3 files changed, 9 insertions(+), 27 deletions(-) diff --git a/hw/usb/bus.c b/hw/usb/bus.c index 064f94e9c3..4b8882427d 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -312,13 +312,13 @@ typedef struct LegacyUSBFactory { const char *name; const char *usbdevice_name; - USBDevice *(*usbdevice_init)(const char *params); + USBDevice *(*usbdevice_init)(void); } LegacyUSBFactory; =20 static GSList *legacy_usb_factory; =20 void usb_legacy_register(const char *typename, const char *usbdevice_name, - USBDevice *(*usbdevice_init)(const char *params)) + USBDevice *(*usbdevice_init)(void)) { if (usbdevice_name) { LegacyUSBFactory *f =3D g_malloc0(sizeof(*f)); @@ -663,27 +663,17 @@ void hmp_info_usb(Monitor *mon, const QDict *qdict) } =20 /* handle legacy -usbdevice cmd line option */ -USBDevice *usbdevice_create(const char *cmdline) +USBDevice *usbdevice_create(const char *driver) { USBBus *bus =3D usb_bus_find(-1 /* any */); LegacyUSBFactory *f =3D NULL; Error *err =3D NULL; GSList *i; - char driver[32]; - const char *params; - int len; USBDevice *dev; =20 - params =3D strchr(cmdline,':'); - if (params) { - params++; - len =3D params - cmdline; - if (len > sizeof(driver)) - len =3D sizeof(driver); - pstrcpy(driver, len, cmdline); - } else { - params =3D ""; - pstrcpy(driver, sizeof(driver), cmdline); + if (strchr(driver, ':')) { + error_report("usbdevice parameters are not supported anymore"); + return NULL; } =20 for (i =3D legacy_usb_factory; i; i =3D i->next) { @@ -707,15 +697,7 @@ USBDevice *usbdevice_create(const char *cmdline) return NULL; } =20 - if (f->usbdevice_init) { - dev =3D f->usbdevice_init(params); - } else { - if (*params) { - error_report("usbdevice %s accepts no params", driver); - return NULL; - } - dev =3D usb_new(f->name); - } + dev =3D f->usbdevice_init ? f->usbdevice_init() : usb_new(f->name); if (!dev) { error_report("Failed to create USB device '%s'", f->name); return NULL; diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c index b58c4eb908..63047d79cf 100644 --- a/hw/usb/dev-serial.c +++ b/hw/usb/dev-serial.c @@ -614,7 +614,7 @@ static void usb_serial_realize(USBDevice *dev, Error **= errp) s->intr =3D usb_ep_get(dev, USB_TOKEN_IN, 1); } =20 -static USBDevice *usb_braille_init(const char *unused) +static USBDevice *usb_braille_init(void) { USBDevice *dev; Chardev *cdrv; diff --git a/include/hw/usb.h b/include/hw/usb.h index abfbfc5284..08684bcd27 100644 --- a/include/hw/usb.h +++ b/include/hw/usb.h @@ -500,7 +500,7 @@ void usb_bus_new(USBBus *bus, size_t bus_size, void usb_bus_release(USBBus *bus); USBBus *usb_bus_find(int busnr); void usb_legacy_register(const char *typename, const char *usbdevice_name, - USBDevice *(*usbdevice_init)(const char *params)); + USBDevice *(*usbdevice_init)(void)); USBDevice *usb_new(const char *name); bool usb_realize_and_unref(USBDevice *dev, USBBus *bus, Error **errp); USBDevice *usb_create_simple(USBBus *bus, const char *name); --=20 2.27.0 From nobody Wed Nov 19 07:03:52 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615399284; cv=none; d=zohomail.com; s=zohoarc; b=Yg8E7s2OS1u4fQmzgYC/ltYTQljQKW1HESmtyh5fWbbIkOPMULg/QZWAQ5fsOY+2MDtfHvUl1qC+taCnBP8LEFa35VB4jrK9o/skT6JMElnE1rhRMeBBUwzPB5YVdF6VtxUkeio5mWvjGMpdsBnypPaMoT4XjkzUQy2/H6p/RA4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615399284; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZjFwI+KSKuugYDbZakv5yY78c7DTTRMp5MYSvg/el3g=; b=LLwSvoi/ZeyOaSrsSAI2vEfrIylohiaASn5kK8qKuzl644LckLQF8A6ASu/luggNQemhsHODrGRwEYk2XuInAGJrmqALojpharFS4qXo5/E7zTu+5ZzDYnShsUtJ7/4zepH/SRY9YyqnBPWf30+GiHFAke1I8o/C2cUJRL5KKrM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615399284132483.99050849804325; Wed, 10 Mar 2021 10:01:24 -0800 (PST) Received: from localhost ([::1]:42378 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK398-00016K-EB for importer@patchew.org; Wed, 10 Mar 2021 13:01:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41960) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK2iO-0007ka-Eu for qemu-devel@nongnu.org; Wed, 10 Mar 2021 12:33:44 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:41321) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lK2iM-0006yl-OA for qemu-devel@nongnu.org; Wed, 10 Mar 2021 12:33:44 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-359-m8Z7I3DzO0etQsAO5wfQjw-1; Wed, 10 Mar 2021 12:33:36 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id ADAB71966320; Wed, 10 Mar 2021 17:33:35 +0000 (UTC) Received: from thuth.com (ovpn-112-19.ams2.redhat.com [10.36.112.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id E04E560C13; Wed, 10 Mar 2021 17:33:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615397618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZjFwI+KSKuugYDbZakv5yY78c7DTTRMp5MYSvg/el3g=; b=bOIRDZ+a2iwdYxeRQvA3GXcTg826QPIbs6baRwT9h1wwaUk2RpL+0tpuwg7srhlum9u335 h2Q4PWEMvoHXl60+EKbXC7gqsXaoDMYubtjYaLetgM+AflbpAc+L9a0h5uX8LY2k7PKRqb BkOkhO1KF+7wXxgybOr9icBylKogeQw= X-MC-Unique: m8Z7I3DzO0etQsAO5wfQjw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Gerd Hoffmann Subject: [PATCH 2/4] usb: remove '-usbdevice u2f-key' Date: Wed, 10 Mar 2021 18:33:21 +0100 Message-Id: <20210310173323.1422754-3-thuth@redhat.com> In-Reply-To: <20210310173323.1422754-1-thuth@redhat.com> References: <20210310173323.1422754-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.243, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Markus Armbruster , Samuel Thibault Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Paolo Bonzini It never worked. Signed-off-by: Paolo Bonzini Cc: Gerd Hoffmann Signed-off-by: Thomas Huth --- hw/usb/u2f.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/usb/u2f.c b/hw/usb/u2f.c index bc09191f06..56001249a4 100644 --- a/hw/usb/u2f.c +++ b/hw/usb/u2f.c @@ -346,7 +346,6 @@ static const TypeInfo u2f_key_info =3D { static void u2f_key_register_types(void) { type_register_static(&u2f_key_info); - usb_legacy_register(TYPE_U2F_KEY, "u2f-key", NULL); } =20 type_init(u2f_key_register_types) --=20 2.27.0 From nobody Wed Nov 19 07:03:52 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615398361; cv=none; d=zohomail.com; s=zohoarc; b=OAO58/w9xVzeIgtMRMXMD7piUxBr5AbPFFottZ2RIuzuCudOavf0QOfs6YIaZcvQ7S8iva7E9hy/jIR6otL5CRHcnaKHGICu4T0VZXiXViuCNqUEfizdxUGWZxnaXx9VsdwPzGzZtSSUGWW06F20CnnLHPXJmtBA3LQyO35dX7Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615398361; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ESwvUl8BPHoSVP5Q/+iTnqilXi27SdTEHWwvSZi2vzQ=; b=MoaYK+wsXUDZrynRDpzKh9rq43wke8JrcN2SlIU7tJrMKXpFBQhplLA+YJTnSGTBzM60KuckpiSHl6/aEGa+JlfTy43j8xZaJSP+3P8IRWzkyfFlYiy/J0dHBqBWRoD8O/LT3w2Vn5bWmJQ8Hslul1zbxr4IjfD3YeGMqGmcNPc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161539836195028.93343670609829; Wed, 10 Mar 2021 09:46:01 -0800 (PST) Received: from localhost ([::1]:34670 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK2uF-0001lW-2s for importer@patchew.org; Wed, 10 Mar 2021 12:46:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42024) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK2iU-0007vg-5e for qemu-devel@nongnu.org; Wed, 10 Mar 2021 12:33:50 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:40369) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lK2iS-0006zb-7W for qemu-devel@nongnu.org; Wed, 10 Mar 2021 12:33:49 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-603-8BjV5uE5Pc-GOcDirYs29w-1; Wed, 10 Mar 2021 12:33:42 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 689B5801817; Wed, 10 Mar 2021 17:33:41 +0000 (UTC) Received: from thuth.com (ovpn-112-19.ams2.redhat.com [10.36.112.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 15E0C60C13; Wed, 10 Mar 2021 17:33:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615397627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ESwvUl8BPHoSVP5Q/+iTnqilXi27SdTEHWwvSZi2vzQ=; b=YJmU5PRW0nBhwZp7vXDR04jYQSjXIm2IDYh4KT4nFKEL34TTWr/YeTrK937XRqQ0BO1fiG GxHDV1Eveg8k9TfWo5Fgy1JamxCxy/XG+ccMIe+SC7cQQ3WVVomc0/6Tv9/V8xBTpGtQWu 5IGVajHOUh3ERmViKbWlDcGD7XJVxkw= X-MC-Unique: 8BjV5uE5Pc-GOcDirYs29w-1 From: Thomas Huth To: qemu-devel@nongnu.org, Gerd Hoffmann Subject: [PATCH 3/4] usb: Un-deprecate -usbdevice (except for -usbdevice audio which gets removed) Date: Wed, 10 Mar 2021 18:33:22 +0100 Message-Id: <20210310173323.1422754-4-thuth@redhat.com> In-Reply-To: <20210310173323.1422754-1-thuth@redhat.com> References: <20210310173323.1422754-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.243, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Markus Armbruster , Samuel Thibault Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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=3D..." parameter are also on the deprecation list and you cannot use "-usbdevice audio" with "audiodev". Signed-off-by: Thomas Huth --- docs/system/deprecated.rst | 9 --------- docs/system/removed-features.rst | 8 ++++++++ hw/usb/dev-audio.c | 1 - softmmu/vl.c | 2 -- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index cfabe69846..816eb4084f 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -21,15 +21,6 @@ deprecated. System emulator command line arguments -------------------------------------- =20 -``-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=3Don`` argument. - ``-drive file=3Djson:{...{'driver':'file'}}`` (since 3.0) ''''''''''''''''''''''''''''''''''''''''''''''''''''''' =20 diff --git a/docs/system/removed-features.rst b/docs/system/removed-feature= s.rst index c8481cafbd..ea28904e5f 100644 --- a/docs/system/removed-features.rst +++ b/docs/system/removed-features.rst @@ -38,6 +38,14 @@ or ``-display default,show-cursor=3Don`` instead. QEMU 5.0 introduced an alternative syntax to specify the size of the trans= lation block cache, ``-accel tcg,tb-size=3D``. =20 +``-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 ------------------------------------ =20 diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c index e1486f81e0..f5cb246792 100644 --- a/hw/usb/dev-audio.c +++ b/hw/usb/dev-audio.c @@ -1024,7 +1024,6 @@ static const TypeInfo usb_audio_info =3D { static void usb_audio_register_types(void) { type_register_static(&usb_audio_info); - usb_legacy_register(TYPE_USB_AUDIO, "audio", NULL); } =20 type_init(usb_audio_register_types) diff --git a/softmmu/vl.c b/softmmu/vl.c index ff488ea3e7..76ebe7bb7a 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -3180,8 +3180,6 @@ void qemu_init(int argc, char **argv, char **envp) qemu_opts_parse_noisily(olist, "usb=3Don", false); break; case QEMU_OPTION_usbdevice: - error_report("'-usbdevice' is deprecated, please use " - "'-device usb-...' instead"); olist =3D qemu_find_opts("machine"); qemu_opts_parse_noisily(olist, "usb=3Don", false); add_device_config(DEV_USB, optarg); --=20 2.27.0 From nobody Wed Nov 19 07:03:52 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615399352; cv=none; d=zohomail.com; s=zohoarc; b=aSJsYcT836Cj2IINS8Q/iZwRXoS9XOPXlSa835/6Bnt1+3A1N2nW1BUDpv4uLgSLAJhtNV6FS2gzPzc8VTFX8bwCDL3OEgAr0aQL0ESatLYl5HkWyY9VDVHQxndgEM9nD3FIvbPNeJFmpLQw+izpX0GXhZnPEt8UJWxSQSO9LS8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615399352; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=u0+0p19CyzcR+EsdhHrWNL5MsuN+w8ymfYKQkIFx70g=; b=MHrrDRclwIUoDiyS2mg9k9owWnh1+hu7dpTpnlnzgIjiwI7kxpUS8Es8yoMxKRjZg0LaRBFSfJEP8EHCHWhj65eWzfuKFp4tfbGmJ2e0mjYK/qi7cQCO6DMQjZYa/4FlZ8Qry1CgvkCnfK87Djuss2ztb+MQkh5oJDNiWCFaUPc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615399352819447.4319522892199; Wed, 10 Mar 2021 10:02:32 -0800 (PST) Received: from localhost ([::1]:45860 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK3AF-0002gX-4l for importer@patchew.org; Wed, 10 Mar 2021 13:02:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK2iT-0007t3-5J for qemu-devel@nongnu.org; Wed, 10 Mar 2021 12:33:49 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:57888) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lK2iQ-0006zL-VF for qemu-devel@nongnu.org; Wed, 10 Mar 2021 12:33:48 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-550-73ODmyEIOfWtwzXKvYDeIw-1; Wed, 10 Mar 2021 12:33:44 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3CBEE1966320; Wed, 10 Mar 2021 17:33:43 +0000 (UTC) Received: from thuth.com (ovpn-112-19.ams2.redhat.com [10.36.112.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id B44EF60C13; Wed, 10 Mar 2021 17:33:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615397626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=u0+0p19CyzcR+EsdhHrWNL5MsuN+w8ymfYKQkIFx70g=; b=EZE30Ui2ntjmCpSb5mVeWDjTpeqYytxBbLBBQtZyE68t716sZrtyuYjIdCjpFx5uByY+Xx EDnLst0opDcNxBQ+ssbUwWhs6D6cviFKGQa/YVGWmntEcxMnXOU7/jqVpYEX4QHyWHQc5O BA1ReSSTs/7C1cr4nOTKYFy0zAveoVY= X-MC-Unique: 73ODmyEIOfWtwzXKvYDeIw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Gerd Hoffmann Subject: [PATCH 4/4] usb: Document the missing -usbdevice options Date: Wed, 10 Mar 2021 18:33:23 +0100 Message-Id: <20210310173323.1422754-5-thuth@redhat.com> In-Reply-To: <20210310173323.1422754-1-thuth@redhat.com> References: <20210310173323.1422754-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.243, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Markus Armbruster , Samuel Thibault Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" There are some more -usbdevice options that have never been mentioned in the documentation. Now that we removed -usbdevice from the list of deprecated features again, we should document them properly. While we're at it, also sort them alphabetically. Signed-off-by: Thomas Huth --- qemu-options.hx | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 90801286c6..fdecee758a 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1705,7 +1705,7 @@ ERST =20 DEFHEADING() =20 -DEFHEADING(USB options:) +DEFHEADING(USB convenience options:) =20 DEF("usb", 0, QEMU_OPTION_usb, "-usb enable on-board USB host controller (if not enabled b= y default)\n", @@ -1723,9 +1723,31 @@ DEF("usbdevice", HAS_ARG, QEMU_OPTION_usbdevice, QEMU_ARCH_ALL) SRST ``-usbdevice devname`` - Add the USB device devname. Note that this option is deprecated, - please use ``-device usb-...`` instead. See the chapter about + Add the USB device devname, and enable an on-board USB controller + if possible and necessary (just like it can be done via + ``-machine usb=3Don``). Note that this option is mainly intended for + the user's convenience only. More fine-grained control can be + achieved by selecting a USB host controller (if necessary) and the + desired USB device via the ``-device`` option instead. For example, + instead of using ``-usbdevice mouse`` it is possible to use + ``-device qemu-xhci -device usb-mouse`` to connect the USB mouse + to a USB 3.0 controller instead (at least on machines that support + PCI and do not have an USB controller enabled by default yet). + For more details, see the chapter about :ref:`Connecting USB devices` in the System Emulation Users Guide. + Possible devices for devname are: + + ``braille`` + Braille device. This will use BrlAPI to display the braille + output on a real or fake device (i.e. it also creates a + 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= ). =20 ``mouse`` Virtual Mouse. This will override the PS/2 mouse emulation when @@ -1737,9 +1759,10 @@ SRST position without having to grab the mouse. Also overrides the PS/2 mouse emulation when activated. =20 - ``braille`` - Braille device. This will use BrlAPI to display the braille - output on a real or fake device. + ``wacom-tablet`` + Wacom PenPartner USB tablet. + + ERST =20 DEFHEADING() --=20 2.27.0 From nobody Wed Nov 19 07:03:52 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615455051; cv=none; d=zohomail.com; s=zohoarc; b=f+fGr4YUsIxAz/RTo31hsSNh7HbOgBYJ/FcubNWF8Dt2L1KO5XGX8BjdyWsgobGnL//xyaC9F8WZhKVixYwb0/qK/k+DxpZSn2E04QvhtAKZB3ZN3tBdIxbdgW9qmnhmwgVWNA1JhgbEanHy4a6XZ77XKCZ1KIOx6EtJjEq5IiM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615455051; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fa23qDEwmXsSX6yfRYssVCKS7s8Xcn4NLnmr57AjFJU=; b=JwQyezAWzZhaQ+6b6pvnJGtWqpADdvAXSQCgMoEAsfw96iE13m1PC4dfS+cwXDWo6kOXwo80ILmH5nhD1BrvStWfG1m16m8V7Xw5g4ucTEqEBFPkj8OFoPgrNukkYukzXCHE1W/KiH1QNzZQSj4RtoXrKHLMd60HtUBQvft4ATk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615455051368209.8928682078589; Thu, 11 Mar 2021 01:30:51 -0800 (PST) Received: from localhost ([::1]:46264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKHec-0004yY-3r for importer@patchew.org; Thu, 11 Mar 2021 04:30:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54384) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKHcY-0003Ij-PC for qemu-devel@nongnu.org; Thu, 11 Mar 2021 04:28:42 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:50363) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lKHcW-00060X-4w for qemu-devel@nongnu.org; Thu, 11 Mar 2021 04:28:41 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-277-5SfKT7q9MYS629QtAWPlDQ-1; Thu, 11 Mar 2021 04:28:36 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5AB24101F000 for ; Thu, 11 Mar 2021 09:28:35 +0000 (UTC) Received: from thuth.com (ovpn-112-33.ams2.redhat.com [10.36.112.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6BACE5C1CF; Thu, 11 Mar 2021 09:28:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615454918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fa23qDEwmXsSX6yfRYssVCKS7s8Xcn4NLnmr57AjFJU=; b=B05i+/zJIuUm8mh0i3i4+EDwVS61gxiLrhzXHmmx/hHSOMy9901DDAYZ6m2Dtir/TJWlnW EsvFw3HP7qnb/4V3ZkOup6eYvjGPNsMe/o52eLcgbduvB4qT3wEnoc3z7dsfs59JVPkYb0 dCvwPz59V//qOYlInUdOd6jBVTxQb+Y= X-MC-Unique: 5SfKT7q9MYS629QtAWPlDQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Gerd Hoffmann Subject: [PATCH 5/4] usb: Remove "-usbdevice ccid" Date: Thu, 11 Mar 2021 10:28:29 +0100 Message-Id: <20210311092829.1479051-1-thuth@redhat.com> In-Reply-To: <20210310173323.1422754-1-thuth@redhat.com> References: <20210310173323.1422754-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.243, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" "-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 --- 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-feature= s.rst index ea28904e5f..335d8a5f2f 100644 --- a/docs/system/removed-features.rst +++ b/docs/system/removed-features.rst @@ -45,6 +45,12 @@ This option lacked the possibility to specify an audio b= ackend device. Use ``-device usb-audio`` now instead (and specify a corresponding USB host controller or ``-usb`` if necessary). =20 +``-usbdevice ccid`` (removed in 6.0) +''''''''''''''''''''''''''''''''''''' + +This option was undocumented and not used in the field. +Use `-device usb-ccid`` instead. + =20 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); } =20 type_init(ccid_register_types) diff --git a/qemu-options.hx b/qemu-options.hx index fdecee758a..8f4ede1e11 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1743,9 +1743,6 @@ SRST corresponding ``braille`` chardev automatically beside the ``usb-braille`` USB device). =20 - ``ccid`` - Smartcard reader device - ``keyboard`` Standard USB keyboard. Will override the PS/2 keyboard (if present= ). =20 --=20 2.27.0