Re: [Xen-devel] [PATCH] x86/p2m: drop redundant macro definitions

[Keir Fraser <keir@xxxxxxx>]

On 06/12/2012 12:59, "Jan Beulich" <JBeulich@xxxxxxxx> wrote:

> Also, add log level indicator to P2M_ERROR(), and drop pointless
> underscores from all related macros' parameter names.
> 
> Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>

Acked-by: Keir Fraser <keir@xxxxxxx>

> --- a/xen/arch/x86/mm/p2m.c
> +++ b/xen/arch/x86/mm/p2m.c
> @@ -46,18 +46,6 @@ boolean_param("hap_1gb", opt_hap_1gb);
>  bool_t __read_mostly opt_hap_2mb = 1;
>  boolean_param("hap_2mb", opt_hap_2mb);
>  
> -/* Printouts */
> -#define P2M_PRINTK(_f, _a...)                                \
> -    debugtrace_printk("p2m: %s(): " _f, __func__, ##_a)
> -#define P2M_ERROR(_f, _a...)                                 \
> -    printk("pg error: %s(): " _f, __func__, ##_a)
> -#if P2M_DEBUGGING
> -#define P2M_DEBUG(_f, _a...)                                 \
> -    debugtrace_printk("p2mdebug: %s(): " _f, __func__, ##_a)
> -#else
> -#define P2M_DEBUG(_f, _a...) do { (void)(_f); } while(0)
> -#endif
> -
>  
>  /* Override macros from asm/page.h to make them work with mfn_t */
>  #undef mfn_to_page
> --- a/xen/include/asm-x86/p2m.h
> +++ b/xen/include/asm-x86/p2m.h
> @@ -607,15 +607,15 @@ extern void audit_p2m(struct domain *d,
>  #endif /* P2M_AUDIT */
>  
>  /* Printouts */
> -#define P2M_PRINTK(_f, _a...)                                \
> -    debugtrace_printk("p2m: %s(): " _f, __func__, ##_a)
> -#define P2M_ERROR(_f, _a...)                                 \
> -    printk("pg error: %s(): " _f, __func__, ##_a)
> +#define P2M_PRINTK(f, a...)                                \
> +    debugtrace_printk("p2m: %s(): " f, __func__, ##a)
> +#define P2M_ERROR(f, a...)                                 \
> +    printk(XENLOG_G_ERR "pg error: %s(): " f, __func__, ##a)
>  #if P2M_DEBUGGING
> -#define P2M_DEBUG(_f, _a...)                                 \
> -    debugtrace_printk("p2mdebug: %s(): " _f, __func__, ##_a)
> +#define P2M_DEBUG(f, a...)                                 \
> +    debugtrace_printk("p2mdebug: %s(): " f, __func__, ##a)
>  #else
> -#define P2M_DEBUG(_f, _a...) do { (void)(_f); } while(0)
> +#define P2M_DEBUG(f, a...) do { (void)(f); } while(0)
>  #endif
>  
>  /* Called by p2m code when demand-populating a PoD page */
> 
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@xxxxxxxxxxxxx
> http://lists.xen.org/xen-devel



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel