[Qemu-commits] [qemu/qemu] ed3d80: cuda: fix off-by-one error in SET_TIME command

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: ed3d807b0a577c4f825b25f3281fe54ce89202db
      
https://github.com/qemu/qemu/commit/ed3d807b0a577c4f825b25f3281fe54ce89202db
  Author: Aurelien Jarno <address@hidden>
  Date:   2016-04-19 (Tue, 19 Apr 2016)

  Changed paths:
    M hw/misc/macio/cuda.c

  Log Message:
  -----------
  cuda: fix off-by-one error in SET_TIME command

With the new framework the cuda_cmd_set_time command directly receive
the data, without the command byte. Therefore the time is stored at
in_data[0], not at in_data[1].

This fixes the "hwclock --systohc" command in a guest.

Cc: Hervé Poussineau <address@hidden>
Cc: David Gibson <address@hidden>
Signed-off-by: Aurelien Jarno <address@hidden>
Reviewed-by: Hervé Poussineau <address@hidden>
[this fixes a regression introduced by e647317 "cuda: port SET_TIME
 command to new framework"]
Signed-off-by: David Gibson <address@hidden>


  Commit: bb97bfd90194eb3c6995b446643af4818a142805
      
https://github.com/qemu/qemu/commit/bb97bfd90194eb3c6995b446643af4818a142805
  Author: Peter Maydell <address@hidden>
  Date:   2016-04-19 (Tue, 19 Apr 2016)

  Changed paths:
    M hw/misc/macio/cuda.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.6-20160419' into 
staging

ppc patch queueu for 2016-04-19

A single fix for a regression since 2.5.  This should be the last ppc
pull request for 2.6.

# gpg: Signature made Tue 19 Apr 2016 02:48:30 BST using RSA key ID 20D9B392
# gpg: Good signature from "David Gibson <address@hidden>"
# gpg:                 aka "David Gibson (Red Hat) <address@hidden>"
# gpg:                 aka "David Gibson (ozlabs.org) <address@hidden>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392

* remotes/dgibson/tags/ppc-for-2.6-20160419:
  cuda: fix off-by-one error in SET_TIME command

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


Compare: https://github.com/qemu/qemu/compare/5eb0b194e9b0...bb97bfd90194