Merge remote-tracking branch 'remotes/edgar/tags/edgar/mmio-exec-v2.for-upstream...
commit577caa2672ccde7352fda3ef17e44993de862f0e
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 27 Jun 2017 15:56:55 +0000 (27 16:56 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 27 Jun 2017 15:56:55 +0000 (27 16:56 +0100)
treebd015a0e51086a664671cae9e739b40291b4444f
parent054914f6461ce9d3427af6527ef3e5b07311c86b
parent252b99baeb9e7e86cc0ece8efcaddebf11d284f5
Merge remote-tracking branch 'remotes/edgar/tags/edgar/mmio-exec-v2.for-upstream' into staging

edgar/mmio-exec-v2.for-upstream

# gpg: Signature made Tue 27 Jun 2017 16:22:30 BST
# gpg:                using RSA key 0x29C596780F6BCA83
# gpg: Good signature from "Edgar E. Iglesias (Xilinx key) <edgar.iglesias@xilinx.com>"
# gpg:                 aka "Edgar E. Iglesias <edgar.iglesias@gmail.com>"
# Primary key fingerprint: AC44 FEDC 14F7 F1EB EDBF  4151 29C5 9678 0F6B CA83

* remotes/edgar/tags/edgar/mmio-exec-v2.for-upstream:
  xilinx_spips: allow mmio execution
  exec: allow to get a pointer for some mmio memory region
  introduce mmio_interface
  qdev: add MemoryRegion property
  cputlb: fix the way get_page_addr_code fills the tlb
  cputlb: move get_page_addr_code
  cputlb: cleanup get_page_addr_code to use VICTIM_TLB_HIT

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>