]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/vivier/tags/m68k-staging-pull-request' into...
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 17 May 2019 09:28:23 +0000 (10:28 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 17 May 2019 09:28:23 +0000 (10:28 +0100)
commitb0f9690e78827d55a508c73432c73f057f59fd41
treeedd913c2d05dd5d2113705e320c0c6c05ceee142
parentd8276573da58e8ce78dab8c46dd660efd664bcb7
parent60d3d0cfeb1658d2827d6a4f0df27252bb36baba
Merge remote-tracking branch 'remotes/vivier/tags/m68k-staging-pull-request' into staging

code cleanup, switch to transaction_failed hook

# gpg: Signature made Thu 16 May 2019 23:33:00 BST
# gpg:                using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier/tags/m68k-staging-pull-request:
  target/m68k: Optimize rotate_x() using extract_i32()
  target/m68k: Fix a tcg_temp leak
  target/m68k: Reduce the l1 TCGLabel scope
  target/m68k: Switch to transaction_failed hook
  target/m68k: In get_physical_address() check for memory access failures
  target/m68k: In dump_address_map() check for memory access failures

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# Conflicts:
# target/m68k/cpu.h
target/m68k/cpu.c
target/m68k/cpu.h
target/m68k/helper.c
target/m68k/op_helper.c