[Qemu-devel] [PULL 0/5] Usb 20180126 v3 patches

Gerd Hoffmann posted 5 patches 6 years, 2 months ago
Failed in applying to current master (apply log)
hw/usb/ccid.h                 |   6 +-
include/hw/scsi/scsi.h        |   1 +
include/hw/usb.h              |   1 -
hw/scsi/scsi-bus.c            |   9 ++-
hw/usb/ccid-card-emulated.c   |  48 +++++++-------
hw/usb/ccid-card-passthru.c   |  13 ++--
hw/usb/dev-network.c          |  26 --------
hw/usb/dev-serial.c           |  30 ---------
hw/usb/dev-smartcard-reader.c |  63 ++++++++----------
hw/usb/dev-storage.c          |  61 +-----------------
hw/usb/host-legacy.c          | 144 ------------------------------------------
hw/usb/host-stub.c            |   6 --
vl.c                          |  15 -----
hw/usb/Makefile.objs          |   2 +-
qemu-options.hx               |  19 ------
15 files changed, 74 insertions(+), 370 deletions(-)
delete mode 100644 hw/usb/host-legacy.c
[Qemu-devel] [PULL 0/5] Usb 20180126 v3 patches
Posted by Gerd Hoffmann 6 years, 2 months ago
The following changes since commit 2077fef91d5eb8e3745a84fabd87a5ee7d2b535d:

  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20180125' into staging (2018-01-25 17:04:47 +0000)

are available in the git repository at:

  git://git.kraxel.org/qemu tags/usb-20180126-v3-pull-request

for you to fetch changes up to 80ae865468bde918363a123aa26c6fc4385023ac:

  usb-ccid: convert CCIDCardClass::exitfn() -> unrealize() (2018-01-26 07:59:33 +0100)

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

----------------------------------------------------------------

Fam Zheng (1):
  usb-storage: Fix share-rw option parsing

Mao Zhongyi (1):
  hw/usb/ccid: Make ccid_card_init() take an error parameter

Philippe Mathieu-Daudé (2):
  usb-ccid: inline ccid_card_initfn() in ccid_card_realize()
  usb-ccid: convert CCIDCardClass::exitfn() -> unrealize()

Thomas Huth (1):
  usb: Remove legacy -usbdevice options (host, serial, disk and net)

 hw/usb/ccid.h                 |   6 +-
 include/hw/scsi/scsi.h        |   1 +
 include/hw/usb.h              |   1 -
 hw/scsi/scsi-bus.c            |   9 ++-
 hw/usb/ccid-card-emulated.c   |  48 +++++++-------
 hw/usb/ccid-card-passthru.c   |  13 ++--
 hw/usb/dev-network.c          |  26 --------
 hw/usb/dev-serial.c           |  30 ---------
 hw/usb/dev-smartcard-reader.c |  63 ++++++++----------
 hw/usb/dev-storage.c          |  61 +-----------------
 hw/usb/host-legacy.c          | 144 ------------------------------------------
 hw/usb/host-stub.c            |   6 --
 vl.c                          |  15 -----
 hw/usb/Makefile.objs          |   2 +-
 qemu-options.hx               |  19 ------
 15 files changed, 74 insertions(+), 370 deletions(-)
 delete mode 100644 hw/usb/host-legacy.c

-- 
2.9.3


Re: [Qemu-devel] [PULL 0/5] Usb 20180126 v3 patches
Posted by Peter Maydell 6 years, 2 months ago
On 26 January 2018 at 08:05, Gerd Hoffmann <kraxel@redhat.com> wrote:
> The following changes since commit 2077fef91d5eb8e3745a84fabd87a5ee7d2b535d:
>
>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20180125' into staging (2018-01-25 17:04:47 +0000)
>
> are available in the git repository at:
>
>   git://git.kraxel.org/qemu tags/usb-20180126-v3-pull-request
>
> for you to fetch changes up to 80ae865468bde918363a123aa26c6fc4385023ac:
>
>   usb-ccid: convert CCIDCardClass::exitfn() -> unrealize() (2018-01-26 07:59:33 +0100)
>
> ----------------------------------------------------------------
> usb: -usbdevice cleanups, storage fix, QOMify ccid.
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM