From: Peter Maydell Date: Thu, 19 Nov 2015 15:56:50 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20151119' into... X-Git-Tag: v2.5.0-rc1~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c601a244a49f4e0be2539cbc5ffd288727cd4e89;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20151119' into staging target-arm queue: * add missing condexec updates when emulating architectural breakpoints and coprocessor access checks in Thumb translation (could in theory cause problems when these happened inside a Thumb IT block and an exception was taken) * arm_gic: correctly restore nested IRQ priority # gpg: Signature made Thu 19 Nov 2015 13:29:37 GMT using RSA key ID 14360CDE # gpg: Good signature from "Peter Maydell " # gpg: aka "Peter Maydell " # gpg: aka "Peter Maydell " * remotes/pmaydell/tags/pull-target-arm-20151119: target-arm: Update condexec before arch BP check in AA32 translation target-arm: Update condexec before CP access check in AA32 translation hw/arm_gic: Correctly restore nested irq priority Signed-off-by: Peter Maydell --- c601a244a49f4e0be2539cbc5ffd288727cd4e89