[Xen-changelog] [xen-3.4-testing] xsm: Move ACM_DEBUG and printkd() out of public header. They are

["Xen patchbot-3.4-testing" <patchbot-3.4-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1248336458 -3600
# Node ID e04ffc81f6ef218f0a458bbf9d93186ab57a624e
# Parent  593fbe7cc87c2bbceec6e229492f4531290fa254
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-unstable changeset:   19968:054c8395b15d
xen-unstable date:        Tue Jul 21 15:47:41 2009 +0100
---
 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 593fbe7cc87c -r e04ffc81f6ef xen/include/public/xsm/acm.h
--- a/xen/include/public/xsm/acm.h      Thu Jul 23 09:07:00 2009 +0100
+++ b/xen/include/public/xsm/acm.h      Thu Jul 23 09:07:38 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, args...) printk(fmt,## args)
-#else
-#  define printkd(fmt, args...)
-#endif
 
 /* default ssid reference value if not supplied */
 #define ACM_DEFAULT_SSID  0x0
diff -r 593fbe7cc87c -r e04ffc81f6ef xen/include/xsm/acm/acm_hooks.h
--- a/xen/include/xsm/acm/acm_hooks.h   Thu Jul 23 09:07:00 2009 +0100
+++ b/xen/include/xsm/acm/acm_hooks.h   Thu Jul 23 09:07:38 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 593fbe7cc87c -r e04ffc81f6ef xen/xsm/acm/acm_core.c
--- a/xen/xsm/acm/acm_core.c    Thu Jul 23 09:07:00 2009 +0100
+++ b/xen/xsm/acm/acm_core.c    Thu Jul 23 09:07:38 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