From nobody Mon May 6 00:47:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1512150679208854.56928207985; Fri, 1 Dec 2017 09:51:19 -0800 (PST) Received: from localhost ([::1]:59207 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eKpSu-0005bX-Vt for importer@patchew.org; Fri, 01 Dec 2017 12:51:11 -0500 Received: from eggs.gnu.org ([208.118.235.92]:56079) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eKo2C-0005cv-NS for qemu-devel@nongnu.org; Fri, 01 Dec 2017 11:20:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eKo18-0001M1-Ff for qemu-devel@nongnu.org; Fri, 01 Dec 2017 11:19:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50867) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eKo15-0001IM-Ur for qemu-devel@nongnu.org; Fri, 01 Dec 2017 11:18:20 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0BB8FC0587D2 for ; Thu, 30 Nov 2017 20:19:04 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-158.ams2.redhat.com [10.36.116.158]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1FDA25D6A3; Thu, 30 Nov 2017 20:19:00 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Date: Thu, 30 Nov 2017 21:19:00 +0100 Message-Id: <1512073140-17672-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 30 Nov 2017 20:19:04 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 for-2.12] hmp-commands: Remove the deprecated usb_add and usb_del X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kraxel@redhat.com, "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" It's easy to use device_add and device_del as replacement instead. The usb_add and usb_del commands are deprecated since QEMU 2.10, and nobody complained that they are still needed, so let's get rid of them now to make the HMP interface a little bit less overloaded. Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Thomas Huth --- v2: Remove the function usb_device_delete_addr(), too. hmp-commands.hx | 33 --------------------------------- hw/usb/bus.c | 22 ---------------------- include/hw/usb.h | 1 - include/sysemu/sysemu.h | 2 -- qemu-doc.texi | 8 -------- vl.c | 44 -------------------------------------------- 6 files changed, 110 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index 4afd57c..6d5ebdf 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -666,39 +666,6 @@ Compute the checksum of a memory region. ETEXI =20 { - .name =3D "usb_add", - .args_type =3D "devname:s", - .params =3D "device", - .help =3D "add USB device (e.g. 'host:bus.addr' or 'host:ven= dor_id:product_id')", - .cmd =3D hmp_usb_add, - }, - -STEXI -@item usb_add @var{devname} -@findex usb_add -Add the USB device @var{devname}. This command is deprecated, please -use @code{device_add} instead. For details of available devices see -@ref{usb_devices} -ETEXI - - { - .name =3D "usb_del", - .args_type =3D "devname:s", - .params =3D "device", - .help =3D "remove USB device 'bus.addr'", - .cmd =3D hmp_usb_del, - }, - -STEXI -@item usb_del @var{devname} -@findex usb_del -Remove the USB device @var{devname} from the QEMU virtual USB -hub. @var{devname} has the syntax @code{bus.addr}. Use the monitor -command @code{info usb} to see the devices you can remove. This -command is deprecated, please use @code{device_del} instead. -ETEXI - - { .name =3D "device_add", .args_type =3D "device:O", .params =3D "driver[,prop=3Dvalue][,...]", diff --git a/hw/usb/bus.c b/hw/usb/bus.c index e56dc33..11f7720 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -559,28 +559,6 @@ int usb_device_detach(USBDevice *dev) return 0; } =20 -int usb_device_delete_addr(int busnr, int addr) -{ - USBBus *bus; - USBPort *port; - USBDevice *dev; - - bus =3D usb_bus_find(busnr); - if (!bus) - return -1; - - QTAILQ_FOREACH(port, &bus->used, next) { - if (port->dev->addr =3D=3D addr) - break; - } - if (!port) - return -1; - dev =3D port->dev; - - object_unparent(OBJECT(dev)); - return 0; -} - static const char *usb_speed(unsigned int speed) { static const char *txt[] =3D { diff --git a/include/hw/usb.h b/include/hw/usb.h index eb28655..9dd9c6f 100644 --- a/include/hw/usb.h +++ b/include/hw/usb.h @@ -549,7 +549,6 @@ void usb_claim_port(USBDevice *dev, Error **errp); void usb_release_port(USBDevice *dev); void usb_device_attach(USBDevice *dev, Error **errp); int usb_device_detach(USBDevice *dev); -int usb_device_delete_addr(int busnr, int addr); void usb_check_attach(USBDevice *dev, Error **errp); =20 static inline USBBus *usb_bus_from_device(USBDevice *d) diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index c083869..31612ca 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -166,8 +166,6 @@ extern Chardev *serial_hds[MAX_SERIAL_PORTS]; =20 extern Chardev *parallel_hds[MAX_PARALLEL_PORTS]; =20 -void hmp_usb_add(Monitor *mon, const QDict *qdict); -void hmp_usb_del(Monitor *mon, const QDict *qdict); void hmp_info_usb(Monitor *mon, const QDict *qdict); =20 void add_boot_device_path(int32_t bootindex, DeviceState *dev, diff --git a/qemu-doc.texi b/qemu-doc.texi index db2351c..ee206b8 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -2518,14 +2518,6 @@ The ``host_net_add'' command is replaced by the ``ne= tdev_add'' command. =20 The ``host_net_remove'' command is replaced by the ``netdev_del'' command. =20 -@subsection usb_add (since 2.10.0) - -The ``usb_add'' command is replaced by the ``device_add'' command. - -@subsection usb_del (since 2.10.0) - -The ``usb_del'' command is replaced by the ``device_del'' command. - @section System emulator devices =20 @subsection ivshmem (since 2.6.0) diff --git a/vl.c b/vl.c index 1ad1c04..fc8bd93 100644 --- a/vl.c +++ b/vl.c @@ -1479,28 +1479,6 @@ done: return 0; } =20 -static int usb_device_del(const char *devname) -{ - int bus_num, addr; - const char *p; - - if (strstart(devname, "host:", &p)) { - return -1; - } - - if (!machine_usb(current_machine)) { - return -1; - } - - p =3D strchr(devname, '.'); - if (!p) - return -1; - bus_num =3D strtoul(devname, NULL, 0); - addr =3D strtoul(p + 1, NULL, 0); - - return usb_device_delete_addr(bus_num, addr); -} - static int usb_parse(const char *cmdline) { int r; @@ -1511,28 +1489,6 @@ static int usb_parse(const char *cmdline) return r; } =20 -void hmp_usb_add(Monitor *mon, const QDict *qdict) -{ - const char *devname =3D qdict_get_str(qdict, "devname"); - - error_report("usb_add is deprecated, please use device_add instead"); - - if (usb_device_add(devname) < 0) { - error_report("could not add USB device '%s'", devname); - } -} - -void hmp_usb_del(Monitor *mon, const QDict *qdict) -{ - const char *devname =3D qdict_get_str(qdict, "devname"); - - error_report("usb_del is deprecated, please use device_del instead"); - - if (usb_device_del(devname) < 0) { - error_report("could not delete USB device '%s'", devname); - } -} - /***********************************************************/ /* machine registration */ =20 --=20 1.8.3.1