[Qemu-commits] [qemu/qemu] 7f0d76: mac_dbdma: always initialize channel field in DBDM...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 7f0d763ce60fd0563cb71c85ae0f86ee71b7edcc
      
https://github.com/qemu/qemu/commit/7f0d763ce60fd0563cb71c85ae0f86ee71b7edcc
  Author: Hervé Poussineau <address@hidden>
  Date:   2015-11-30 (Mon, 30 Nov 2015)

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

  Log Message:
  -----------
  mac_dbdma: always initialize channel field in DBDMA_channel

dbdma_from_ch() uses channel field to return the right DBDMA object.
Previous code was working if guest OS was only using registered DMA channels.
However, it lead to QEMU crashes if guest OS was using unregistered DMA 
channels.

Signed-off-by: Hervé Poussineau <address@hidden>
Reviewed-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: 9b7a70e63e7b59f2444aff9399f9b482f55b8f9e
      
https://github.com/qemu/qemu/commit/9b7a70e63e7b59f2444aff9399f9b482f55b8f9e
  Author: Thomas Huth <address@hidden>
  Date:   2015-11-30 (Mon, 30 Nov 2015)

  Changed paths:
    M hw/ppc/spapr.c

  Log Message:
  -----------
  hw/ppc/spapr: Remove duplicated "pseries" alias

The "pseries" alias is currently set twice, one time for the
pseries-2.4 machine and one time for the "pseries-2.5" machine.
To avoid confusion with the alias, let's remove the one from
the older machine class. And while we're at it, also remove
the "is_default = 0" there since the is_default variable
should be set to zero by default already.

Signed-off-by: Thomas Huth <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: e2a176dfda32f5cf80703c2921a19fe75850c38c
      
https://github.com/qemu/qemu/commit/e2a176dfda32f5cf80703c2921a19fe75850c38c
  Author: Peter Maydell <address@hidden>
  Date:   2015-11-30 (Mon, 30 Nov 2015)

  Changed paths:
    M hw/ppc/ppc405_boards.c

  Log Message:
  -----------
  hw/ppc/ppc405_boards: Fix infinite recursion by converting taihu_cpld from 
old_mmio

The taihu_cpld_writel() function had an obvious typo that meant that
if it was ever called it would go into an infinite recursion. Newer
versions of clang will detect and warn about this:
  hw/ppc/ppc405_boards.c:481:1: warning: all paths through this function will 
call itself [-Winfinite-recursion]

Fix this by converting taihu_cpld from the legacy old_mmio accessors
to new-style ones, with an impl {} declaration to cause the core
memory code to do the splitting of 16 bit and 32 bit accesses into
multiple 8-bit accesses.

Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: dbdc13a1ac0bfaa9a2d7069e9e6509721ed795ee
      
https://github.com/qemu/qemu/commit/dbdc13a1ac0bfaa9a2d7069e9e6509721ed795ee
  Author: Madhavan Srinivasan <address@hidden>
  Date:   2015-11-30 (Mon, 30 Nov 2015)

  Changed paths:
    M target-ppc/cpu.h
    M target-ppc/dfp_helper.c

  Log Message:
  -----------
  target-ppc: Move the FPSCR bit update macros to cpu.h

Move the FPSCR bit update macros defined in dfp_helper
to cpu.h. This way, fpu_helper functions can also use them

Signed-off-by: Madhavan Srinivasan <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: 7624789234cd63b671bce1b49b93b0b1c00ea407
      
https://github.com/qemu/qemu/commit/7624789234cd63b671bce1b49b93b0b1c00ea407
  Author: Madhavan Srinivasan <address@hidden>
  Date:   2015-11-30 (Mon, 30 Nov 2015)

  Changed paths:
    M target-ppc/fpu_helper.c

  Log Message:
  -----------
  target-ppc/fpu_helper: fix FPSCR_FX bit shift operation

Currently in TCG mode, updating floating exception
summary bit (FPSCR_FX) in fpscr also updates
the upper 32bits of fpscr with all 1s.
Modify the bit shift operation statement to use
1ULL instead.

Signed-off-by: Madhavan Srinivasan <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: a2485925f76d01795f041fd63663d8582139fda4
      
https://github.com/qemu/qemu/commit/a2485925f76d01795f041fd63663d8582139fda4
  Author: Peter Maydell <address@hidden>
  Date:   2015-11-30 (Mon, 30 Nov 2015)

  Changed paths:
    M hw/misc/macio/mac_dbdma.c
    M hw/ppc/ppc405_boards.c
    M hw/ppc/spapr.c
    M target-ppc/cpu.h
    M target-ppc/dfp_helper.c
    M target-ppc/fpu_helper.c

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

ppc patch queue for qemu-2.5 20151130

target-ppc and related bugfix patches for qemu-2.5

I don't have the facilities to test the Macintosh and BookE related
patches.  I've sanity checked them (inspection + make check), but I'm
otherwise relying on the submitters.

# gpg: Signature made Mon 30 Nov 2015 08:42:01 GMT 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.5-20151130:
  target-ppc/fpu_helper: fix FPSCR_FX bit shift operation
  target-ppc: Move the FPSCR bit update macros to cpu.h
  hw/ppc/ppc405_boards: Fix infinite recursion by converting taihu_cpld from 
old_mmio
  hw/ppc/spapr: Remove duplicated "pseries" alias
  mac_dbdma: always initialize channel field in DBDMA_channel

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


Compare: https://github.com/qemu/qemu/compare/680617ed43a2...a2485925f76d