[Qemu-commits] [qemu/qemu] e058fa: usb-host: add special case for bus+addr

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: e058fa2dd599ccc780d334558be9c1d155222b80
      
https://github.com/qemu/qemu/commit/e058fa2dd599ccc780d334558be9c1d155222b80
  Author: Gerd Hoffmann <address@hidden>
  Date:   2016-06-13 (Mon, 13 Jun 2016)

  Changed paths:
    M hw/usb/host-libusb.c

  Log Message:
  -----------
  usb-host: add special case for bus+addr

This patch changes usb-host behavior in case we hostbus= and hostaddr=
properties are used to identify the usb device in question.  Instead of
adding the device to the hotplug watchlist we try to open directly using
the given bus number and device address.

Putting a device specified by hostaddr to the hotplug watchlist isn't
a great idea as the address isn't a fixed property.  It changes every
time the device is plugged in.  So considering this case as "use the
device at bus:addr _now_" is more sane.  Also usb-host will throw errors
in case it can't initialize the host device.

Note: For devices on the hotplug watchlist (hostport or vendorid or
productid specified) qemu continues to ignore errors and keeps
monitoring the usb bus to see if the device eventually shows up.

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


  Commit: ec9125bc0ef39bca89854df1bf568c78bf84050d
      
https://github.com/qemu/qemu/commit/ec9125bc0ef39bca89854df1bf568c78bf84050d
  Author: Peter Maydell <address@hidden>
  Date:   2016-06-13 (Mon, 13 Jun 2016)

  Changed paths:
    M hw/usb/dev-network.c

  Log Message:
  -----------
  hw/usb/dev-network.c: Use ldl_le_p() and stl_le_p()

Use stl_le_p() and ldl_le_p() to read and write data from
buffers, rather than using pointer casts and cpu_to_le32()
for writes and le32_to_cpup() for reads. This:
 * avoids lots of casts
 * works even if the buffer isn't as aligned as the host would like
 * avoids using the *_to_cpup() functions which we want to get rid of

Note that there may still be some places where a pointer from the
guest is cast to a pointer to a host structure; these would also
have to be changed for the device to work on a host CPU which
enforces alignment restrictions.

Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: c92cfba822245c42fec611f310ed74c1821be3d2
      
https://github.com/qemu/qemu/commit/c92cfba822245c42fec611f310ed74c1821be3d2
  Author: Eduardo Habkost <address@hidden>
  Date:   2016-06-13 (Mon, 13 Jun 2016)

  Changed paths:
    M hw/arm/pxa2xx.c

  Log Message:
  -----------
  pxa2xx: Unconditionally enable USB controller

Simplify initialization logic by removing the usb_enabled()
check. The USB controller is part of the SoC, so it doesn't make
sense to create a system where it is not present.

Cc: Peter Maydell <address@hidden>
Cc: Andrzej Zaborowski <address@hidden>
Cc: address@hidden,
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 4bcbe0b63661b1df8e78d58270574d818b387d2c
      
https://github.com/qemu/qemu/commit/4bcbe0b63661b1df8e78d58270574d818b387d2c
  Author: Eduardo Habkost <address@hidden>
  Date:   2016-06-13 (Mon, 13 Jun 2016)

  Changed paths:
    M hw/arm/nseries.c
    M hw/arm/realview.c
    M hw/arm/versatilepb.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M hw/ppc/mac_oldworld.c
    M hw/ppc/prep.c
    M include/sysemu/sysemu.h
    M vl.c

  Log Message:
  -----------
  vl: Eliminate usb_enabled()

This wrapper for machine_usb(current_machine) is not necessary,
replace all usages of usb_enabled() with machine_usb().

Cc: Peter Maydell <address@hidden>
Cc: "Michael S. Tsirkin" <address@hidden>
Cc: Alexander Graf <address@hidden>
Cc: address@hidden
Cc: address@hidden
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 2c96c379ac7a22424c25d65b73e81b860f902868
      
https://github.com/qemu/qemu/commit/2c96c379ac7a22424c25d65b73e81b860f902868
  Author: Peter Maydell <address@hidden>
  Date:   2016-06-13 (Mon, 13 Jun 2016)

  Changed paths:
    M hw/arm/nseries.c
    M hw/arm/pxa2xx.c
    M hw/arm/realview.c
    M hw/arm/versatilepb.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M hw/ppc/mac_oldworld.c
    M hw/ppc/prep.c
    M hw/usb/dev-network.c
    M hw/usb/host-libusb.c
    M include/sysemu/sysemu.h
    M vl.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20160613-1' into 
staging

usb: misc fixes.

# gpg: Signature made Mon 13 Jun 2016 14:09:15 BST
# 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/pull-usb-20160613-1:
  vl: Eliminate usb_enabled()
  pxa2xx: Unconditionally enable USB controller
  hw/usb/dev-network.c: Use ldl_le_p() and stl_le_p()
  usb-host: add special case for bus+addr

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


Compare: https://github.com/qemu/qemu/compare/55e5c3a2d243...2c96c379ac7a