From: Ian Campbell <ian.campbell@citrix.com>
Date: Fri, 13 Aug 2010 13:25:56 +0000 (+0100)
Subject: libxc: disable xc_ptrace on x86 Linux
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~11649
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fa2244104b42a8ab478b13eaba6bc86c87c0c167;p=xen.git

libxc: disable xc_ptrace on x86 Linux

It has been unused since 21732:eb34666befcc.

Removing the include of sys/ptrace.h and threaddb.h exposed a few
places which were using time(2) or gettimeofday(2) without including
time.h or sys/time.h respectively and were relying on an include.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c
index 2fd9b523d8..55e8027d43 100644
--- a/tools/console/daemon/io.c
+++ b/tools/console/daemon/io.c
@@ -34,7 +34,7 @@
 #include <termios.h>
 #include <stdarg.h>
 #include <sys/mman.h>
-#include <sys/time.h>
+#include <time.h>
 #include <assert.h>
 #if defined(__NetBSD__) || defined(__OpenBSD__)
 #include <util.h>
diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index 98009fa862..e99050e4cb 100644
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -32,7 +32,7 @@ CTRL_SRCS-y       += xtl_logger_stdio.c
 CTRL_SRCS-$(CONFIG_X86) += xc_pagetab.c
 CTRL_SRCS-$(CONFIG_Linux) += xc_linux.c
 CTRL_SRCS-$(CONFIG_SunOS) += xc_solaris.c
-CTRL_SRCS-$(CONFIG_X86_Linux) += xc_ptrace.c xc_ptrace_core.c
+#CTRL_SRCS-$(CONFIG_X86_Linux) += xc_ptrace.c xc_ptrace_core.c
 CTRL_SRCS-$(CONFIG_NetBSD) += xc_netbsd.c
 CTRL_SRCS-$(CONFIG_MiniOS) += xc_minios.c
 
diff --git a/tools/libxc/xc_ptrace.h b/tools/libxc/xc_ptrace.h
index 7116ba0f82..2c6b728bd8 100644
--- a/tools/libxc/xc_ptrace.h
+++ b/tools/libxc/xc_ptrace.h
@@ -1,3 +1,5 @@
+#error xc_ptrace is disabled.
+
 #ifndef XC_PTRACE_
 #define XC_PTRACE_
 
diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h
index 2a67905db8..c561eff5c7 100644
--- a/tools/libxc/xenctrl.h
+++ b/tools/libxc/xenctrl.h
@@ -150,7 +150,7 @@ typedef struct xc_core_header {
 #define XC_CORE_MAGIC     0xF00FEBED
 #define XC_CORE_MAGIC_HVM 0xF00FEBEE
 
-#ifdef __linux__
+#if 0 /*def __linux__*/
 
 #include <sys/ptrace.h>
 #include <thread_db.h>
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index a29cabd54d..db55d61d60 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -25,6 +25,7 @@
 #include <sys/select.h>
 #include <sys/mman.h>
 #include <sys/wait.h>
+#include <sys/time.h>
 #include <signal.h>
 #include <unistd.h> /* for write, unlink and close */
 #include <stdint.h>
diff --git a/tools/libxl/xl.c b/tools/libxl/xl.c
index 237f6e6b12..a7f0d2d748 100644
--- a/tools/libxl/xl.c
+++ b/tools/libxl/xl.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/time.h> /* for time */
+#include <time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index bbc9bc6817..a25b78e7a6 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -21,10 +21,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/time.h> /* for time */
+#include <time.h>
 #include <getopt.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/time.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <sys/socket.h>
diff --git a/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c b/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c
index 4c4cb4f49d..9ec7c8736e 100644
--- a/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c
+++ b/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c
@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
+#include <sys/time.h>
 #include <signal.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/tools/xenpaging/xenpaging.c b/tools/xenpaging/xenpaging.c
index 31da5a49ed..72d131161b 100644
--- a/tools/xenpaging/xenpaging.c
+++ b/tools/xenpaging/xenpaging.c
@@ -23,6 +23,7 @@
 #include <inttypes.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <time.h>
 #include <xc_private.h>
 
 #include <xen/mem_event.h>