aboutsummaryrefslogtreecommitdiffstats
path: root/include/xen/xen.h
diff options
context:
space:
mode:
authorJuergen Gross <jgross@suse.com>2017-07-27 17:11:58 +0200
committerBoris Ostrovsky <boris.ostrovsky@oracle.com>2017-08-31 09:45:55 -0400
commitb4feaeb036b2e0f715e0d05ae84da01c6696a75f (patch)
tree400fc9acff53b91a46d1de8926405ce6ae96b9a3 /include/xen/xen.h
parentxen: introduce a Kconfig option to enable the pvcalls backend (diff)
downloadlinux-dev-b4feaeb036b2e0f715e0d05ae84da01c6696a75f.tar.xz
linux-dev-b4feaeb036b2e0f715e0d05ae84da01c6696a75f.zip
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>
Diffstat (limited to 'include/xen/xen.h')
-rw-r--r--include/xen/xen.h20
1 files changed, 9 insertions, 11 deletions
diff --git a/include/xen/xen.h b/include/xen/xen.h
index 6e8b7fc79801..28c59ca529d7 100644
--- a/include/xen/xen.h
+++ b/include/xen/xen.h
@@ -13,11 +13,16 @@ extern enum xen_domain_type xen_domain_type;
#define xen_domain_type XEN_NATIVE
#endif
+#ifdef CONFIG_XEN_PVH
+extern bool xen_pvh;
+#else
+#define xen_pvh 0
+#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)
+#define xen_pvh_domain() (xen_pvh)
#ifdef CONFIG_XEN_DOM0
#include <xen/interface/xen.h>
@@ -29,11 +34,4 @@ extern enum xen_domain_type xen_domain_type;
#define xen_initial_domain() (0)
#endif /* CONFIG_XEN_DOM0 */
-#ifdef CONFIG_XEN_PVH
-extern bool xen_pvh;
-#define xen_pvh_domain() (xen_hvm_domain() && xen_pvh)
-#else
-#define xen_pvh_domain() (0)
-#endif
-
#endif /* _XEN_XEN_H */