diff options
author | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2006-10-17 17:59:32 +0100 |
---|---|---|
committer | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2006-10-17 17:59:32 +0100 |
commit | c0fd920e987be439fb445338566f910c433679fd (patch) | |
tree | 8c37942f7eb261ebf9aa240d865f7d0c0e470ddc | |
parent | a36c8be096210ffb6e81b8ffdc7cad8ffad747d2 (diff) | |
download | xen-c0fd920e987be439fb445338566f910c433679fd.tar.gz xen-c0fd920e987be439fb445338566f910c433679fd.tar.bz2 xen-c0fd920e987be439fb445338566f910c433679fd.zip |
[SOLARIS] Don't build ptrace code on Solaris.
Signed-off-by: Keir Fraser <keir@xensource.com>
-rw-r--r-- | Config.mk | 2 | ||||
-rw-r--r-- | config/ia64.mk | 2 | ||||
-rw-r--r-- | config/powerpc64.mk | 1 | ||||
-rw-r--r-- | config/x86_32.mk | 2 | ||||
-rw-r--r-- | config/x86_64.mk | 2 | ||||
-rw-r--r-- | tools/Rules.mk | 2 | ||||
-rw-r--r-- | tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/linux-xen-low.c | 2 | ||||
-rw-r--r-- | tools/libxc/Makefile | 3 | ||||
-rw-r--r-- | tools/libxc/xc_private.h | 3 | ||||
-rw-r--r-- | tools/libxc/xc_ptrace.c | 2 | ||||
-rw-r--r-- | tools/libxc/xc_ptrace.h | 24 | ||||
-rw-r--r-- | tools/libxc/xc_ptrace_core.c | 2 | ||||
-rw-r--r-- | tools/libxc/xenctrl.h | 26 | ||||
-rw-r--r-- | tools/libxc/xg_private.h | 4 |
14 files changed, 39 insertions, 38 deletions
@@ -9,6 +9,8 @@ XEN_TARGET_ARCH ?= $(XEN_COMPILE_ARCH) XEN_TARGET_X86_PAE ?= n XEN_OS ?= $(shell uname -s) +CONFIG_$(XEN_OS) := y + # Tools to run on system hosting the build HOSTCC = gcc HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer diff --git a/config/ia64.mk b/config/ia64.mk index 4fab1118be..7cf99d9b69 100644 --- a/config/ia64.mk +++ b/config/ia64.mk @@ -1,4 +1,6 @@ CONFIG_IA64 := y +CONFIG_IA64_$(XEN_OS) := y + CONFIG_IOEMU := y CONFIG_XCUTILS := y diff --git a/config/powerpc64.mk b/config/powerpc64.mk index ee717ecd64..9773b24a6c 100644 --- a/config/powerpc64.mk +++ b/config/powerpc64.mk @@ -1,4 +1,5 @@ CONFIG_POWERPC := y +CONFIG_POWERPC_$(XEN_OS) := y CFLAGS += -DELFSIZE=64 LIBDIR := lib diff --git a/config/x86_32.mk b/config/x86_32.mk index e4b21e2e6c..4db3c73b3b 100644 --- a/config/x86_32.mk +++ b/config/x86_32.mk @@ -1,4 +1,6 @@ CONFIG_X86 := y +CONFIG_X86_$(XEN_OS) := y + CONFIG_HVM := y CONFIG_MIGRATE := y CONFIG_XCUTILS := y diff --git a/config/x86_64.mk b/config/x86_64.mk index 53883a6efc..c76567563c 100644 --- a/config/x86_64.mk +++ b/config/x86_64.mk @@ -1,4 +1,6 @@ CONFIG_X86 := y +CONFIG_X86_$(XEN_OS) := y + CONFIG_HVM := y CONFIG_MIGRATE := y CONFIG_XCUTILS := y diff --git a/tools/Rules.mk b/tools/Rules.mk index 64be032241..6a5036b3f6 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -5,8 +5,6 @@ all: include $(XEN_ROOT)/Config.mk -CONFIG_$(shell uname -s) := y - XEN_XC = $(XEN_ROOT)/tools/python/xen/lowlevel/xc XEN_LIBXC = $(XEN_ROOT)/tools/libxc XEN_XENSTORE = $(XEN_ROOT)/tools/xenstore diff --git a/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/linux-xen-low.c b/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/linux-xen-low.c index c87096d1c4..8b0b6d944a 100644 --- a/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/linux-xen-low.c +++ b/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/linux-xen-low.c @@ -36,8 +36,6 @@ #include <unistd.h> #include <errno.h> #include <xenctrl.h> -#include <thread_db.h> -#include <xc_ptrace.h> #define TRACE_ENTER /* printf("enter %s\n", __FUNCTION__) */ diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 198f1992b0..3f2787c471 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -15,8 +15,9 @@ CTRL_SRCS-y += xc_private.c CTRL_SRCS-y += xc_sedf.c CTRL_SRCS-y += xc_csched.c CTRL_SRCS-y += xc_tbuf.c -CTRL_SRCS-$(CONFIG_X86) += xc_ptrace.c xc_ptrace_core.c xc_pagetab.c +CTRL_SRCS-$(CONFIG_X86) += xc_pagetab.c CTRL_SRCS-$(CONFIG_Linux) += xc_linux.c +CTRL_SRCS-$(CONFIG_X86_Linux) += xc_ptrace.c xc_ptrace_core.c GUEST_SRCS-y := GUEST_SRCS-y += xc_load_bin.c diff --git a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h index 513daed6f9..1f92df6225 100644 --- a/tools/libxc/xc_private.h +++ b/tools/libxc/xc_private.h @@ -30,6 +30,9 @@ #define DECLARE_SYSCTL struct xen_sysctl sysctl #endif +#undef PAGE_SHIFT +#undef PAGE_SIZE +#undef PAGE_MASK #define PAGE_SHIFT XC_PAGE_SHIFT #define PAGE_SIZE (1UL << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) diff --git a/tools/libxc/xc_ptrace.c b/tools/libxc/xc_ptrace.c index d1a9f13580..2525417f16 100644 --- a/tools/libxc/xc_ptrace.c +++ b/tools/libxc/xc_ptrace.c @@ -1,5 +1,3 @@ -#define XC_PTRACE_PRIVATE - #include <sys/ptrace.h> #include <sys/wait.h> #include <time.h> diff --git a/tools/libxc/xc_ptrace.h b/tools/libxc/xc_ptrace.h index 1c3f10b1d0..baaadb5b0b 100644 --- a/tools/libxc/xc_ptrace.h +++ b/tools/libxc/xc_ptrace.h @@ -1,9 +1,6 @@ #ifndef XC_PTRACE_ #define XC_PTRACE_ -#include <thread_db.h> - -#ifdef XC_PTRACE_PRIVATE #define X86_CR0_PE 0x00000001 /* Enable Protected Mode (RW) */ #define X86_CR0_PG 0x80000000 /* Paging (RW) */ #define BSD_PAGE_MASK (PAGE_SIZE-1) @@ -160,25 +157,4 @@ struct gdb_regs { } #endif -#endif - -typedef void (*thr_ev_handler_t)(long); - -void xc_register_event_handler( - thr_ev_handler_t h, - td_event_e e); - -long xc_ptrace( - int xc_handle, - enum __ptrace_request request, - uint32_t domid, - long addr, - long data); - -int xc_waitdomain( - int xc_handle, - int domain, - int *status, - int options); - #endif /* XC_PTRACE */ diff --git a/tools/libxc/xc_ptrace_core.c b/tools/libxc/xc_ptrace_core.c index d57da3f172..03bbf318a3 100644 --- a/tools/libxc/xc_ptrace_core.c +++ b/tools/libxc/xc_ptrace_core.c @@ -1,5 +1,3 @@ -#define XC_PTRACE_PRIVATE - #include <sys/ptrace.h> #include <sys/wait.h> #include "xc_private.h" diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index d74c1c8c27..d3f0368118 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -16,7 +16,6 @@ #include <stddef.h> #include <stdint.h> -#include <sys/ptrace.h> #include <xen/xen.h> #include <xen/domctl.h> #include <xen/sysctl.h> @@ -105,6 +104,11 @@ int xc_find_device_number(const char *name); * DOMAIN DEBUGGING FUNCTIONS */ +#ifdef __linux__ + +#include <sys/ptrace.h> +#include <thread_db.h> + typedef struct xc_core_header { unsigned int xch_magic; unsigned int xch_nr_vcpus; @@ -134,6 +138,26 @@ int xc_waitdomain_core( int *status, int options, vcpu_guest_context_t *ctxt); +typedef void (*thr_ev_handler_t)(long); + +void xc_register_event_handler( + thr_ev_handler_t h, + td_event_e e); + +long xc_ptrace( + int xc_handle, + enum __ptrace_request request, + uint32_t domid, + long addr, + long data); + +int xc_waitdomain( + int xc_handle, + int domain, + int *status, + int options); + +#endif /* __linux__ */ /* * DOMAIN MANAGEMENT FUNCTIONS diff --git a/tools/libxc/xg_private.h b/tools/libxc/xg_private.h index c471e94cb6..63ad2bcfdc 100644 --- a/tools/libxc/xg_private.h +++ b/tools/libxc/xg_private.h @@ -79,10 +79,6 @@ unsigned long csum_page (void * page); #define L4_PAGETABLE_ENTRIES 512 #endif -#define PAGE_SHIFT XC_PAGE_SHIFT -#define PAGE_SIZE (1UL << PAGE_SHIFT) -#define PAGE_MASK (~(PAGE_SIZE-1)) - typedef uint32_t l1_pgentry_32_t; typedef uint32_t l2_pgentry_32_t; typedef uint64_t l1_pgentry_64_t; |