test_x86_emulate: Get public Xen headers via tools/include.

Signed-off-by: Keir Fraser <keir@xen.org>

diff --git a/tools/tests/x86_emulator/Makefile b/tools/tests/x86_emulator/Makefile
index 9c9739f329907fa84b3bd360ddf4d37c3a8d4419..fa76e24fa1af5c71a6114668ccae8a2751404ff7 100644 (file)
--- a/tools/tests/x86_emulator/Makefile
+++ b/tools/tests/x86_emulator/Makefile
@@ -37,8 +37,10 @@ install:
 x86_emulate:
        [ -L x86_emulate ] || ln -sf $(XEN_ROOT)/xen/arch/x86/x86_emulate .
 
+HOSTCFLAGS += $(CFLAGS_xeninclude)
+
 x86_emulate.o: x86_emulate.c x86_emulate
-       $(HOSTCC) $(HOSTCFLAGS) -I$(XEN_ROOT)/xen/include -c -o $@ $<
+       $(HOSTCC) $(HOSTCFLAGS) -c -o $@ $<
 
 test_x86_emulator.o: test_x86_emulator.c blowfish.h x86_emulate
-       $(HOSTCC) $(HOSTCFLAGS) -I$(XEN_ROOT)/xen/include -c -o $@ $<
+       $(HOSTCC) $(HOSTCFLAGS) -c -o $@ $<

diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c
index bb1055ba1f019ff0a7a7e19aa83a36d7292ae6ab..1f5722baaa576eeb557782d77294c04103cb9bf0 100644 (file)
--- a/tools/tests/x86_emulator/test_x86_emulator.c
+++ b/tools/tests/x86_emulator/test_x86_emulator.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
-#include <public/xen.h>
+#include <xen/xen.h>
 #include <sys/mman.h>
 
 #include "x86_emulate/x86_emulate.h"

diff --git a/tools/tests/x86_emulator/x86_emulate.c b/tools/tests/x86_emulator/x86_emulate.c
index a58a7b81789699a59d6e44908674ee591c5afa4c..2674d556eb3511e1de339ffae940e28c144f1f5b 100644 (file)
--- a/tools/tests/x86_emulator/x86_emulate.c
+++ b/tools/tests/x86_emulator/x86_emulate.c
@@ -1,7 +1,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
-#include <public/xen.h>
+#include <xen/xen.h>
 
 #include "x86_emulate/x86_emulate.h"
 #include "x86_emulate/x86_emulate.c"