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

Commit 5d2007eb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
  KVM: Fix pit memory leak if unable to allocate irq source id
  KVM: ia64: fix vmm_spin_{un}lock for !CONFIG_SMP
  KVM: VMX: Set IGMT bit in EPT entry
  KVM: Require the PCI subsystem
  x86: KVM guest: fix section mismatch warning in kvmclock.c
  KVM: ia64: Use guest signal mask when blocking
  KVM: MMU: increase per-vcpu rmap cache alloc size
parents 1c127185 e17d1dc0

arch/ia64/kvm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ if VIRTUALIZATION 
config KVM

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

	depends on HAVE_KVM && EXPERIMENTAL

	# for device assignment:

	depends on PCI

	select PREEMPT_NOTIFIERS

	select ANON_INODES

	---help---

arch/ia64/kvm/kvm-ia64.c

+6 −6
Original line number Diff line number Diff line
@@ -673,16 +673,16 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 


	vcpu_load(vcpu);



	if (vcpu->sigset_active)

		sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved);



	if (unlikely(vcpu->arch.mp_state == KVM_MP_STATE_UNINITIALIZED)) {

		kvm_vcpu_block(vcpu);

		clear_bit(KVM_REQ_UNHALT, &vcpu->requests);

		vcpu_put(vcpu);

		return -EAGAIN;

		r = -EAGAIN;

		goto out;

	}



	if (vcpu->sigset_active)

		sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved);



	if (vcpu->mmio_needed) {

		memcpy(vcpu->mmio_data, kvm_run->mmio.data, 8);

		kvm_set_mmio_data(vcpu);
@@ -690,7 +690,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
		vcpu->mmio_needed = 0;

	}

	r = __vcpu_run(vcpu, kvm_run);



out:

	if (vcpu->sigset_active)

		sigprocmask(SIG_SETMASK, &sigsaved, NULL);

arch/ia64/kvm/vcpu.h

+5 −0
Original line number Diff line number Diff line
@@ -384,6 +384,10 @@ static inline u64 __gpfn_is_io(u64 gpfn) 
#define MODE_IND(psr)	\

	(((psr).it << 2) + ((psr).dt << 1) + (psr).rt)



#ifndef CONFIG_SMP

#define _vmm_raw_spin_lock(x)	 do {}while(0)

#define _vmm_raw_spin_unlock(x) do {}while(0)

#else

#define _vmm_raw_spin_lock(x)						\

	do {								\

		__u32 *ia64_spinlock_ptr = (__u32 *) (x);		\
@@ -403,6 +407,7 @@ static inline u64 __gpfn_is_io(u64 gpfn) 
	do { barrier();				\

		((spinlock_t *)x)->raw_lock.lock = 0; } \

while (0)

#endif



void vmm_spin_lock(spinlock_t *lock);

void vmm_spin_unlock(spinlock_t *lock);

arch/x86/kernel/kvmclock.c

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static int kvm_register_clock(char *txt) 
}



#ifdef CONFIG_X86_LOCAL_APIC

static void kvm_setup_secondary_clock(void)

static void __devinit kvm_setup_secondary_clock(void)

{

	/*

	 * Now that the first cpu already had this clocksource initialized,

arch/x86/kvm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ if VIRTUALIZATION 
config KVM

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

	depends on HAVE_KVM

	# for device assignment:

	depends on PCI

	select PREEMPT_NOTIFIERS

	select MMU_NOTIFIER

	select ANON_INODES