ia64/xen-unstable

changeset 7202:34d251183985

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>
author kaf24@firebug.cl.cam.ac.uk
date Tue Oct 04 15:02:18 2005 +0100 (2005-10-04)
parents e6303281ca6c
children f13b4b730605
files tools/firmware/vmxassist/Makefile tools/firmware/vmxassist/vm86.h tools/ioemu/hw/i8254.c tools/ioemu/hw/i8259.c tools/ioemu/hw/ioapic.h tools/ioemu/target-i386-dm/Makefile tools/ioemu/target-i386-dm/helper2.c tools/tests/test_x86_emulator.c tools/xenstat/libxenstat/Makefile tools/xenstat/libxenstat/src/xen-interface.c tools/xenstat/libxenstat/src/xen-interface.h tools/xenstat/libxenstat/src/xenstat.c tools/xenstore/Makefile
line diff
     1.1 --- a/tools/firmware/vmxassist/Makefile	Tue Oct 04 14:38:56 2005 +0100
     1.2 +++ b/tools/firmware/vmxassist/Makefile	Tue Oct 04 15:02:18 2005 +0100
     1.3 @@ -25,9 +25,7 @@ include $(XEN_ROOT)/tools/Rules.mk
     1.4  TEXTADDR=0x000D0000
     1.5  
     1.6  DEFINES=-DDEBUG -DTEXTADDR=${TEXTADDR}
     1.7 -XENINC=-I$(XEN_ROOT)/xen/include -I$(XEN_ROOT)/tools/libxc
     1.8 -#DEFINES=-DDEBUG -DTEST -DTEXTADDR=${TEXTADDR}
     1.9 -#XENINC=-I/home/leendert/xen/xeno-unstable.bk/xen/include
    1.10 +XENINC=-I$(XEN_ROOT)/tools/libxc
    1.11  
    1.12  LD       = ld
    1.13  CC       = gcc
     2.1 --- a/tools/firmware/vmxassist/vm86.h	Tue Oct 04 14:38:56 2005 +0100
     2.2 +++ b/tools/firmware/vmxassist/vm86.h	Tue Oct 04 15:02:18 2005 +0100
     2.3 @@ -33,7 +33,7 @@ typedef int32_t            s32;
     2.4  typedef int64_t            s64;
     2.5  #endif
     2.6  
     2.7 -#include <public/vmx_assist.h>
     2.8 +#include <xen/vmx_assist.h>
     2.9  
    2.10  #define	NR_EXCEPTION_HANDLER	32
    2.11  #define	NR_INTERRUPT_HANDLERS	16
     3.1 --- a/tools/ioemu/hw/i8254.c	Tue Oct 04 14:38:56 2005 +0100
     3.2 +++ b/tools/ioemu/hw/i8254.c	Tue Oct 04 15:02:18 2005 +0100
     3.3 @@ -22,8 +22,8 @@
     3.4   * THE SOFTWARE.
     3.5   */
     3.6  #include "vl.h"
     3.7 -#include "xenctrl.h"
     3.8 -#include <io/ioreq.h>
     3.9 +#include <xenctrl.h>
    3.10 +#include <xen/io/ioreq.h>
    3.11  
    3.12  //#define DEBUG_PIT
    3.13  
     4.1 --- a/tools/ioemu/hw/i8259.c	Tue Oct 04 14:38:56 2005 +0100
     4.2 +++ b/tools/ioemu/hw/i8259.c	Tue Oct 04 15:02:18 2005 +0100
     4.3 @@ -22,8 +22,8 @@
     4.4   * THE SOFTWARE.
     4.5   */
     4.6  #include "vl.h"
     4.7 -#include "xenctrl.h"
     4.8 -#include <io/ioreq.h>
     4.9 +#include <xenctrl.h>
    4.10 +#include <xen/io/ioreq.h>
    4.11  
    4.12  /* debug PIC */
    4.13  //#define DEBUG_PIC
     5.1 --- a/tools/ioemu/hw/ioapic.h	Tue Oct 04 14:38:56 2005 +0100
     5.2 +++ b/tools/ioemu/hw/ioapic.h	Tue Oct 04 15:02:18 2005 +0100
     5.3 @@ -26,9 +26,9 @@
     5.4  #ifndef __IOAPIC_H
     5.5  #define __IOAPIC_H
     5.6  
     5.7 -#include "xenctrl.h"
     5.8 -#include <io/ioreq.h>
     5.9 -#include <io/vmx_vlapic.h>
    5.10 +#include <xenctrl.h>
    5.11 +#include <xen/io/ioreq.h>
    5.12 +#include <xen/io/vmx_vlapic.h>
    5.13  
    5.14  #define IOAPIC_NUM_PINS 24
    5.15  #define IOAPIC_VERSION_ID 0x11
     6.1 --- a/tools/ioemu/target-i386-dm/Makefile	Tue Oct 04 14:38:56 2005 +0100
     6.2 +++ b/tools/ioemu/target-i386-dm/Makefile	Tue Oct 04 15:02:18 2005 +0100
     6.3 @@ -6,7 +6,7 @@ override TARGET_ARCH=i386
     6.4  INSTALL_DIR := $(DESTDIR)/usr/$(LIBDIR)/xen/bin
     6.5  TARGET_PATH=$(SRC_PATH)/target-$(TARGET_ARCH)
     6.6  VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw:$(SRC_PATH)/audio
     6.7 -DEFINES=-I. -I$(TARGET_PATH) -I$(SRC_PATH) -I$(XEN_ROOT)/xen/include/public
     6.8 +DEFINES=-I. -I$(TARGET_PATH) -I$(SRC_PATH)
     6.9  DEFINES+= -I$(XEN_ROOT)/tools/libxc
    6.10  ifdef CONFIG_USER_ONLY
    6.11  VPATH+=:$(SRC_PATH)/linux-user
     7.1 --- a/tools/ioemu/target-i386-dm/helper2.c	Tue Oct 04 14:38:56 2005 +0100
     7.2 +++ b/tools/ioemu/target-i386-dm/helper2.c	Tue Oct 04 15:02:18 2005 +0100
     7.3 @@ -47,8 +47,8 @@
     7.4  #include <fcntl.h>
     7.5  #include <sys/ioctl.h>
     7.6  
     7.7 -#include "xenctrl.h"
     7.8 -#include <io/ioreq.h>
     7.9 +#include <xenctrl.h>
    7.10 +#include <xen/io/ioreq.h>
    7.11  
    7.12  #include "cpu.h"
    7.13  #include "exec-all.h"
     8.1 --- a/tools/tests/test_x86_emulator.c	Tue Oct 04 14:38:56 2005 +0100
     8.2 +++ b/tools/tests/test_x86_emulator.c	Tue Oct 04 15:02:18 2005 +0100
     8.3 @@ -78,7 +78,7 @@ static struct x86_mem_emulator emulops =
     8.4  
     8.5  int main(int argc, char **argv)
     8.6  {
     8.7 -    struct xen_regs regs;
     8.8 +    struct cpu_user_regs regs;
     8.9      char instr[20] = { 0x01, 0x08 }; /* add %ecx,(%eax) */
    8.10      unsigned int res = 0x7FFFFFFF;
    8.11      u32 cmpxchg8b_res[2] = { 0x12345678, 0x87654321 };
     9.1 --- a/tools/xenstat/libxenstat/Makefile	Tue Oct 04 14:38:56 2005 +0100
     9.2 +++ b/tools/xenstat/libxenstat/Makefile	Tue Oct 04 15:02:18 2005 +0100
     9.3 @@ -38,9 +38,7 @@ SONAME_FLAGS=-Wl,-soname -Wl,libxenstat.
     9.4  
     9.5  WARN_FLAGS=-Wall -Werror
     9.6  
     9.7 -CFLAGS+=-Isrc
     9.8 -CFLAGS+=-I$(XEN_ROOT)/xen/include/public
     9.9 -CFLAGS+=-I$(LINUX_ROOT)/include/asm-xen/linux-public/
    9.10 +CFLAGS+=-Isrc -I$(XEN_LIBXC)
    9.11  LDFLAGS+=-Lsrc
    9.12  
    9.13  all: $(LIB)
    10.1 --- a/tools/xenstat/libxenstat/src/xen-interface.c	Tue Oct 04 14:38:56 2005 +0100
    10.2 +++ b/tools/xenstat/libxenstat/src/xen-interface.c	Tue Oct 04 15:02:18 2005 +0100
    10.3 @@ -23,9 +23,7 @@
    10.4  #include <stdlib.h>
    10.5  #include <string.h>
    10.6  #include <unistd.h>
    10.7 -#include "version.h"
    10.8 -#include "privcmd.h"
    10.9 -#include "xen.h"
   10.10 +#include <xen/linux/privcmd.h>
   10.11  
   10.12  struct xi_handle {
   10.13  	int fd;
    11.1 --- a/tools/xenstat/libxenstat/src/xen-interface.h	Tue Oct 04 14:38:56 2005 +0100
    11.2 +++ b/tools/xenstat/libxenstat/src/xen-interface.h	Tue Oct 04 15:02:18 2005 +0100
    11.3 @@ -26,8 +26,9 @@ typedef uint16_t u16;
    11.4  typedef uint32_t u32;
    11.5  typedef uint64_t u64;
    11.6  
    11.7 -#include "dom0_ops.h"
    11.8 -#include "version.h"
    11.9 +#include <xen/xen.h>
   11.10 +#include <xen/dom0_ops.h>
   11.11 +#include <xen/version.h>
   11.12  
   11.13  /* Opaque handles */
   11.14  typedef struct xi_handle xi_handle;
    12.1 --- a/tools/xenstat/libxenstat/src/xenstat.c	Tue Oct 04 14:38:56 2005 +0100
    12.2 +++ b/tools/xenstat/libxenstat/src/xenstat.c	Tue Oct 04 15:02:18 2005 +0100
    12.3 @@ -22,7 +22,6 @@
    12.4  #include <unistd.h>
    12.5  #include <xen-interface.h>
    12.6  #include "xenstat.h"
    12.7 -#include "version.h"
    12.8  
    12.9  /*
   12.10   * Types
    13.1 --- a/tools/xenstore/Makefile	Tue Oct 04 14:38:56 2005 +0100
    13.2 +++ b/tools/xenstore/Makefile	Tue Oct 04 15:02:18 2005 +0100
    13.3 @@ -15,7 +15,6 @@ PROG_DEP = .*.d
    13.4  BASECFLAGS+= -O3 $(PROFILE)
    13.5  #BASECFLAGS+= -I$(XEN_ROOT)/tools
    13.6  BASECFLAGS+= -I$(XEN_ROOT)/tools/libxc
    13.7 -BASECFLAGS+= -I$(XEN_ROOT)/xen/include/public
    13.8  BASECFLAGS+= -I.
    13.9  
   13.10  CFLAGS  += $(BASECFLAGS)