From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 17 Mar 2015 16:19:12 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/afaerber/tags/qom-cpu-for-peter' into staging
X-Git-Tag: v2.7.1~1227
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ac738eadc409813c5fbb37dae8d254cb5664733a;p=mirror_qemu.git

Merge remote-tracking branch 'remotes/afaerber/tags/qom-cpu-for-peter' into staging

QOM CPUState and X86CPU

* QTest for PC X86CPU
* Confinement of ICC bridge X86CPU parenting to PC code

# gpg: Signature made Tue Mar 17 15:23:31 2015 GMT 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-peter:
  target-i386: Remove icc_bridge parameter from cpu_x86_create()
  tests: Add PC CPU test
  pc: Suppress APIC ID compatibility warning for QTest

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

ac738eadc409813c5fbb37dae8d254cb5664733a