aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2014-12-18 23:41:06 -0200
committerEduardo Habkost <ehabkost@redhat.com>2015-02-25 15:00:07 -0300
commit8a3f75b39db7d2c891d1e91dde5180d3ff9e10f7 (patch)
tree079428814e2ae58ff788fd4bd84e3c801596c92d /tests
parent08e1a1e5a175ecbfdb761db5a62090498f736969 (diff)
downloadqemu-8a3f75b39db7d2c891d1e91dde5180d3ff9e10f7.zip
qemu-8a3f75b39db7d2c891d1e91dde5180d3ff9e10f7.tar.gz
qemu-8a3f75b39db7d2c891d1e91dde5180d3ff9e10f7.tar.bz2
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 <pbonzini@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile2
-rw-r--r--tests/test-x86-cpuid.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/tests/Makefile b/tests/Makefile
index 307035c..7d4b96d 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 8d9f96a..6cd20d4 100644
--- a/tests/test-x86-cpuid.c
+++ b/tests/test-x86-cpuid.c
@@ -24,7 +24,7 @@
#include <glib.h>
-#include "topology.h"
+#include "hw/i386/topology.h"
static void test_topo_bits(void)
{