# HG changeset patch
# User john.levon@xxxxxxx
# Date 1161090564 25200
# Node ID 03d4223c846b14fc415cfd05d970c7b4d688fddb
# Parent 8d5dacb6f2c197dcc2e1b44d8d884baaf0dc2bcb
ptrace support is Linux-specific.
Signed-off-by: John Levon <john.levon@xxxxxxx>
diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -15,8 +15,8 @@ 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_Linux) += xc_linux.c
+CTRL_SRCS-$(CONFIG_X86) += xc_pagetab.c
+CTRL_SRCS-$(CONFIG_Linux) += xc_linux.c xc_ptrace.c xc_ptrace_core.c
GUEST_SRCS-y :=
GUEST_SRCS-y += xc_load_bin.c
diff --git a/tools/libxc/xc_ptrace.h b/tools/libxc/xc_ptrace.h
--- a/tools/libxc/xc_ptrace.h
+++ b/tools/libxc/xc_ptrace.h
@@ -175,6 +175,14 @@ long xc_ptrace(
long addr,
long data);
+long xc_ptrace_core(
+ int xc_handle,
+ enum __ptrace_request request,
+ uint32_t domid,
+ long addr,
+ long data,
+ vcpu_guest_context_t *ctxt);
+
int xc_waitdomain(
int xc_handle,
int domain,
diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h
--- 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>
@@ -116,13 +115,6 @@ typedef struct xc_core_header {
#define XC_CORE_MAGIC 0xF00FEBED
-long xc_ptrace_core(
- int xc_handle,
- enum __ptrace_request request,
- uint32_t domid,
- long addr,
- long data,
- vcpu_guest_context_t *ctxt);
void * map_domain_va_core(
unsigned long domfd,
int cpu,
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|