aboutsummaryrefslogtreecommitdiffstats
path: root/tools/firmware
diff options
context:
space:
mode:
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2005-10-04 15:02:18 +0100
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2005-10-04 15:02:18 +0100
commit1cd0f4f23f8791b3df00205a13dfc9112e015f4f (patch)
tree1e90ef1d069e0f3bce018b36e6cd4549d230abcd /tools/firmware
parente02845dc4a57bdef63b8ddf1f1ef5600af2a3ab3 (diff)
downloadxen-1cd0f4f23f8791b3df00205a13dfc9112e015f4f.tar.gz
xen-1cd0f4f23f8791b3df00205a13dfc9112e015f4f.tar.bz2
xen-1cd0f4f23f8791b3df00205a13dfc9112e015f4f.zip
Fix tools to pull public header files from standard
location in libxc directory. Not direct from xen and xenlinux build trees! Also fix a type name in x86_emulator test harness. Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'tools/firmware')
-rw-r--r--tools/firmware/vmxassist/Makefile4
-rw-r--r--tools/firmware/vmxassist/vm86.h2
2 files changed, 2 insertions, 4 deletions
diff --git a/tools/firmware/vmxassist/Makefile b/tools/firmware/vmxassist/Makefile
index 8a7de85849..9d34c26677 100644
--- a/tools/firmware/vmxassist/Makefile
+++ b/tools/firmware/vmxassist/Makefile
@@ -25,9 +25,7 @@ include $(XEN_ROOT)/tools/Rules.mk
TEXTADDR=0x000D0000
DEFINES=-DDEBUG -DTEXTADDR=${TEXTADDR}
-XENINC=-I$(XEN_ROOT)/xen/include -I$(XEN_ROOT)/tools/libxc
-#DEFINES=-DDEBUG -DTEST -DTEXTADDR=${TEXTADDR}
-#XENINC=-I/home/leendert/xen/xeno-unstable.bk/xen/include
+XENINC=-I$(XEN_ROOT)/tools/libxc
LD = ld
CC = gcc
diff --git a/tools/firmware/vmxassist/vm86.h b/tools/firmware/vmxassist/vm86.h
index 6ed20c7954..b15493215f 100644
--- a/tools/firmware/vmxassist/vm86.h
+++ b/tools/firmware/vmxassist/vm86.h
@@ -33,7 +33,7 @@ typedef int32_t s32;
typedef int64_t s64;
#endif
-#include <public/vmx_assist.h>
+#include <xen/vmx_assist.h>
#define NR_EXCEPTION_HANDLER 32
#define NR_INTERRUPT_HANDLERS 16