mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 10:11:27 +01:00
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>
This commit is contained in:
kaf24@firebug.cl.cam.ac.uk committed
1 parent
e02845dc4a
commit
1cd0f4f23f
13 files changed
+18
-25
No files matched your search
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -6,7 +6,7 @@ override TARGET_ARCH=i386
|
||||
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
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -78,7 +78,7 @@ static struct x86_mem_emulator emulops = {
|
||||
|
||||
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 };
|
||||
|
||||
@@ -38,9 +38,7 @@ SONAME_FLAGS=-Wl,-soname -Wl,libxenstat.so.$(MAJOR)
|
||||
|
||||
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)
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -26,8 +26,9 @@ typedef uint16_t u16;
|
||||
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;
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
#include <unistd.h>
|
||||
#include <xen-interface.h>
|
||||
#include "xenstat.h"
|
||||
#include "version.h"
|
||||
|
||||
/*
|
||||
* Types
|
||||
|
||||
@@ -15,7 +15,6 @@ PROG_DEP = .*.d
|
||||
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)
|
||||
|
||||