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

Commit 2c57ee6f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm: (249 commits)
  KVM: Move apic timer migration away from critical section
  KVM: Put kvm_para.h include outside __KERNEL__
  KVM: Fix unbounded preemption latency
  KVM: Initialize the mmu caches only after verifying cpu support
  KVM: MMU: Fix dirty page setting for pages removed from rmap
  KVM: Portability: Move kvm_fpu to asm-x86/kvm.h
  KVM: x86 emulator: Only allow VMCALL/VMMCALL trapped by #UD
  KVM: MMU: Merge shadow level check in FNAME(fetch)
  KVM: MMU: Move kvm_free_some_pages() into critical section
  KVM: MMU: Switch to mmu spinlock
  KVM: MMU: Avoid calling gfn_to_page() in mmu_set_spte()
  KVM: Add kvm_read_guest_atomic()
  KVM: MMU: Concurrent guest walkers
  KVM: Disable vapic support on Intel machines with FlexPriority
  KVM: Accelerated apic support
  KVM: local APIC TPR access reporting facility
  KVM: Print data for unimplemented wrmsr
  KVM: MMU: Add cache miss statistic
  KVM: MMU: Coalesce remote tlb flushes
  KVM: Expose ioapic to ia64 save/restore APIs
  ...
parents f389e9fc 2f52d58c

arch/x86/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ config ARCH_SUPPORTS_OPROFILE 
	bool

	default y



select HAVE_KVM



config ZONE_DMA32

	bool
@@ -1598,4 +1599,6 @@ source "security/Kconfig" 


source "crypto/Kconfig"



source "arch/x86/kvm/Kconfig"



source "lib/Kconfig"

arch/x86/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ else 
        KBUILD_DEFCONFIG := $(ARCH)_defconfig

endif



core-$(CONFIG_KVM) += arch/x86/kvm/



# BITS is used as extension for files which are available in a 32 bit

# and a 64 bit version to simplify shared Makefiles.

# e.g.: obj-y += foo_$(BITS).o

drivers/kvm/Kconfig→arch/x86/kvm/Kconfig

+5 −2
Original line number Diff line number Diff line 
#

# KVM configuration

#

config HAVE_KVM

       bool



menuconfig VIRTUALIZATION

	bool "Virtualization"

	depends on X86

	depends on HAVE_KVM || X86

	default y

	---help---

	  Say Y here to get to see options for using your Linux host to run other
@@ -16,7 +19,7 @@ if VIRTUALIZATION 


config KVM

	tristate "Kernel-based Virtual Machine (KVM) support"

	depends on X86 && EXPERIMENTAL

	depends on HAVE_KVM && EXPERIMENTAL

	select PREEMPT_NOTIFIERS

	select ANON_INODES

	---help---

drivers/kvm/Makefile→arch/x86/kvm/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -2,7 +2,11 @@ 
# Makefile for Kernel-based Virtual Machine module

#



kvm-objs := kvm_main.o mmu.o x86_emulate.o i8259.o irq.o lapic.o ioapic.o

common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o)



EXTRA_CFLAGS += -Ivirt/kvm -Iarch/x86/kvm



kvm-objs := $(common-objs) x86.o mmu.o x86_emulate.o i8259.o irq.o lapic.o

obj-$(CONFIG_KVM) += kvm.o

kvm-intel-objs = vmx.o

obj-$(CONFIG_KVM_INTEL) += kvm-intel.o

drivers/kvm/i8259.c→arch/x86/kvm/i8259.c

+4 −4
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
#include <linux/mm.h>

#include "irq.h"



#include <linux/kvm_host.h>



/*

 * set irq level. If an edge is detected, then the IRR is set to 1

 */
@@ -181,10 +183,8 @@ int kvm_pic_read_irq(struct kvm_pic *s) 
	return intno;

}



static void pic_reset(void *opaque)

void kvm_pic_reset(struct kvm_kpic_state *s)

{

	struct kvm_kpic_state *s = opaque;



	s->last_irr = 0;

	s->irr = 0;

	s->imr = 0;
@@ -209,7 +209,7 @@ static void pic_ioport_write(void *opaque, u32 addr, u32 val) 
	addr &= 1;

	if (addr == 0) {

		if (val & 0x10) {

			pic_reset(s);	/* init */

			kvm_pic_reset(s);	/* init */

			/*

			 * deassert a pending interrupt

			 */