Re: [Qemu-devel] [PATCH v2 for-2.12] hmp-commands: Remove the deprecated usb_add and usb_del

[Dr. David Alan Gilbert]

* Thomas Huth (address@hidden) wrote:
> 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 <address@hidden>
> Signed-off-by: Thomas Huth <address@hidden>

Queued for HMP

> ---
>  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
>  
>      {
> -        .name       = "usb_add",
> -        .args_type  = "devname:s",
> -        .params     = "device",
> -        .help       = "add USB device (e.g. 'host:bus.addr' or 
> 'host:vendor_id:product_id')",
> -        .cmd        = hmp_usb_add,
> -    },
> -
> -STEXI
> address@hidden usb_add @var{devname}
> address@hidden usb_add
> -Add the USB device @var{devname}. This command is deprecated, please
> -use @code{device_add} instead. For details of available devices see
> address@hidden
> -ETEXI
> -
> -    {
> -        .name       = "usb_del",
> -        .args_type  = "devname:s",
> -        .params     = "device",
> -        .help       = "remove USB device 'bus.addr'",
> -        .cmd        = hmp_usb_del,
> -    },
> -
> -STEXI
> address@hidden usb_del @var{devname}
> address@hidden 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       = "device_add",
>          .args_type  = "device:O",
>          .params     = "driver[,prop=value][,...]",
> 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;
>  }
>  
> -int usb_device_delete_addr(int busnr, int addr)
> -{
> -    USBBus *bus;
> -    USBPort *port;
> -    USBDevice *dev;
> -
> -    bus = usb_bus_find(busnr);
> -    if (!bus)
> -        return -1;
> -
> -    QTAILQ_FOREACH(port, &bus->used, next) {
> -        if (port->dev->addr == addr)
> -            break;
> -    }
> -    if (!port)
> -        return -1;
> -    dev = port->dev;
> -
> -    object_unparent(OBJECT(dev));
> -    return 0;
> -}
> -
>  static const char *usb_speed(unsigned int speed)
>  {
>      static const char *txt[] = {
> 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);
>  
>  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];
>  
>  extern Chardev *parallel_hds[MAX_PARALLEL_PORTS];
>  
> -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);
>  
>  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 
> ``netdev_add'' command.
>  
>  The ``host_net_remove'' command is replaced by the ``netdev_del'' command.
>  
> address@hidden usb_add (since 2.10.0)
> -
> -The ``usb_add'' command is replaced by the ``device_add'' command.
> -
> address@hidden usb_del (since 2.10.0)
> -
> -The ``usb_del'' command is replaced by the ``device_del'' command.
> -
>  @section System emulator devices
>  
>  @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;
>  }
>  
> -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 = strchr(devname, '.');
> -    if (!p)
> -        return -1;
> -    bus_num = strtoul(devname, NULL, 0);
> -    addr = 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;
>  }
>  
> -void hmp_usb_add(Monitor *mon, const QDict *qdict)
> -{
> -    const char *devname = 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 = 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 */
>  
> -- 
> 1.8.3.1
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK