[Qemu-commits] [qemu/qemu] 997611: usb: Remove legacy -usbdevice options (host, seria...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 99761176eeaf852537030124c846ddec1981d24f
      
https://github.com/qemu/qemu/commit/99761176eeaf852537030124c846ddec1981d24f
  Author: Thomas Huth <address@hidden>
  Date:   2018-01-26 (Fri, 26 Jan 2018)

  Changed paths:
    M hw/usb/Makefile.objs
    M hw/usb/dev-network.c
    M hw/usb/dev-serial.c
    M hw/usb/dev-storage.c
    R hw/usb/host-legacy.c
    M hw/usb/host-stub.c
    M include/hw/usb.h
    M qemu-options.hx
    M vl.c

  Log Message:
  -----------
  usb: Remove legacy -usbdevice options (host, serial, disk and net)

The option have been marked as deprecated since QEMU 2.10, and so far
nobody complained that the host, serial, disk and net options are urgently
required anymore. So let's now get rid at least of this legacy pile, to
simplify the usb code quite a bit.

This patch removes the usbdevices host, serial, disk and net. These devices
use their own complicated parameter parsing mechanisms, so they are just
ugly to maintain, without real benefit for the users (the users can use the
corresponding "-device" parameters instead which have the same complexity
as the "-usbdevice" devices here).

Note that the other rather simple -usbdevice options (mouse, tablet, etc.)
are not removed yet (the code is really simple here, so it does not hurt
much to keep it), as well as the two devices "braille" and "bt" which are
easier to use with -usbdevice than with -device.

Signed-off-by: Thomas Huth <address@hidden>
Message-id: address@hidden

[kraxel] delete some usb_host_device_open() leftovers.

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 395b95395934785ca86baafd314d0c31b307d16d
      
https://github.com/qemu/qemu/commit/395b95395934785ca86baafd314d0c31b307d16d
  Author: Fam Zheng <address@hidden>
  Date:   2018-01-26 (Fri, 26 Jan 2018)

  Changed paths:
    M hw/scsi/scsi-bus.c
    M hw/usb/dev-storage.c
    M include/hw/scsi/scsi.h

  Log Message:
  -----------
  usb-storage: Fix share-rw option parsing

Because usb-storage creates an internal scsi device, we should propagate
options. We already do so for bootindex etc, but failed to take care of
share-rw. Fix it in an apparent way: add a new parameter to
scsi_bus_legacy_add_drive and pass in s->conf.share_rw.

Cc: address@hidden
Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Darren Kenny <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: cc847bfd16d894fd8c1a2ce25f31772f6cdbbc74
      
https://github.com/qemu/qemu/commit/cc847bfd16d894fd8c1a2ce25f31772f6cdbbc74
  Author: Mao Zhongyi <address@hidden>
  Date:   2018-01-26 (Fri, 26 Jan 2018)

  Changed paths:
    M hw/usb/ccid-card-emulated.c
    M hw/usb/ccid-card-passthru.c
    M hw/usb/ccid.h
    M hw/usb/dev-smartcard-reader.c

  Log Message:
  -----------
  hw/usb/ccid: Make ccid_card_init() take an error parameter

Replace init() of CCIDCardClass with realize, then convert
ccid_card_init(), ccid_card_initfn() and it's callbacks to
take an Error** in ordor to report the error more clearly.

Signed-off-by: Mao Zhongyi <address@hidden>
Signed-off-by: Cao jin <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
[PMD: fixed s->card assignation in ccid_card_realize()]
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: c7516699fc416ed836639dff12115f9d806bfc82
      
https://github.com/qemu/qemu/commit/c7516699fc416ed836639dff12115f9d806bfc82
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2018-01-26 (Fri, 26 Jan 2018)

  Changed paths:
    M hw/usb/dev-smartcard-reader.c

  Log Message:
  -----------
  usb-ccid: inline ccid_card_initfn() in ccid_card_realize()

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 80ae865468bde918363a123aa26c6fc4385023ac
      
https://github.com/qemu/qemu/commit/80ae865468bde918363a123aa26c6fc4385023ac
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2018-01-26 (Fri, 26 Jan 2018)

  Changed paths:
    M hw/usb/ccid-card-emulated.c
    M hw/usb/ccid-card-passthru.c
    M hw/usb/ccid.h
    M hw/usb/dev-smartcard-reader.c

  Log Message:
  -----------
  usb-ccid: convert CCIDCardClass::exitfn() -> unrealize()

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: d45091e449c4202b19bb8996f8e95176c758114b
      
https://github.com/qemu/qemu/commit/d45091e449c4202b19bb8996f8e95176c758114b
  Author: Peter Maydell <address@hidden>
  Date:   2018-01-26 (Fri, 26 Jan 2018)

  Changed paths:
    M hw/scsi/scsi-bus.c
    M hw/usb/Makefile.objs
    M hw/usb/ccid-card-emulated.c
    M hw/usb/ccid-card-passthru.c
    M hw/usb/ccid.h
    M hw/usb/dev-network.c
    M hw/usb/dev-serial.c
    M hw/usb/dev-smartcard-reader.c
    M hw/usb/dev-storage.c
    R hw/usb/host-legacy.c
    M hw/usb/host-stub.c
    M include/hw/scsi/scsi.h
    M include/hw/usb.h
    M qemu-options.hx
    M vl.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/kraxel/tags/usb-20180126-v3-pull-request' into staging

usb: -usbdevice cleanups, storage fix, QOMify ccid.

# gpg: Signature made Fri 26 Jan 2018 08:04:49 GMT
# gpg:                using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <address@hidden>"
# gpg:                 aka "Gerd Hoffmann <address@hidden>"
# gpg:                 aka "Gerd Hoffmann (private) <address@hidden>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/usb-20180126-v3-pull-request:
  usb-ccid: convert CCIDCardClass::exitfn() -> unrealize()
  usb-ccid: inline ccid_card_initfn() in ccid_card_realize()
  hw/usb/ccid: Make ccid_card_init() take an error parameter
  usb-storage: Fix share-rw option parsing
  usb: Remove legacy -usbdevice options (host, serial, disk and net)

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/1867d97b372d...d45091e449c4