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

Commit 5e57f1d6 authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Juergen Gross
Browse files

x86/xen: add CONFIG_XEN_PV to Kconfig 



All code to support Xen PV will get under this new option. For the
beginning, check for it in the common code.

Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
parent 52519f2a

arch/x86/kernel/cpu/hypervisor.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -28,8 +28,10 @@ 




static const __initconst struct hypervisor_x86 * const hypervisors[] =

static const __initconst struct hypervisor_x86 * const hypervisors[] =

{

{

#ifdef CONFIG_XEN

#ifdef CONFIG_XEN_PV

	&x86_hyper_xen_pv,

	&x86_hyper_xen_pv,

#endif

#ifdef CONFIG_XEN_PVHVM

	&x86_hyper_xen_hvm,

	&x86_hyper_xen_hvm,

#endif

#endif

	&x86_hyper_vmware,

	&x86_hyper_vmware,

arch/x86/kernel/process_64.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -446,7 +446,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) 
		     task_thread_info(prev_p)->flags & _TIF_WORK_CTXSW_PREV))

		     task_thread_info(prev_p)->flags & _TIF_WORK_CTXSW_PREV))

		__switch_to_xtra(prev_p, next_p, tss);

		__switch_to_xtra(prev_p, next_p, tss);





#ifdef CONFIG_XEN

#ifdef CONFIG_XEN_PV

	/*

	/*

	 * On Xen PV, IOPL bits in pt_regs->flags have no effect, and

	 * On Xen PV, IOPL bits in pt_regs->flags have no effect, and

	 * current_pt_regs()->flags may not match the current task's

	 * current_pt_regs()->flags may not match the current task's

arch/x86/xen/Kconfig

+18 −5
Original line number Original line Diff line number Diff line
@@ -6,7 +6,6 @@ config XEN 
	bool "Xen guest support"

	bool "Xen guest support"

	depends on PARAVIRT

	depends on PARAVIRT

	select PARAVIRT_CLOCK

	select PARAVIRT_CLOCK

	select XEN_HAVE_PVMMU

	select XEN_HAVE_VPMU

	select XEN_HAVE_VPMU

	depends on X86_64 || (X86_32 && X86_PAE)

	depends on X86_64 || (X86_32 && X86_PAE)

	depends on X86_LOCAL_APIC && X86_TSC

	depends on X86_LOCAL_APIC && X86_TSC
@@ -15,18 +14,32 @@ config XEN 
	  kernel to boot in a paravirtualized environment under the

	  kernel to boot in a paravirtualized environment under the

	  Xen hypervisor.

	  Xen hypervisor.





config XEN_PV

	bool "Xen PV guest support"

	default y

	depends on XEN

	select XEN_HAVE_PVMMU

	help

	  Support running as a Xen PV guest.



config XEN_DOM0

config XEN_DOM0

	def_bool y

	bool "Xen PV Dom0 support"

	depends on XEN && PCI_XEN && SWIOTLB_XEN

	default y

	depends on XEN_PV && PCI_XEN && SWIOTLB_XEN

	depends on X86_IO_APIC && ACPI && PCI

	depends on X86_IO_APIC && ACPI && PCI

	help

	  Support running as a Xen PV Dom0 guest.





config XEN_PVHVM

config XEN_PVHVM

	def_bool y

	bool "Xen PVHVM guest support"

	default y

	depends on XEN && PCI && X86_LOCAL_APIC

	depends on XEN && PCI && X86_LOCAL_APIC

	help

	  Support running as a Xen PVHVM guest.





config XEN_512GB

config XEN_512GB

	bool "Limit Xen pv-domain memory to 512GB"

	bool "Limit Xen pv-domain memory to 512GB"

	depends on XEN && X86_64

	depends on XEN_PV && X86_64

	default y

	default y

	help

	help

	  Limit paravirtualized user domains to 512GB of RAM.

	  Limit paravirtualized user domains to 512GB of RAM.