Vmi.patch
PATCH 4/5 Vmi.patch
VMI backend for paravirt-ops; fairly straightforward drop-in to paravirt-ops.
Signed-off-by Zachary Amsden <[email protected]>
arch/i386/Kconfig +9 -0
@@ -192,6 +192,15 @@ config PARAVIRT under a hypervisor, improving performance significantly. 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
arch/i386/kernel/Makefile +2 -0
@@ -39,6 +39,8 @@ obj-$(CONFIG_EARLY_PRINTK) += early_prin 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
@@ -360,7 +360,7 @@ 1: movb $1,X86_HARD_MATH * 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
@@ -1914,7 +1914,7 @@ static void __init setup_ioapic_ids_fromstatic 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
@@ -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
arch/i386/kernel/smpboot.c +4 -0
@@ -63,6 +63,7 @@#include <mach_apic.h> #include <mach_wakecpu.h> #include <smpboot_hooks.h> +#include <asm/vmi.h> /* Set if we find a B stepping CPU */ static int __devinitdata smp_b_stepping;
@@ -547,6 +548,9 @@ static void __devinit start_secondary(vo* booting is too fragile that we want to limit the * things done here to the most necessary things. */ +#ifdef CONFIG_VMI +vmi_bringup (); +#endif secondary_cpu_init ();preempt_disable ();smp_callin ();
arch/i386/mm/pgtable.c +2 -0
@@ -171,6 +171,8 @@ void reserve_top_address(unsigned long rvoid reserve_top_address (unsigned long reserve) {BUG_ON (fixmaps >0 ); +printk (KERN_INFO "Reserving virtual address space above 0x%08x\n" , + (int )-reserve);#ifdef CONFIG_COMPAT_VDSO BUG_ON (reserve !=0 );#else
include/asm-i386/timer.h +1 -0
@@ -8,6 +8,7 @@ void setup_pit_timer(void);/* Modifiers for buggy PIT handling */ extern int pit_latch_buggy;extern int timer_ack; +extern int no_timer_check;extern int recalibrate_cpu_khz (void );#endif
arch/i386/kernel/vmi.c new file +901 -0
901 lines not on this page · raw message
include/asm-i386/vmi.h new file +262 -0
262 lines not on this page · raw message