diff options
| author | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-08-31 12:05:07 +0100 |
|---|---|---|
| committer | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-08-31 12:05:07 +0100 |
| commit | 61c6564d34361efda2d134145f3ce39796b23ed1 (patch) | |
| tree | 4d6f5196f90c41ce349193d09c99a2e3a48177da /tools | |
| parent | 670a6002b949ebb60f7cb3e5d950e163d9314859 (diff) | |
| download | xen-61c6564d34361efda2d134145f3ce39796b23ed1.tar.gz xen-61c6564d34361efda2d134145f3ce39796b23ed1.tar.bz2 xen-61c6564d34361efda2d134145f3ce39796b23ed1.zip | |
Cleanups after XSM checkin.
Signed-off-by: Keir Fraser <keir@xensource.com>
--HG--
rename : xen/include/public/acm.h => xen/include/public/xsm/acm.h
rename : xen/include/public/acm_ops.h => xen/include/public/xsm/acm_ops.h
rename : xen/include/acm/acm_core.h => xen/include/xsm/acm/acm_core.h
rename : xen/include/acm/acm_endian.h => xen/include/xsm/acm/acm_endian.h
rename : xen/include/acm/acm_hooks.h => xen/include/xsm/acm/acm_hooks.h
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Rules.mk | 2 | ||||
| -rw-r--r-- | tools/libxc/xenctrl.h | 4 | ||||
| -rw-r--r-- | tools/python/xen/lowlevel/acm/acm.c | 5 | ||||
| -rw-r--r-- | tools/security/secpol_tool.c | 4 | ||||
| -rw-r--r-- | tools/security/secpol_xml2bin.c | 3 |
5 files changed, 11 insertions, 7 deletions
diff --git a/tools/Rules.mk b/tools/Rules.mk index 4d0b193a53..aab715989b 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -49,6 +49,8 @@ mk-symlinks: ( cd xen/hvm && ln -sf ../../$(XEN_ROOT)/xen/include/public/hvm/*.h . ) mkdir -p xen/io ( cd xen/io && ln -sf ../../$(XEN_ROOT)/xen/include/public/io/*.h . ) + mkdir -p xen/xsm + ( cd xen/xsm && ln -sf ../../$(XEN_ROOT)/xen/include/public/xsm/*.h . ) mkdir -p xen/arch-x86 ( cd xen/arch-x86 && ln -sf ../../$(XEN_ROOT)/xen/include/public/arch-x86/*.h . ) mkdir -p xen/foreign diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index 73ff16c2cf..591e6c25a3 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -26,8 +26,8 @@ #include <xen/event_channel.h> #include <xen/sched.h> #include <xen/memory.h> -#include <xen/acm.h> -#include <xen/acm_ops.h> +#include <xen/xsm/acm.h> +#include <xen/xsm/acm_ops.h> #ifdef __ia64__ #define XC_PAGE_SHIFT 14 diff --git a/tools/python/xen/lowlevel/acm/acm.c b/tools/python/xen/lowlevel/acm/acm.c index 9b59ea48ed..0a37ba3d92 100644 --- a/tools/python/xen/lowlevel/acm/acm.c +++ b/tools/python/xen/lowlevel/acm/acm.c @@ -18,6 +18,7 @@ * * indent -i4 -kr -nut */ + #include <Python.h> #include <stdio.h> @@ -27,8 +28,8 @@ #include <stdlib.h> #include <sys/ioctl.h> #include <netinet/in.h> -#include <xen/acm.h> -#include <xen/acm_ops.h> +#include <xen/xsm/acm.h> +#include <xen/xsm/acm_ops.h> #include <xenctrl.h> diff --git a/tools/security/secpol_tool.c b/tools/security/secpol_tool.c index 9845ef6bb4..14b4bcc73d 100644 --- a/tools/security/secpol_tool.c +++ b/tools/security/secpol_tool.c @@ -34,8 +34,8 @@ #include <string.h> #include <netinet/in.h> #include <stdint.h> -#include <xen/acm.h> -#include <xen/acm_ops.h> +#include <xen/xsm/acm.h> +#include <xen/xsm/acm_ops.h> #include <xenctrl.h> diff --git a/tools/security/secpol_xml2bin.c b/tools/security/secpol_xml2bin.c index 98ef3e1af3..0fbe8efcbd 100644 --- a/tools/security/secpol_xml2bin.c +++ b/tools/security/secpol_xml2bin.c @@ -22,6 +22,7 @@ * * indent -i4 -kr -nut */ + #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -38,7 +39,7 @@ #include <libxml/tree.h> #include <libxml/xmlreader.h> #include <stdint.h> -#include <xen/acm.h> +#include <xen/xsm/acm.h> #include "secpol_xml2bin.h" |