[PATCH] xen: cleanup for xen_pv_domain()/xen_hvm_domain()

[PATCH] xen: cleanup for xen_pv_domain()/xen_hvm_domain()

[Xiao Guangrong]

Remove unnecessary judgment in xen_pv_domain() and xen_hvm_domain()

Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
---
 arch/x86/include/asm/xen/hypervisor.h |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/x86/include/asm/xen/hypervisor.h b/arch/x86/include/asm/xen/hypervisor.h
index d5b7e90..f94bd0a 100644
--- a/arch/x86/include/asm/xen/hypervisor.h
+++ b/arch/x86/include/asm/xen/hypervisor.h
@@ -50,10 +50,8 @@ extern enum xen_domain_type xen_domain_type;
 #endif
 
 #define xen_domain()		(xen_domain_type != XEN_NATIVE)
-#define xen_pv_domain()		(xen_domain() &&			\
-				 xen_domain_type == XEN_PV_DOMAIN)
-#define xen_hvm_domain()	(xen_domain() &&			\
-				 xen_domain_type == XEN_HVM_DOMAIN)
+#define xen_pv_domain()		(xen_domain_type == XEN_PV_DOMAIN)
+#define xen_hvm_domain()	(xen_domain_type == XEN_HVM_DOMAIN)
 
 #ifdef CONFIG_XEN_DOM0
 #include <xen/interface/xen.h>
-- 
1.6.1.2

Re: [PATCH] xen: cleanup for xen_pv_domain()/xen_hvm_domain()

[Jeremy Fitzhardinge]

On 11/29/09 22:17, Xiao Guangrong wrote:
> Remove unnecessary judgment in xen_pv_domain() and xen_hvm_domain()
>   

I'd prefer not to change it.  These changes make no difference to the
generated code, and I see a small semantic difference between "is this a
Xen domain?" and "what kind of Xen domain is it?", as the latter on
really makes sense if it is in fact a Xen domain; the fact that
xen_domain() is also implemented in terms of xen_domain_type is just a
detail.

    J

> Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
> ---
>  arch/x86/include/asm/xen/hypervisor.h |    6 ++----
>  1 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/arch/x86/include/asm/xen/hypervisor.h b/arch/x86/include/asm/xen/hypervisor.h
> index d5b7e90..f94bd0a 100644
> --- a/arch/x86/include/asm/xen/hypervisor.h
> +++ b/arch/x86/include/asm/xen/hypervisor.h
> @@ -50,10 +50,8 @@ extern enum xen_domain_type xen_domain_type;
>  #endif
>  
>  #define xen_domain()		(xen_domain_type != XEN_NATIVE)
> -#define xen_pv_domain()		(xen_domain() &&			\
> -				 xen_domain_type == XEN_PV_DOMAIN)
> -#define xen_hvm_domain()	(xen_domain() &&			\
> -				 xen_domain_type == XEN_HVM_DOMAIN)
> +#define xen_pv_domain()		(xen_domain_type == XEN_PV_DOMAIN)
> +#define xen_hvm_domain()	(xen_domain_type == XEN_HVM_DOMAIN)
>  
>  #ifdef CONFIG_XEN_DOM0
>  #include <xen/interface/xen.h>
>