The following changes since commit 834a336eb911db8a8ca00e760ee6a85faca19414:

  Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2018-01-24 19:24:26 +0000)

are available in the git repository at:

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

for you to fetch changes up to 2aef004483e34a42021dc98a3646971dc152cb1b:

  usb-storage: Fix share-rw option parsing (2018-01-25 09:50:30 +0100)

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

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

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

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

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

 hw/usb/ccid.h                 |   2 +-
 include/hw/scsi/scsi.h        |   1 +
 hw/scsi/scsi-bus.c            |   9 ++-
 hw/usb/ccid-card-emulated.c   |  44 ++++++-------
 hw/usb/ccid-card-passthru.c   |  12 ++--
 hw/usb/dev-network.c          |  26 --------
 hw/usb/dev-serial.c           |  30 ---------
 hw/usb/dev-smartcard-reader.c |  34 +++++-----
 hw/usb/dev-storage.c          |  61 +-----------------
 hw/usb/host-legacy.c          | 144 ------------------------------------------
 hw/usb/Makefile.objs          |   2 +-
 qemu-options.hx               |  19 ------
 12 files changed, 60 insertions(+), 324 deletions(-)
 delete mode 100644 hw/usb/host-legacy.c

-- 
2.9.3

On 25 January 2018 at 09:16, Gerd Hoffmann <kraxel@redhat.com> wrote:
> The following changes since commit 834a336eb911db8a8ca00e760ee6a85faca19414:
>
>   Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2018-01-24 19:24:26 +0000)
>
> are available in the git repository at:
>
>   git://git.kraxel.org/qemu tags/usb-20180125-pull-request
>
> for you to fetch changes up to 2aef004483e34a42021dc98a3646971dc152cb1b:
>
>   usb-storage: Fix share-rw option parsing (2018-01-25 09:50:30 +0100)
>
> ----------------------------------------------------------------
> usb: -usbdevice cleanups, storage fix, ccid cleanup.
>
> ----------------------------------------------------------------
>
> Fam Zheng (1):
>   usb-storage: Fix share-rw option parsing
>
> Mao Zhongyi (1):
>   hw/usb/ccid: Make ccid_card_init() take an error parameter
>
> Thomas Huth (1):
>   usb: Remove legacy -usbdevice options (host, serial, disk and net)

Hi. This fails to build on FreeBSD:

  LINK    arm-softmmu/qemu-system-arm
../vl.o: In function `usb_device_add':
/root/qemu/vl.c:1471: undefined reference to `usb_host_device_open'

There's still a call to that function in vl.c inside an
ifndef CONFIG_LINUX...

If we can really remove the function we should get rid of the
stub in hw/usb/host-stub.c and the prototype in usb.h too.

thanks
-- PMM

On Thu, Jan 25, 2018 at 03:28:38PM +0000, Peter Maydell wrote:
> On 25 January 2018 at 09:16, Gerd Hoffmann <kraxel@redhat.com> wrote:
> > Thomas Huth (1):
> >   usb: Remove legacy -usbdevice options (host, serial, disk and net)
> 
> Hi. This fails to build on FreeBSD:
> 
>   LINK    arm-softmmu/qemu-system-arm
> ../vl.o: In function `usb_device_add':
> /root/qemu/vl.c:1471: undefined reference to `usb_host_device_open'
> 
> There's still a call to that function in vl.c inside an
> ifndef CONFIG_LINUX...
> 
> If we can really remove the function we should get rid of the
> stub in hw/usb/host-stub.c and the prototype in usb.h too.

Indeed.  I'll fix it up.

The lines in vl.c dead code anyway since we switched to libusb and
dropped the linux/bsd specific usb-host code, so it all can simply be
deleted.

cheers,
  Gerd