# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1248187661 -3600
# Node ID 054c8395b15d3c402246b55789f2b74734fc607e
# Parent 761caae284d0704e3a689cabe5e74df527a0db28
xsm: Move ACM_DEBUG and printkd() out of public header. They are
private to the ACM implementation within Xen.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
xen/include/public/xsm/acm.h | 12 ------------
xen/include/xsm/acm/acm_hooks.h | 13 ++++++++++++-
xen/xsm/acm/acm_core.c | 2 +-
3 files changed, 13 insertions(+), 14 deletions(-)
diff -r 761caae284d0 -r 054c8395b15d xen/include/public/xsm/acm.h
--- a/xen/include/public/xsm/acm.h Tue Jul 21 15:34:56 2009 +0100
+++ b/xen/include/public/xsm/acm.h Tue Jul 21 15:47:41 2009 +0100
@@ -27,18 +27,6 @@
#define _XEN_PUBLIC_ACM_H
#include "../xen.h"
-
-/* if ACM_DEBUG defined, all hooks should
- * print a short trace message (comment it out
- * when not in testing mode )
- */
-/* #define ACM_DEBUG */
-
-#ifdef ACM_DEBUG
-# define printkd(fmt, ...) printk(fmt, ##__VA_ARGS__)
-#else
-# define printkd(fmt, ...)
-#endif
/* default ssid reference value if not supplied */
#define ACM_DEFAULT_SSID 0x0
diff -r 761caae284d0 -r 054c8395b15d xen/include/xsm/acm/acm_hooks.h
--- a/xen/include/xsm/acm/acm_hooks.h Tue Jul 21 15:34:56 2009 +0100
+++ b/xen/include/xsm/acm/acm_hooks.h Tue Jul 21 15:47:41 2009 +0100
@@ -130,11 +130,22 @@ extern struct acm_operations *acm_second
/* #define ACM_TRACE_MODE */
#ifdef ACM_TRACE_MODE
-# define traceprintk(fmt, args...) printk(fmt,## args)
+# define traceprintk(fmt, args...) printk(fmt, ## args)
#else
# define traceprintk(fmt, args...)
#endif
+/* if ACM_DEBUG defined, all hooks should
+ * print a short trace message (comment it out
+ * when not in testing mode )
+ */
+/* #define ACM_DEBUG */
+
+#ifdef ACM_DEBUG
+# define printkd(fmt, args...) printk(fmt, ## args)
+#else
+# define printkd(fmt, args...)
+#endif
#ifndef ACM_SECURITY
diff -r 761caae284d0 -r 054c8395b15d xen/xsm/acm/acm_core.c
--- a/xen/xsm/acm/acm_core.c Tue Jul 21 15:34:56 2009 +0100
+++ b/xen/xsm/acm/acm_core.c Tue Jul 21 15:47:41 2009 +0100
@@ -38,7 +38,7 @@
* define/undefine this constant to receive / suppress any
* security hook debug output of sHype
*
- * include/public/xsm/acm.h defines a constant ACM_DEBUG
+ * include/xsm/acm/acm_hooks.h defines a constant ACM_DEBUG
* define/undefine this constant to receive non-hook-related
* debug output.
*/
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home