debuggers.hg

changeset 20006:054c8395b15d

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@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Jul 21 15:47:41 2009 +0100 (2009-07-21)
parents 761caae284d0
children 6e8f7f2a8f38
files xen/include/public/xsm/acm.h xen/include/xsm/acm/acm_hooks.h xen/xsm/acm/acm_core.c
line diff
     1.1 --- a/xen/include/public/xsm/acm.h	Tue Jul 21 15:34:56 2009 +0100
     1.2 +++ b/xen/include/public/xsm/acm.h	Tue Jul 21 15:47:41 2009 +0100
     1.3 @@ -28,18 +28,6 @@
     1.4  
     1.5  #include "../xen.h"
     1.6  
     1.7 -/* if ACM_DEBUG defined, all hooks should
     1.8 - * print a short trace message (comment it out
     1.9 - * when not in testing mode )
    1.10 - */
    1.11 -/* #define ACM_DEBUG */
    1.12 -
    1.13 -#ifdef ACM_DEBUG
    1.14 -#  define printkd(fmt, ...) printk(fmt, ##__VA_ARGS__)
    1.15 -#else
    1.16 -#  define printkd(fmt, ...)
    1.17 -#endif
    1.18 -
    1.19  /* default ssid reference value if not supplied */
    1.20  #define ACM_DEFAULT_SSID  0x0
    1.21  #define ACM_DEFAULT_LOCAL_SSID  0x0
     2.1 --- a/xen/include/xsm/acm/acm_hooks.h	Tue Jul 21 15:34:56 2009 +0100
     2.2 +++ b/xen/include/xsm/acm/acm_hooks.h	Tue Jul 21 15:47:41 2009 +0100
     2.3 @@ -130,11 +130,22 @@ extern struct acm_operations *acm_second
     2.4  /* #define ACM_TRACE_MODE */
     2.5  
     2.6  #ifdef ACM_TRACE_MODE
     2.7 -# define traceprintk(fmt, args...) printk(fmt,## args)
     2.8 +# define traceprintk(fmt, args...) printk(fmt, ## args)
     2.9  #else
    2.10  # define traceprintk(fmt, args...)
    2.11  #endif
    2.12  
    2.13 +/* if ACM_DEBUG defined, all hooks should
    2.14 + * print a short trace message (comment it out
    2.15 + * when not in testing mode )
    2.16 + */
    2.17 +/* #define ACM_DEBUG */
    2.18 +
    2.19 +#ifdef ACM_DEBUG
    2.20 +#  define printkd(fmt, args...) printk(fmt, ## args)
    2.21 +#else
    2.22 +#  define printkd(fmt, args...)
    2.23 +#endif
    2.24  
    2.25  #ifndef ACM_SECURITY
    2.26  
     3.1 --- a/xen/xsm/acm/acm_core.c	Tue Jul 21 15:34:56 2009 +0100
     3.2 +++ b/xen/xsm/acm/acm_core.c	Tue Jul 21 15:47:41 2009 +0100
     3.3 @@ -38,7 +38,7 @@
     3.4   *   define/undefine this constant to receive / suppress any
     3.5   *   security hook debug output of sHype
     3.6   *
     3.7 - *   include/public/xsm/acm.h defines a constant ACM_DEBUG
     3.8 + *   include/xsm/acm/acm_hooks.h defines a constant ACM_DEBUG
     3.9   *   define/undefine this constant to receive non-hook-related
    3.10   *   debug output.
    3.11   */