tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

xen: cleanup xen.h

The macros for testing domain types are more complicated then they
need to. Simplify them.

Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>

authored by

Juergen Gross and committed by
Boris Ostrovsky b4feaeb0 42d3078a

+9 -11
+9 -11
include/xen/xen.h
··· 13 13 #define xen_domain_type XEN_NATIVE 14 14 #endif 15 15 16 + #ifdef CONFIG_XEN_PVH 17 + extern bool xen_pvh; 18 + #else 19 + #define xen_pvh 0 20 + #endif 21 + 16 22 #define xen_domain() (xen_domain_type != XEN_NATIVE) 17 - #define xen_pv_domain() (xen_domain() && \ 18 - xen_domain_type == XEN_PV_DOMAIN) 19 - #define xen_hvm_domain() (xen_domain() && \ 20 - xen_domain_type == XEN_HVM_DOMAIN) 23 + #define xen_pv_domain() (xen_domain_type == XEN_PV_DOMAIN) 24 + #define xen_hvm_domain() (xen_domain_type == XEN_HVM_DOMAIN) 25 + #define xen_pvh_domain() (xen_pvh) 21 26 22 27 #ifdef CONFIG_XEN_DOM0 23 28 #include <xen/interface/xen.h> ··· 33 28 #else /* !CONFIG_XEN_DOM0 */ 34 29 #define xen_initial_domain() (0) 35 30 #endif /* CONFIG_XEN_DOM0 */ 36 - 37 - #ifdef CONFIG_XEN_PVH 38 - extern bool xen_pvh; 39 - #define xen_pvh_domain() (xen_hvm_domain() && xen_pvh) 40 - #else 41 - #define xen_pvh_domain() (0) 42 - #endif 43 31 44 32 #endif /* _XEN_XEN_H */