[Qemu-commits] [qemu/qemu] e4256c: target/arm: fix TCG temp leak in aarch64 rev16

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: e4256c3cbf7eefebc0bc6e1f472c47c6dd20b996
      
https://github.com/qemu/qemu/commit/e4256c3cbf7eefebc0bc6e1f472c47c6dd20b996
  Author: Emilio G. Cota <address@hidden>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M target/arm/translate-a64.c

  Log Message:
  -----------
  target/arm: fix TCG temp leak in aarch64 rev16

Fix a TCG temporary leak in the new aarch64 rev16 handling.

Signed-off-by: Emilio G. Cota <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>


  Commit: eda40cc1686162dcd92a97debcbb0df74269651f
      
https://github.com/qemu/qemu/commit/eda40cc1686162dcd92a97debcbb0df74269651f
  Author: Peter Maydell <address@hidden>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M hw/arm/fsl-imx25.c
    M hw/arm/fsl-imx31.c
    M hw/arm/fsl-imx6.c

  Log Message:
  -----------
  fsl_imx*: Migrate ROM contents

The fsl-imx* boards accidentally forgot to register the ROM memory
regions for migration.  This used to require a manual step of calling
vmstate_register_ram(), but following commits
1cfe48c1ce21..b08199c6fbea194 we can use memory_region_init_rom() to
have it do the migration for us.

This is a migration break, but the migration code currently does not
handle the case of having two RAM regions which were not registered
for migration, and so prior to this commit a migration load would
always fail with:
  "qemu-system-arm: Length mismatch: 0x4000 in != 0x18000: Invalid argument"

NB: migration appears at this point to be broken for this board
anyway -- it succeeds but the destination hangs; probably some
device in the system does not yet support migration.

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


  Commit: 3d75007e017b62f2165b8c0166f0e4984bc1640d
      
https://github.com/qemu/qemu/commit/3d75007e017b62f2165b8c0166f0e4984bc1640d
  Author: Peter Maydell <address@hidden>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M hw/arm/mps2.c

  Log Message:
  -----------
  mps2: Correctly set parent bus for SCC device

A cut-and-paste error meant that instead of setting the
qdev parent bus for the SCC device we were setting it
twice for the ARMv7M container device. Fix this bug.

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


  Commit: b2d1b0507d1b80f23da12dd8aab56944fe380a09
      
https://github.com/qemu/qemu/commit/b2d1b0507d1b80f23da12dd8aab56944fe380a09
  Author: Peter Maydell <address@hidden>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M hw/arm/integratorcp.c

  Log Message:
  -----------
  integratorcp: Don't migrate flash using vmstate_register_ram_global()

Instead of migrating the flash by creating the memory region
with memory_region_init_ram_nomigrate() and then calling
vmstate_register_ram_global(), just use memory_region_init_ram(),
which now handles migration registration automatically.

This is a migration compatibility break for the integratorcp
board, because the RAM region's migration name changes to
include the device path. This is OK because we don't guarantee
migration compatibility for this board.

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


  Commit: b5a74cd81d76cb467552f38f2b39520d07c65ea2
      
https://github.com/qemu/qemu/commit/b5a74cd81d76cb467552f38f2b39520d07c65ea2
  Author: Peter Maydell <address@hidden>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M hw/arm/fsl-imx25.c
    M hw/arm/fsl-imx31.c
    M hw/arm/fsl-imx6.c
    M hw/arm/integratorcp.c
    M hw/arm/mps2.c
    M target/arm/translate-a64.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20170724' 
into staging

target-arm queue:
 * fix a TCG temporary leak in aarch64 rev16
 * fsl_imx*: migrate the ROM contents
 * integratorcp: don't use vmstate_register_ram_global for flash
 * mps2: Correctly set parent bus for SCC device

# gpg: Signature made Mon 24 Jul 2017 18:05:06 BST
# gpg:                using RSA key 0x3C2525ED14360CDE
# gpg: Good signature from "Peter Maydell <address@hidden>"
# gpg:                 aka "Peter Maydell <address@hidden>"
# gpg:                 aka "Peter Maydell <address@hidden>"
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE

* remotes/pmaydell/tags/pull-target-arm-20170724:
  integratorcp: Don't migrate flash using vmstate_register_ram_global()
  mps2: Correctly set parent bus for SCC device
  fsl_imx*: Migrate ROM contents
  target/arm: fix TCG temp leak in aarch64 rev16

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


Compare: https://github.com/qemu/qemu/compare/50104f5ac537...b5a74cd81d76