[Qemu-commits] [qemu/qemu] 0ab6d1: usb: Fix compilation for Windows

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 0ab6d12ffde7e9235a1b9d79437f5bdda5d80cf1
      
https://github.com/qemu/qemu/commit/0ab6d12ffde7e9235a1b9d79437f5bdda5d80cf1
  Author: Stefan Weil <address@hidden>
  Date:   2016-03-18 (Fri, 18 Mar 2016)

  Changed paths:
    M hw/usb/redirect.c

  Log Message:
  -----------
  usb: Fix compilation for Windows

Mingw-w64 does not provide sys/ioctl.h and Linux builds don't need it,
so remove that include statement.

ERROR is defined by wingdi.h (included via windows.h). Undefine it before
it is redefined to avoid a compiler warning / error.

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


  Commit: 182b391e797508deba9704cf580325e99260d8c8
      
https://github.com/qemu/qemu/commit/182b391e797508deba9704cf580325e99260d8c8
  Author: Peter Xu <address@hidden>
  Date:   2016-03-18 (Fri, 18 Mar 2016)

  Changed paths:
    M hw/usb/hcd-xhci.c

  Log Message:
  -----------
  usb: fix unbounded stack warning for xhci_dma_write_u32s

All the callers for xhci_dma_write_u32s() are using mostly 5 * uint32_t
in len. To avoid unbound stack warning for the function, make it
statically allocated, and assert when it's not big enough in the
future.

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


  Commit: e3d60bc7c6f26b889686ab91f7062f6a79df2494
      
https://github.com/qemu/qemu/commit/e3d60bc7c6f26b889686ab91f7062f6a79df2494
  Author: Peter Xu <address@hidden>
  Date:   2016-03-18 (Fri, 18 Mar 2016)

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

  Log Message:
  -----------
  usb: fix unbound stack usage for usb_mtp_add_str

Use heap instead of stack.

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


  Commit: f34d57d359bb539c482a69f2732bf05787127ed4
      
https://github.com/qemu/qemu/commit/f34d57d359bb539c482a69f2732bf05787127ed4
  Author: Peter Xu <address@hidden>
  Date:   2016-03-18 (Fri, 18 Mar 2016)

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

  Log Message:
  -----------
  usb: fix unbound stack warning for inotify_watchfn

Signed-off-by: Peter Xu <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 983bff3530782d51c46c8d7c0e17e2a9dfe5fb77
      
https://github.com/qemu/qemu/commit/983bff3530782d51c46c8d7c0e17e2a9dfe5fb77
  Author: Matthew Fortune <address@hidden>
  Date:   2016-03-18 (Fri, 18 Mar 2016)

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

  Log Message:
  -----------
  hw/usb/dev-mtp: Guard inotify usage with CONFIG_INOTIFY1

inotify_init1 usage was guarded by a check for linux but does not
exist on older distributions like CentOS 5 resulting in build
failures.

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


  Commit: dff0367cf66f489aa772320fa2937a8cac1ca30d
      
https://github.com/qemu/qemu/commit/dff0367cf66f489aa772320fa2937a8cac1ca30d
  Author: Prasad J Pandit <address@hidden>
  Date:   2016-03-18 (Fri, 18 Mar 2016)

  Changed paths:
    M hw/usb/hcd-ehci.c

  Log Message:
  -----------
  usb: ehci: add capability mmio write function

USB Ehci emulation supports host controller capability registers.
But its mmio '.write' function was missing, which lead to a null
pointer dereference issue. Add a do nothing 'ehci_caps_write'
definition to avoid it; Do nothing because capability registers
are Read Only(RO).

Reported-by: Zuozhi Fzz <address@hidden>
Signed-off-by: Prasad J Pandit <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: ac0d25e843bdad441db2a26f78898f533bf91bb5
      
https://github.com/qemu/qemu/commit/ac0d25e843bdad441db2a26f78898f533bf91bb5
  Author: Peter Maydell <address@hidden>
  Date:   2016-03-22 (Tue, 22 Mar 2016)

  Changed paths:
    M hw/usb/dev-mtp.c
    M hw/usb/hcd-ehci.c
    M hw/usb/hcd-xhci.c
    M hw/usb/redirect.c

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

usb: bugfix collection.

# gpg: Signature made Mon 21 Mar 2016 11:07:39 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <address@hidden>"
# gpg:                 aka "Gerd Hoffmann <address@hidden>"
# gpg:                 aka "Gerd Hoffmann (private) <address@hidden>"

* remotes/kraxel/tags/pull-usb-20160321-1:
  usb: ehci: add capability mmio write function
  hw/usb/dev-mtp: Guard inotify usage with CONFIG_INOTIFY1
  usb: fix unbound stack warning for inotify_watchfn
  usb: fix unbound stack usage for usb_mtp_add_str
  usb: fix unbounded stack warning for xhci_dma_write_u32s
  usb: Fix compilation for Windows

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


Compare: https://github.com/qemu/qemu/compare/9fa570d57e44...ac0d25e843bd