From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 16 Jan 2017 18:23:02 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/stsquad/tags/pull-tcg-common-tlb-reset-20170113... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a8c611e1133f97c979922f41103f79309339dc27;p=qemu.git

Merge remote-tracking branch 'remotes/stsquad/tags/pull-tcg-common-tlb-reset-20170113-r1' into staging

This is the same as the v3 posted except a re-base and a few extra signoffs

# gpg: Signature made Fri 13 Jan 2017 14:26:46 GMT
# gpg:                using RSA key 0xFBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>"
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* remotes/stsquad/tags/pull-tcg-common-tlb-reset-20170113-r1:
  cputlb: drop flush_global flag from tlb_flush
  cpu_common_reset: wrap TCG specific code in tcg_enabled()
  qom/cpu: move tlb_flush to cpu_common_reset

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

a8c611e1133f97c979922f41103f79309339dc27