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

Commit 39a65762 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kvm-updates/2.6.29' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

* 'kvm-updates/2.6.29' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: VMX: Flush volatile msrs before emulating rdmsr
  KVM: Fix assigned devices circular locking dependency
  KVM: x86: fix LAPIC pending count calculation
  KVM: Fix INTx for device assignment
  KVM: MMU: Map device MMIO as UC in EPT
  KVM: x86: disable kvmclock on non constant TSC hosts
  KVM: PIT: fix i8254 pending count read
  KVM: Fix racy in kvm_free_assigned_irq
  KVM: Add kvm_arch_sync_events to sync with asynchronize events
  KVM: mmu_notifiers release method
  KVM: Avoid using CONFIG_ in userspace visible headers
  KVM: ia64: fix fp fault/trap handler
parents 643aac1e 516a1a7e

arch/ia64/include/asm/kvm.h

+4 −0
Original line number Diff line number Diff line
@@ -25,6 +25,10 @@ 


#include <linux/ioctl.h>



/* Select x86 specific features in <linux/kvm.h> */

#define __KVM_HAVE_IOAPIC

#define __KVM_HAVE_DEVICE_ASSIGNMENT



/* Architectural interrupt line count. */

#define KVM_NR_INTERRUPTS 256

arch/ia64/kvm/kvm-ia64.c

+4 −0
Original line number Diff line number Diff line
@@ -1337,6 +1337,10 @@ static void kvm_release_vm_pages(struct kvm *kvm) 
	}

}



void kvm_arch_sync_events(struct kvm *kvm)

{

}



void kvm_arch_destroy_vm(struct kvm *kvm)

{

	kvm_iommu_unmap_guest(kvm);

arch/ia64/kvm/process.c

+9 −8
Original line number Diff line number Diff line
@@ -455,11 +455,16 @@ fpswa_ret_t vmm_fp_emulate(int fp_fault, void *bundle, unsigned long *ipsr, 
	if (!vmm_fpswa_interface)

		return (fpswa_ret_t) {-1, 0, 0, 0};



	memset(&fp_state, 0, sizeof(fp_state_t));



	/*

	 * Just let fpswa driver to use hardware fp registers.

	 * No fp register is valid in memory.

	 * compute fp_state.  only FP registers f6 - f11 are used by the

	 * vmm, so set those bits in the mask and set the low volatile

	 * pointer to point to these registers.

	 */

	memset(&fp_state, 0, sizeof(fp_state_t));

	fp_state.bitmask_low64 = 0xfc0;  /* bit6..bit11 */



	fp_state.fp_state_low_volatile = (fp_state_low_volatile_t *) &regs->f6;



   /*

	 * unsigned long (*EFI_FPSWA) (
@@ -545,10 +550,6 @@ void reflect_interruption(u64 ifa, u64 isr, u64 iim, 
		status = vmm_handle_fpu_swa(0, regs, isr);

		if (!status)

			return ;

		else if (-EAGAIN == status) {

			vcpu_decrement_iip(vcpu);

			return ;

		}

		break;

	}

arch/powerpc/kvm/powerpc.c

+4 −0
Original line number Diff line number Diff line
@@ -125,6 +125,10 @@ static void kvmppc_free_vcpus(struct kvm *kvm) 
	}

}



void kvm_arch_sync_events(struct kvm *kvm)

{

}



void kvm_arch_destroy_vm(struct kvm *kvm)

{

	kvmppc_free_vcpus(kvm);

arch/s390/kvm/kvm-s390.c

+4 −0
Original line number Diff line number Diff line
@@ -212,6 +212,10 @@ static void kvm_free_vcpus(struct kvm *kvm) 
	}

}



void kvm_arch_sync_events(struct kvm *kvm)

{

}



void kvm_arch_destroy_vm(struct kvm *kvm)

{

	kvm_free_vcpus(kvm);