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: 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: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

authored by

Jeremy Fitzhardinge and committed by
Jesse Barnes 1ccbf534 9a08f7d3

+54 -27
-27
arch/x86/include/asm/xen/hypervisor.h
··· 37 37 extern struct shared_info *HYPERVISOR_shared_info; 38 38 extern struct start_info *xen_start_info; 39 39 40 - enum xen_domain_type { 41 - XEN_NATIVE, /* running on bare hardware */ 42 - XEN_PV_DOMAIN, /* running in a PV domain */ 43 - XEN_HVM_DOMAIN, /* running in a Xen hvm domain */ 44 - }; 45 - 46 - #ifdef CONFIG_XEN 47 - extern enum xen_domain_type xen_domain_type; 48 - #else 49 - #define xen_domain_type XEN_NATIVE 50 - #endif 51 - 52 - #define xen_domain() (xen_domain_type != XEN_NATIVE) 53 - #define xen_pv_domain() (xen_domain() && \ 54 - xen_domain_type == XEN_PV_DOMAIN) 55 - #define xen_hvm_domain() (xen_domain() && \ 56 - xen_domain_type == XEN_HVM_DOMAIN) 57 - 58 - #ifdef CONFIG_XEN_DOM0 59 - #include <xen/interface/xen.h> 60 - 61 - #define xen_initial_domain() (xen_pv_domain() && \ 62 - xen_start_info->flags & SIF_INITDOMAIN) 63 - #else /* !CONFIG_XEN_DOM0 */ 64 - #define xen_initial_domain() (0) 65 - #endif /* CONFIG_XEN_DOM0 */ 66 - 67 40 #endif /* _ASM_X86_XEN_HYPERVISOR_H */
+1
arch/x86/xen/enlighten.c
··· 28 28 #include <linux/highmem.h> 29 29 #include <linux/console.h> 30 30 31 + #include <xen/xen.h> 31 32 #include <xen/interface/xen.h> 32 33 #include <xen/interface/version.h> 33 34 #include <xen/interface/physdev.h>
+1
drivers/block/xen-blkfront.c
··· 42 42 #include <linux/module.h> 43 43 #include <linux/scatterlist.h> 44 44 45 + #include <xen/xen.h> 45 46 #include <xen/xenbus.h> 46 47 #include <xen/grant_table.h> 47 48 #include <xen/events.h>
+2
drivers/char/hvc_xen.c
··· 25 25 #include <linux/types.h> 26 26 27 27 #include <asm/xen/hypervisor.h> 28 + 29 + #include <xen/xen.h> 28 30 #include <xen/page.h> 29 31 #include <xen/events.h> 30 32 #include <xen/interface/io/console.h>
+3
drivers/input/xen-kbdfront.c
··· 21 21 #include <linux/errno.h> 22 22 #include <linux/module.h> 23 23 #include <linux/input.h> 24 + 24 25 #include <asm/xen/hypervisor.h> 26 + 27 + #include <xen/xen.h> 25 28 #include <xen/events.h> 26 29 #include <xen/page.h> 27 30 #include <xen/interface/io/fbif.h>
+1
drivers/net/xen-netfront.c
··· 42 42 #include <linux/mm.h> 43 43 #include <net/ip.h> 44 44 45 + #include <xen/xen.h> 45 46 #include <xen/xenbus.h> 46 47 #include <xen/events.h> 47 48 #include <xen/page.h>
+3
drivers/video/xen-fbfront.c
··· 25 25 #include <linux/module.h> 26 26 #include <linux/vmalloc.h> 27 27 #include <linux/mm.h> 28 + 28 29 #include <asm/xen/hypervisor.h> 30 + 31 + #include <xen/xen.h> 29 32 #include <xen/events.h> 30 33 #include <xen/page.h> 31 34 #include <xen/interface/io/fbif.h>
+2
drivers/xen/balloon.c
··· 52 52 53 53 #include <asm/xen/hypervisor.h> 54 54 #include <asm/xen/hypercall.h> 55 + 56 + #include <xen/xen.h> 55 57 #include <xen/interface/xen.h> 56 58 #include <xen/interface/memory.h> 57 59 #include <xen/xenbus.h>
+1
drivers/xen/cpu_hotplug.c
··· 1 1 #include <linux/notifier.h> 2 2 3 + #include <xen/xen.h> 3 4 #include <xen/xenbus.h> 4 5 5 6 #include <asm/xen/hypervisor.h>
+2
drivers/xen/evtchn.c
··· 48 48 #include <linux/gfp.h> 49 49 #include <linux/mutex.h> 50 50 #include <linux/cpu.h> 51 + 52 + #include <xen/xen.h> 51 53 #include <xen/events.h> 52 54 #include <xen/evtchn.h> 53 55 #include <asm/xen/hypervisor.h>
+1
drivers/xen/grant-table.c
··· 37 37 #include <linux/vmalloc.h> 38 38 #include <linux/uaccess.h> 39 39 40 + #include <xen/xen.h> 40 41 #include <xen/interface/xen.h> 41 42 #include <xen/page.h> 42 43 #include <xen/grant_table.h>
+1
drivers/xen/sys-hypervisor.c
··· 14 14 #include <asm/xen/hypervisor.h> 15 15 #include <asm/xen/hypercall.h> 16 16 17 + #include <xen/xen.h> 17 18 #include <xen/xenbus.h> 18 19 #include <xen/interface/xen.h> 19 20 #include <xen/interface/version.h>
+2
drivers/xen/xenbus/xenbus_probe.c
··· 49 49 #include <asm/page.h> 50 50 #include <asm/pgtable.h> 51 51 #include <asm/xen/hypervisor.h> 52 + 53 + #include <xen/xen.h> 52 54 #include <xen/xenbus.h> 53 55 #include <xen/events.h> 54 56 #include <xen/page.h>
+2
drivers/xen/xenfs/super.c
··· 13 13 #include <linux/fs.h> 14 14 #include <linux/magic.h> 15 15 16 + #include <xen/xen.h> 17 + 16 18 #include "xenfs.h" 17 19 18 20 #include <asm/xen/hypervisor.h>
+32
include/xen/xen.h
··· 1 + #ifndef _XEN_XEN_H 2 + #define _XEN_XEN_H 3 + 4 + enum xen_domain_type { 5 + XEN_NATIVE, /* running on bare hardware */ 6 + XEN_PV_DOMAIN, /* running in a PV domain */ 7 + XEN_HVM_DOMAIN, /* running in a Xen hvm domain */ 8 + }; 9 + 10 + #ifdef CONFIG_XEN 11 + extern enum xen_domain_type xen_domain_type; 12 + #else 13 + #define xen_domain_type XEN_NATIVE 14 + #endif 15 + 16 + #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) 21 + 22 + #ifdef CONFIG_XEN_DOM0 23 + #include <xen/interface/xen.h> 24 + #include <asm/xen/hypervisor.h> 25 + 26 + #define xen_initial_domain() (xen_pv_domain() && \ 27 + xen_start_info->flags & SIF_INITDOMAIN) 28 + #else /* !CONFIG_XEN_DOM0 */ 29 + #define xen_initial_domain() (0) 30 + #endif /* CONFIG_XEN_DOM0 */ 31 + 32 + #endif /* _XEN_XEN_H */