[Qemu-devel] [PULL 0/1] ppc-for-2.6 queue 20160419

[Qemu-devel] [PULL 0/1] ppc-for-2.6 queue 20160419

[David Gibson]

The following changes since commit 92b674b62a1aec734280c9019cfb3b3745044b66:

  Merge remote-tracking branch 'remotes/afaerber/tags/qom-cpu-for-peter' into staging (2016-04-18 17:42:59 +0100)

are available in the git repository at:

  git://github.com/dgibson/qemu.git tags/ppc-for-2.6-20160419

for you to fetch changes up to ed3d807b0a577c4f825b25f3281fe54ce89202db:

  cuda: fix off-by-one error in SET_TIME command (2016-04-19 11:39:23 +1000)

----------------------------------------------------------------
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.

----------------------------------------------------------------
Aurelien Jarno (1):
      cuda: fix off-by-one error in SET_TIME command

 hw/misc/macio/cuda.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[Qemu-devel] [PULL 1/1] cuda: fix off-by-one error in SET_TIME command

[David Gibson]

From: Aurelien Jarno <aurelien@aurel32.net>

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 <hpoussin@reactos.org>
Cc: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>
[this fixes a regression introduced by e647317 "cuda: port SET_TIME
 command to new framework"]
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 hw/misc/macio/cuda.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c
index c7472aa..f15f301 100644
--- a/hw/misc/macio/cuda.c
+++ b/hw/misc/macio/cuda.c
@@ -685,8 +685,8 @@ static bool cuda_cmd_set_time(CUDAState *s,
         return false;
     }
 
-    ti = (((uint32_t)in_data[1]) << 24) + (((uint32_t)in_data[2]) << 16)
-         + (((uint32_t)in_data[3]) << 8) + in_data[4];
+    ti = (((uint32_t)in_data[0]) << 24) + (((uint32_t)in_data[1]) << 16)
+         + (((uint32_t)in_data[2]) << 8) + in_data[3];
     s->tick_offset = ti - (qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL)
                            / NANOSECONDS_PER_SECOND);
     return true;
-- 
2.5.5

Re: [Qemu-devel] [PULL 0/1] ppc-for-2.6 queue 20160419

[Peter Maydell]

On 19 April 2016 at 02:49, David Gibson <david@gibson.dropbear.id.au> wrote:
> The following changes since commit 92b674b62a1aec734280c9019cfb3b3745044b66:
>
>   Merge remote-tracking branch 'remotes/afaerber/tags/qom-cpu-for-peter' into staging (2016-04-18 17:42:59 +0100)
>
> are available in the git repository at:
>
>   git://github.com/dgibson/qemu.git tags/ppc-for-2.6-20160419
>
> for you to fetch changes up to ed3d807b0a577c4f825b25f3281fe54ce89202db:
>
>   cuda: fix off-by-one error in SET_TIME command (2016-04-19 11:39:23 +1000)
>
> ----------------------------------------------------------------
> 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.
>
> ----------------------------------------------------------------
> Aurelien Jarno (1):
>       cuda: fix off-by-one error in SET_TIME command

Applied, thanks.

-- PMM