Merge remote-tracking branch 'remotes/afaerber/tags/qom-cpu-for-2.0' into staging
commit7d4d7975e58b66de6a67ecb5aa9656653653a658
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 31 Mar 2014 17:47:14 +0000 (31 18:47 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 31 Mar 2014 17:47:14 +0000 (31 18:47 +0100)
treee80fcd044516d50dadf27226fb25facebb783e0a
parent8648fcd52a9bcc2aa415cbe87b7c636e545acb38
parent0d6d1ab4990b6e8c6f24e9b1308801d657d411ad
Merge remote-tracking branch 'remotes/afaerber/tags/qom-cpu-for-2.0' into staging

QOM CPUState refactorings / X86CPU

* X86CPU IA32e 1GB paging support
* Performance quickfix for CPU() cast macro

# gpg: Signature made Mon 31 Mar 2014 18:33:27 BST using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg:                 aka "Andreas Färber <afaerber@suse.com>"

* remotes/afaerber/tags/qom-cpu-for-2.0:
  cpu: Avoid QOM casts for CPU()
  target-i386: x86_cpu_get_phys_page_debug(): support 1GB page translation

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