From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 31 Mar 2014 17:47:14 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/afaerber/tags/qom-cpu-for-2.0' into staging
X-Git-Tag: v2.0.0-rc1~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7d4d7975e58b66de6a67ecb5aa9656653653a658;p=thirdparty%2Fqemu.git

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>
---

7d4d7975e58b66de6a67ecb5aa9656653653a658