Commit ca65f9fc authored by Stefano Stabellini's avatar Stefano Stabellini Committed by Jeremy Fitzhardinge
Browse files

Introduce CONFIG_XEN_PVHVM compile option 



This patch introduce a CONFIG_XEN_PVHVM compile time option to
enable/disable Xen PV on HVM support.

Signed-off-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
parent b98a409b

arch/x86/kernel/cpu/hypervisor.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static const __initconst struct hypervisor_x86 * const hypervisors[] = 
{

	&x86_hyper_vmware,

	&x86_hyper_ms_hyperv,

#ifdef CONFIG_XEN

#ifdef CONFIG_XEN_PVHVM

	&x86_hyper_xen_hvm,

#endif

};

arch/x86/xen/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -13,6 +13,11 @@ config XEN 
	  kernel to boot in a paravirtualized environment under the

	  Xen hypervisor.



config XEN_PVHVM

	def_bool y

	depends on XEN

	depends on X86_LOCAL_APIC



config XEN_MAX_DOMAIN_MEMORY

       int "Maximum allowed size of a domain in gigabytes"

       default 8 if X86_32

arch/x86/xen/enlighten.c

+2 −0
Original line number Diff line number Diff line
@@ -1282,6 +1282,7 @@ void xen_hvm_init_shared_info(void) 
	}

}



#ifdef CONFIG_XEN_PVHVM

static int __cpuinit xen_hvm_cpu_notify(struct notifier_block *self,

				    unsigned long action, void *hcpu)

{
@@ -1338,3 +1339,4 @@ const __refconst struct hypervisor_x86 x86_hyper_xen_hvm = { 
	.init_platform		= xen_hvm_guest_init,

};

EXPORT_SYMBOL(x86_hyper_xen_hvm);

#endif

arch/x86/xen/mmu.c

+2 −0
Original line number Diff line number Diff line
@@ -1942,6 +1942,7 @@ void __init xen_init_mmu_ops(void) 
	pv_mmu_ops = xen_mmu_ops;

}



#ifdef CONFIG_XEN_PVHVM

static void xen_hvm_exit_mmap(struct mm_struct *mm)

{

	struct xen_hvm_pagetable_dying a;
@@ -1973,6 +1974,7 @@ void __init xen_hvm_init_mmu_ops(void) 
	if (is_pagetable_dying_supported())

		pv_mmu_ops.exit_mmap = xen_hvm_exit_mmap;

}

#endif



#ifdef CONFIG_XEN_DEBUG_FS

arch/x86/xen/platform-pci-unplug.c

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
/* store the value of xen_emul_unplug after the unplug is done */

int xen_platform_pci_unplug;

EXPORT_SYMBOL_GPL(xen_platform_pci_unplug);

#ifdef CONFIG_XEN_PVHVM

static int xen_emul_unplug;



static int __init check_platform_magic(void)
@@ -133,3 +134,4 @@ static int __init parse_xen_emul_unplug(char *arg) 
	return 0;

}

early_param("xen_emul_unplug", parse_xen_emul_unplug);

#endif