From 8a3f75b39db7d2c891d1e91dde5180d3ff9e10f7 Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Thu, 18 Dec 2014 23:41:06 -0200 Subject: target-i386: Move topology.h to include/hw/i386 This will allow the PC code to use the header, and lets us eliminate the QEMU_INCLUDES hack inside tests/Makefile. Reviewed-by: Paolo Bonzini Signed-off-by: Eduardo Habkost --- tests/Makefile | 2 -- tests/test-x86-cpuid.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/Makefile b/tests/Makefile index 307035c26c..7d4b96d4fd 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -239,8 +239,6 @@ $(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 8d9f96a113..6cd20d4a23 100644 --- a/tests/test-x86-cpuid.c +++ b/tests/test-x86-cpuid.c @@ -24,7 +24,7 @@ #include -#include "topology.h" +#include "hw/i386/topology.h" static void test_topo_bits(void) { -- cgit v1.2.3