diff options
author | 2015-03-17 16:19:12 +0000 | |
---|---|---|
committer | 2015-03-17 16:19:13 +0000 | |
commit | ac738eadc409813c5fbb37dae8d254cb5664733a (patch) | |
tree | 6fe608edd1bfb22f1d9480449db54db579c0db40 /hw/display/omap_dss.c | |
parent | Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging (diff) | |
parent | target-i386: Remove icc_bridge parameter from cpu_x86_create() (diff) | |
download | qemu-ac738eadc409813c5fbb37dae8d254cb5664733a.tar.xz qemu-ac738eadc409813c5fbb37dae8d254cb5664733a.zip |
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>
Diffstat (limited to 'hw/display/omap_dss.c')
0 files changed, 0 insertions, 0 deletions