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

Commit 7ce0bcfd authored by Zachary Amsden's avatar Zachary Amsden Committed by Andi Kleen
Browse files

[PATCH] i386: vMI backend for paravirt-ops 



Fairly straightforward implementation of VMI backend for paravirt-ops.

[Adrian Bunk: some cleanups]

Signed-off-by: default avatarZachary Amsden <zach@vmware.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: Jeremy Fitzhardinge <jeremy@xensource.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
parent ae5da273

arch/i386/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -203,6 +203,15 @@ config PARAVIRT 
	  However, when run without a hypervisor the kernel is

	  theoretically slower.  If in doubt, say N.



config VMI

	bool "VMI Paravirt-ops support"

	depends on PARAVIRT

	default y

	help

	  VMI provides a paravirtualized interface to multiple hypervisors

	  include VMware ESX server and Xen by connecting to a ROM module

	  provided by the hypervisor.



config ACPI_SRAT

	bool

	default y

arch/i386/kernel/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o 
obj-$(CONFIG_HPET_TIMER) 	+= hpet.o

obj-$(CONFIG_K8_NB)		+= k8.o



obj-$(CONFIG_VMI)		+= vmi.o



# Make sure this is linked after any other paravirt_ops structs: see head.S

obj-$(CONFIG_PARAVIRT)		+= paravirt.o

arch/i386/kernel/head.S

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ check_x87: 
 * cpu_gdt_table and boot_pda; for secondary CPUs, these will be

 * that CPU's GDT and PDA.

 */

setup_pda:

ENTRY(setup_pda)

	/* get the PDA pointer */

	movl start_pda, %eax

arch/i386/kernel/io_apic.c

+1 −1
Original line number Diff line number Diff line
@@ -1920,7 +1920,7 @@ static void __init setup_ioapic_ids_from_mpc(void) 
static void __init setup_ioapic_ids_from_mpc(void) { }

#endif



static int no_timer_check __initdata;

int no_timer_check __initdata;



static int __init notimercheck(char *s)

{

arch/i386/kernel/setup.c

+9 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
#include <asm/io_apic.h>

#include <asm/ist.h>

#include <asm/io.h>

#include <asm/vmi.h>

#include <setup_arch.h>

#include <bios_ebda.h>
@@ -581,6 +582,14 @@ void __init setup_arch(char **cmdline_p) 


	max_low_pfn = setup_memory();



#ifdef CONFIG_VMI

	/*

	 * Must be after max_low_pfn is determined, and before kernel

	 * pagetables are setup.

	 */

	vmi_init();

#endif



	/*

	 * NOTE: before this point _nobody_ is allowed to allocate

	 * any memory using the bootmem allocator.  Although the