Revert "Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into...
commit0856579cac2f1dacecd847cfcd89680d26ff78f5
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 3 Mar 2015 00:29:17 +0000 (3 00:29 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 3 Mar 2015 00:29:17 +0000 (3 00:29 +0000)
tree6ab14c4d57029b50bf6ec08b4b881bfad0625217
parentb8a173b25c887a606681fc35a46702c164d5b2d0
Revert "Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging"

This reverts commit b8a173b25c887a606681fc35a46702c164d5b2d0, reversing
changes made to 5de090464f1ec5360c4f30faa01d8a9f8826cd58.

(I applied this pull request when I should not have done so, and
am now immediately reverting it.)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
hw/i386/pc.c
linux-user/main.c
target-i386/cpu-qom.h
target-i386/cpu.c
target-i386/cpu.h
target-i386/kvm.c
target-i386/topology.h [moved from include/hw/i386/topology.h with 97% similarity]
tests/Makefile
tests/test-x86-cpuid.c