# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 34d25118398574dd0fa220bdf3edb789a79e5ef7
# Parent e6303281ca6cc8d5d58ff50b6841e3a181fec55a
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@xxxxxxxxxxxxx>
diff -r e6303281ca6c -r 34d251183985 tools/firmware/vmxassist/Makefile
--- a/tools/firmware/vmxassist/Makefile Tue Oct 4 13:38:56 2005
+++ b/tools/firmware/vmxassist/Makefile Tue Oct 4 14:02:18 2005
@@ -25,9 +25,7 @@
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 -r e6303281ca6c -r 34d251183985 tools/firmware/vmxassist/vm86.h
--- a/tools/firmware/vmxassist/vm86.h Tue Oct 4 13:38:56 2005
+++ b/tools/firmware/vmxassist/vm86.h Tue Oct 4 14:02:18 2005
@@ -33,7 +33,7 @@
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
diff -r e6303281ca6c -r 34d251183985 tools/ioemu/hw/i8254.c
--- a/tools/ioemu/hw/i8254.c Tue Oct 4 13:38:56 2005
+++ b/tools/ioemu/hw/i8254.c Tue Oct 4 14:02:18 2005
@@ -22,8 +22,8 @@
* THE SOFTWARE.
*/
#include "vl.h"
-#include "xenctrl.h"
-#include <io/ioreq.h>
+#include <xenctrl.h>
+#include <xen/io/ioreq.h>
//#define DEBUG_PIT
diff -r e6303281ca6c -r 34d251183985 tools/ioemu/hw/i8259.c
--- a/tools/ioemu/hw/i8259.c Tue Oct 4 13:38:56 2005
+++ b/tools/ioemu/hw/i8259.c Tue Oct 4 14:02:18 2005
@@ -22,8 +22,8 @@
* THE SOFTWARE.
*/
#include "vl.h"
-#include "xenctrl.h"
-#include <io/ioreq.h>
+#include <xenctrl.h>
+#include <xen/io/ioreq.h>
/* debug PIC */
//#define DEBUG_PIC
diff -r e6303281ca6c -r 34d251183985 tools/ioemu/hw/ioapic.h
--- a/tools/ioemu/hw/ioapic.h Tue Oct 4 13:38:56 2005
+++ b/tools/ioemu/hw/ioapic.h Tue Oct 4 14:02:18 2005
@@ -26,9 +26,9 @@
#ifndef __IOAPIC_H
#define __IOAPIC_H
-#include "xenctrl.h"
-#include <io/ioreq.h>
-#include <io/vmx_vlapic.h>
+#include <xenctrl.h>
+#include <xen/io/ioreq.h>
+#include <xen/io/vmx_vlapic.h>
#define IOAPIC_NUM_PINS 24
#define IOAPIC_VERSION_ID 0x11
diff -r e6303281ca6c -r 34d251183985 tools/ioemu/target-i386-dm/Makefile
--- a/tools/ioemu/target-i386-dm/Makefile Tue Oct 4 13:38:56 2005
+++ b/tools/ioemu/target-i386-dm/Makefile Tue Oct 4 14:02:18 2005
@@ -6,7 +6,7 @@
INSTALL_DIR := $(DESTDIR)/usr/$(LIBDIR)/xen/bin
TARGET_PATH=$(SRC_PATH)/target-$(TARGET_ARCH)
VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw:$(SRC_PATH)/audio
-DEFINES=-I. -I$(TARGET_PATH) -I$(SRC_PATH) -I$(XEN_ROOT)/xen/include/public
+DEFINES=-I. -I$(TARGET_PATH) -I$(SRC_PATH)
DEFINES+= -I$(XEN_ROOT)/tools/libxc
ifdef CONFIG_USER_ONLY
VPATH+=:$(SRC_PATH)/linux-user
diff -r e6303281ca6c -r 34d251183985 tools/ioemu/target-i386-dm/helper2.c
--- a/tools/ioemu/target-i386-dm/helper2.c Tue Oct 4 13:38:56 2005
+++ b/tools/ioemu/target-i386-dm/helper2.c Tue Oct 4 14:02:18 2005
@@ -47,8 +47,8 @@
#include <fcntl.h>
#include <sys/ioctl.h>
-#include "xenctrl.h"
-#include <io/ioreq.h>
+#include <xenctrl.h>
+#include <xen/io/ioreq.h>
#include "cpu.h"
#include "exec-all.h"
diff -r e6303281ca6c -r 34d251183985 tools/tests/test_x86_emulator.c
--- a/tools/tests/test_x86_emulator.c Tue Oct 4 13:38:56 2005
+++ b/tools/tests/test_x86_emulator.c Tue Oct 4 14:02:18 2005
@@ -78,7 +78,7 @@
int main(int argc, char **argv)
{
- struct xen_regs regs;
+ struct cpu_user_regs regs;
char instr[20] = { 0x01, 0x08 }; /* add %ecx,(%eax) */
unsigned int res = 0x7FFFFFFF;
u32 cmpxchg8b_res[2] = { 0x12345678, 0x87654321 };
diff -r e6303281ca6c -r 34d251183985 tools/xenstat/libxenstat/Makefile
--- a/tools/xenstat/libxenstat/Makefile Tue Oct 4 13:38:56 2005
+++ b/tools/xenstat/libxenstat/Makefile Tue Oct 4 14:02:18 2005
@@ -38,9 +38,7 @@
WARN_FLAGS=-Wall -Werror
-CFLAGS+=-Isrc
-CFLAGS+=-I$(XEN_ROOT)/xen/include/public
-CFLAGS+=-I$(LINUX_ROOT)/include/asm-xen/linux-public/
+CFLAGS+=-Isrc -I$(XEN_LIBXC)
LDFLAGS+=-Lsrc
all: $(LIB)
diff -r e6303281ca6c -r 34d251183985
tools/xenstat/libxenstat/src/xen-interface.c
--- a/tools/xenstat/libxenstat/src/xen-interface.c Tue Oct 4 13:38:56 2005
+++ b/tools/xenstat/libxenstat/src/xen-interface.c Tue Oct 4 14:02:18 2005
@@ -23,9 +23,7 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include "version.h"
-#include "privcmd.h"
-#include "xen.h"
+#include <xen/linux/privcmd.h>
struct xi_handle {
int fd;
diff -r e6303281ca6c -r 34d251183985
tools/xenstat/libxenstat/src/xen-interface.h
--- a/tools/xenstat/libxenstat/src/xen-interface.h Tue Oct 4 13:38:56 2005
+++ b/tools/xenstat/libxenstat/src/xen-interface.h Tue Oct 4 14:02:18 2005
@@ -26,8 +26,9 @@
typedef uint32_t u32;
typedef uint64_t u64;
-#include "dom0_ops.h"
-#include "version.h"
+#include <xen/xen.h>
+#include <xen/dom0_ops.h>
+#include <xen/version.h>
/* Opaque handles */
typedef struct xi_handle xi_handle;
diff -r e6303281ca6c -r 34d251183985 tools/xenstat/libxenstat/src/xenstat.c
--- a/tools/xenstat/libxenstat/src/xenstat.c Tue Oct 4 13:38:56 2005
+++ b/tools/xenstat/libxenstat/src/xenstat.c Tue Oct 4 14:02:18 2005
@@ -22,7 +22,6 @@
#include <unistd.h>
#include <xen-interface.h>
#include "xenstat.h"
-#include "version.h"
/*
* Types
diff -r e6303281ca6c -r 34d251183985 tools/xenstore/Makefile
--- a/tools/xenstore/Makefile Tue Oct 4 13:38:56 2005
+++ b/tools/xenstore/Makefile Tue Oct 4 14:02:18 2005
@@ -15,7 +15,6 @@
BASECFLAGS+= -O3 $(PROFILE)
#BASECFLAGS+= -I$(XEN_ROOT)/tools
BASECFLAGS+= -I$(XEN_ROOT)/tools/libxc
-BASECFLAGS+= -I$(XEN_ROOT)/xen/include/public
BASECFLAGS+= -I.
CFLAGS += $(BASECFLAGS)
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home