[Qemu-commits] [qemu/qemu] ff326f: usb-hid: Move descriptor decision to usb-hid initf...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: ff326ffaebe6ee9c888acfeaf784fdea68522819
      
https://github.com/qemu/qemu/commit/ff326ffaebe6ee9c888acfeaf784fdea68522819
  Author: Jan Vesely <address@hidden>
  Date:   2014-10-15 (Wed, 15 Oct 2014)

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

  Log Message:
  -----------
  usb-hid: Move descriptor decision to usb-hid initfn

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


  Commit: 58e4fee24aeb3c8763fab34a8ced1a87932632ec
      
https://github.com/qemu/qemu/commit/58e4fee24aeb3c8763fab34a8ced1a87932632ec
  Author: Jan Vesely <address@hidden>
  Date:   2014-10-15 (Wed, 15 Oct 2014)

  Changed paths:
    M hw/usb/dev-hid.c
    M include/hw/i386/pc.h

  Log Message:
  -----------
  usb-hid: Add high speed mouse configuration

Signed-off-by: Jan Vesely <address@hidden>

[ kraxel: fixup compat property to apply to 2.1 & older ]

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


  Commit: b13ce07688b0727814b6609a912651242ee1a8f1
      
https://github.com/qemu/qemu/commit/b13ce07688b0727814b6609a912651242ee1a8f1
  Author: Jan Vesely <address@hidden>
  Date:   2014-10-15 (Wed, 15 Oct 2014)

  Changed paths:
    M hw/usb/dev-hid.c
    M include/hw/i386/pc.h

  Log Message:
  -----------
  usb-hid: Add high speed keyboard configuration

Signed-off-by: Jan Vesely <address@hidden>

[ kraxel: fixup compat property to apply to 2.1 & older ]

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


  Commit: ac20e1bb0e77cdf79c6e3f90ff910a46d8ca04c9
      
https://github.com/qemu/qemu/commit/ac20e1bb0e77cdf79c6e3f90ff910a46d8ca04c9
  Author: Gerd Hoffmann <address@hidden>
  Date:   2014-10-15 (Wed, 15 Oct 2014)

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

  Log Message:
  -----------
  xhci: remove dead code

Reported-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 895b810c1220fff7fb5cca5c428b881b6e30f0ac
      
https://github.com/qemu/qemu/commit/895b810c1220fff7fb5cca5c428b881b6e30f0ac
  Author: Peter Maydell <address@hidden>
  Date:   2014-10-22 (Wed, 22 Oct 2014)

  Changed paths:
    M hw/usb/dev-hid.c
    M hw/usb/hcd-xhci.c
    M include/hw/i386/pc.h

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

usb: add high speed mouse & keyboard configuration

* remotes/kraxel/tags/pull-usb-20141015-2:
  xhci: remove dead code
  usb-hid: Add high speed keyboard configuration
  usb-hid: Add high speed mouse configuration
  usb-hid: Move descriptor decision to usb-hid initfn

Conflicts:
        include/hw/i386/pc.h
[Fixed trivial merge conflict in the pc-2.1 property list]
Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/19f377299518...895b810c1220