diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-03-03 00:29:17 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-03-03 00:29:17 +0000 |
| commit | 0856579cac2f1dacecd847cfcd89680d26ff78f5 (patch) | |
| tree | 6ab14c4d57029b50bf6ec08b4b881bfad0625217 /tests | |
| parent | b8a173b25c887a606681fc35a46702c164d5b2d0 (diff) | |
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>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 2 | ||||
| -rw-r--r-- | tests/test-x86-cpuid.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/Makefile b/tests/Makefile index 7d4b96d4fd..307035c26c 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -239,6 +239,8 @@ $(test-obj-y): QEMU_INCLUDES += -Itests QEMU_CFLAGS += -I$(SRC_PATH)/tests qom-core-obj = qom/object.o qom/qom-qobject.o qom/container.o +tests/test-x86-cpuid.o: QEMU_INCLUDES += -I$(SRC_PATH)/target-i386 + tests/check-qint$(EXESUF): tests/check-qint.o libqemuutil.a tests/check-qstring$(EXESUF): tests/check-qstring.o libqemuutil.a tests/check-qdict$(EXESUF): tests/check-qdict.o libqemuutil.a diff --git a/tests/test-x86-cpuid.c b/tests/test-x86-cpuid.c index 6cd20d4a23..8d9f96a113 100644 --- a/tests/test-x86-cpuid.c +++ b/tests/test-x86-cpuid.c @@ -24,7 +24,7 @@ #include <glib.h> -#include "hw/i386/topology.h" +#include "topology.h" static void test_topo_bits(void) { |