# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID 5d2ce349f9f4fd83e81a1d360ca46e7a976e82e5
# Parent 3b27623dd319f4b2ddbd155c8754bac8ecbf6b6d
[SOLARIS] Don't build ptrace code on Solaris.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
Config.mk | 2
config/ia64.mk | 2
config/powerpc64.mk | 1
config/x86_32.mk | 2
config/x86_64.mk | 2
tools/Rules.mk | 2
tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/linux-xen-low.c | 2
tools/libxc/Makefile | 3 -
tools/libxc/xc_private.h | 3 +
tools/libxc/xc_ptrace.c | 2
tools/libxc/xc_ptrace.h | 24
---------
tools/libxc/xc_ptrace_core.c | 2
tools/libxc/xenctrl.h | 26
+++++++++-
tools/libxc/xg_private.h | 4 -
14 files changed, 39 insertions(+), 38 deletions(-)
diff -r 3b27623dd319 -r 5d2ce349f9f4 Config.mk
--- a/Config.mk Tue Oct 17 17:29:19 2006 +0100
+++ b/Config.mk Tue Oct 17 17:59:32 2006 +0100
@@ -8,6 +8,8 @@ XEN_TARGET_ARCH ?= $(XEN_COMPILE_ARC
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
diff -r 3b27623dd319 -r 5d2ce349f9f4 config/ia64.mk
--- a/config/ia64.mk Tue Oct 17 17:29:19 2006 +0100
+++ b/config/ia64.mk Tue Oct 17 17:59:32 2006 +0100
@@ -1,4 +1,6 @@ CONFIG_IA64 := y
CONFIG_IA64 := y
+CONFIG_IA64_$(XEN_OS) := y
+
CONFIG_IOEMU := y
CONFIG_XCUTILS := y
diff -r 3b27623dd319 -r 5d2ce349f9f4 config/powerpc64.mk
--- a/config/powerpc64.mk Tue Oct 17 17:29:19 2006 +0100
+++ b/config/powerpc64.mk Tue Oct 17 17:59:32 2006 +0100
@@ -1,4 +1,5 @@ CONFIG_POWERPC := y
CONFIG_POWERPC := y
+CONFIG_POWERPC_$(XEN_OS) := y
CFLAGS += -DELFSIZE=64
LIBDIR := lib
diff -r 3b27623dd319 -r 5d2ce349f9f4 config/x86_32.mk
--- a/config/x86_32.mk Tue Oct 17 17:29:19 2006 +0100
+++ b/config/x86_32.mk Tue Oct 17 17:59:32 2006 +0100
@@ -1,4 +1,6 @@ CONFIG_X86 := y
CONFIG_X86 := y
+CONFIG_X86_$(XEN_OS) := y
+
CONFIG_HVM := y
CONFIG_MIGRATE := y
CONFIG_XCUTILS := y
diff -r 3b27623dd319 -r 5d2ce349f9f4 config/x86_64.mk
--- a/config/x86_64.mk Tue Oct 17 17:29:19 2006 +0100
+++ b/config/x86_64.mk Tue Oct 17 17:59:32 2006 +0100
@@ -1,4 +1,6 @@ CONFIG_X86 := y
CONFIG_X86 := y
+CONFIG_X86_$(XEN_OS) := y
+
CONFIG_HVM := y
CONFIG_MIGRATE := y
CONFIG_XCUTILS := y
diff -r 3b27623dd319 -r 5d2ce349f9f4 tools/Rules.mk
--- a/tools/Rules.mk Tue Oct 17 17:29:19 2006 +0100
+++ b/tools/Rules.mk Tue Oct 17 17:59:32 2006 +0100
@@ -4,8 +4,6 @@ all:
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
diff -r 3b27623dd319 -r 5d2ce349f9f4
tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/linux-xen-low.c
--- a/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/linux-xen-low.c
Tue Oct 17 17:29:19 2006 +0100
+++ b/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/linux-xen-low.c
Tue Oct 17 17:59:32 2006 +0100
@@ -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 -r 3b27623dd319 -r 5d2ce349f9f4 tools/libxc/Makefile
--- a/tools/libxc/Makefile Tue Oct 17 17:29:19 2006 +0100
+++ b/tools/libxc/Makefile Tue Oct 17 17:59:32 2006 +0100
@@ -15,8 +15,9 @@ CTRL_SRCS-y += xc_sedf.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 -r 3b27623dd319 -r 5d2ce349f9f4 tools/libxc/xc_private.h
--- a/tools/libxc/xc_private.h Tue Oct 17 17:29:19 2006 +0100
+++ b/tools/libxc/xc_private.h Tue Oct 17 17:59:32 2006 +0100
@@ -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 -r 3b27623dd319 -r 5d2ce349f9f4 tools/libxc/xc_ptrace.c
--- a/tools/libxc/xc_ptrace.c Tue Oct 17 17:29:19 2006 +0100
+++ b/tools/libxc/xc_ptrace.c Tue Oct 17 17:59:32 2006 +0100
@@ -1,5 +1,3 @@
-#define XC_PTRACE_PRIVATE
-
#include <sys/ptrace.h>
#include <sys/wait.h>
#include <time.h>
diff -r 3b27623dd319 -r 5d2ce349f9f4 tools/libxc/xc_ptrace.h
--- a/tools/libxc/xc_ptrace.h Tue Oct 17 17:29:19 2006 +0100
+++ b/tools/libxc/xc_ptrace.h Tue Oct 17 17:59:32 2006 +0100
@@ -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 -r 3b27623dd319 -r 5d2ce349f9f4 tools/libxc/xc_ptrace_core.c
--- a/tools/libxc/xc_ptrace_core.c Tue Oct 17 17:29:19 2006 +0100
+++ b/tools/libxc/xc_ptrace_core.c Tue Oct 17 17:59:32 2006 +0100
@@ -1,5 +1,3 @@
-#define XC_PTRACE_PRIVATE
-
#include <sys/ptrace.h>
#include <sys/wait.h>
#include "xc_private.h"
diff -r 3b27623dd319 -r 5d2ce349f9f4 tools/libxc/xenctrl.h
--- a/tools/libxc/xenctrl.h Tue Oct 17 17:29:19 2006 +0100
+++ b/tools/libxc/xenctrl.h Tue Oct 17 17:59:32 2006 +0100
@@ -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 *na
* 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 -r 3b27623dd319 -r 5d2ce349f9f4 tools/libxc/xg_private.h
--- a/tools/libxc/xg_private.h Tue Oct 17 17:29:19 2006 +0100
+++ b/tools/libxc/xg_private.h Tue Oct 17 17:59:32 2006 +0100
@@ -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;
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home