Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ccbf534 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Jesse Barnes
Browse files

xen: move Xen-testing predicates to common header 



Move xen_domain and related tests out of asm-x86 to xen/xen.h so they
can be included whenever they are necessary.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 9a08f7d3

arch/x86/include/asm/xen/hypervisor.h

+0 −27
Original line number Original line Diff line number Diff line
@@ -37,31 +37,4 @@ 
extern struct shared_info *HYPERVISOR_shared_info;

extern struct shared_info *HYPERVISOR_shared_info;

extern struct start_info *xen_start_info;

extern struct start_info *xen_start_info;





enum xen_domain_type {

	XEN_NATIVE,		/* running on bare hardware    */

	XEN_PV_DOMAIN,		/* running in a PV domain      */

	XEN_HVM_DOMAIN,		/* running in a Xen hvm domain */

};



#ifdef CONFIG_XEN

extern enum xen_domain_type xen_domain_type;

#else

#define xen_domain_type		XEN_NATIVE

#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)



#ifdef CONFIG_XEN_DOM0

#include <xen/interface/xen.h>



#define xen_initial_domain()	(xen_pv_domain() && \

				 xen_start_info->flags & SIF_INITDOMAIN)

#else  /* !CONFIG_XEN_DOM0 */

#define xen_initial_domain()	(0)

#endif	/* CONFIG_XEN_DOM0 */



#endif /* _ASM_X86_XEN_HYPERVISOR_H */
 
#endif /* _ASM_X86_XEN_HYPERVISOR_H */

arch/x86/xen/enlighten.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/highmem.h>

#include <linux/highmem.h>

#include <linux/console.h>

#include <linux/console.h>





#include <xen/xen.h>

#include <xen/interface/xen.h>

#include <xen/interface/xen.h>

#include <xen/interface/version.h>

#include <xen/interface/version.h>

#include <xen/interface/physdev.h>

#include <xen/interface/physdev.h>

drivers/block/xen-blkfront.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include <linux/module.h>

#include <linux/module.h>

#include <linux/scatterlist.h>

#include <linux/scatterlist.h>





#include <xen/xen.h>

#include <xen/xenbus.h>

#include <xen/xenbus.h>

#include <xen/grant_table.h>

#include <xen/grant_table.h>

#include <xen/events.h>

#include <xen/events.h>

drivers/char/hvc_xen.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,8 @@ 
#include <linux/types.h>

#include <linux/types.h>





#include <asm/xen/hypervisor.h>

#include <asm/xen/hypervisor.h>



#include <xen/xen.h>

#include <xen/page.h>

#include <xen/page.h>

#include <xen/events.h>

#include <xen/events.h>

#include <xen/interface/io/console.h>

#include <xen/interface/io/console.h>

drivers/input/xen-kbdfront.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -21,7 +21,10 @@ 
#include <linux/errno.h>

#include <linux/errno.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/input.h>

#include <linux/input.h>



#include <asm/xen/hypervisor.h>

#include <asm/xen/hypervisor.h>



#include <xen/xen.h>

#include <xen/events.h>

#include <xen/events.h>

#include <xen/page.h>

#include <xen/page.h>

#include <xen/interface/io/fbif.h>

#include <xen/interface/io/fbif.h>