]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'remotes/afaerber/tags/qom-cpu-for-peter' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 17 Mar 2015 16:19:12 +0000 (16:19 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 17 Mar 2015 16:19:13 +0000 (16:19 +0000)
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>

Trivial merge