Commit 17d11ba1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'kvm-updates/2.6.31' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: Avoid redelivery of edge interrupt before next edge
  KVM: MMU: limit rmap chain length
  KVM: ia64: fix build failures due to ia64/unsigned long mismatches
  KVM: Make KVM_HPAGES_PER_HPAGE unsigned long to avoid build error on powerpc
  KVM: fix ack not being delivered when msi present
  KVM: s390: fix wait_queue handling
  KVM: VMX: Fix locking imbalance on emulation failure
  KVM: VMX: Fix locking order in handle_invalid_guest_state
  KVM: MMU: handle n_free_mmu_pages > n_alloc_mmu_pages in kvm_mmu_change_mmu_pages
  KVM: SVM: force new asid on vcpu migration
  KVM: x86: verify MTRR/PAT validity
  KVM: PIT: fix kpit_elapsed division by zero
  KVM: Fix KVM_GET_MSR_INDEX_LIST
parents fb1ee451 b4a2f5e7

arch/ia64/kvm/mmio.c

+4 −2
Original line number Diff line number Diff line
@@ -247,7 +247,8 @@ void emulate_io_inst(struct kvm_vcpu *vcpu, u64 padr, u64 ma) 
		vcpu_get_fpreg(vcpu, inst.M9.f2, &v);

		/* Write high word. FIXME: this is a kludge!  */

		v.u.bits[1] &= 0x3ffff;

		mmio_access(vcpu, padr + 8, &v.u.bits[1], 8, ma, IOREQ_WRITE);

		mmio_access(vcpu, padr + 8, (u64 *)&v.u.bits[1], 8,

			    ma, IOREQ_WRITE);

		data = v.u.bits[0];

		size = 3;

	} else if (inst.M10.major == 7 && inst.M10.x6 == 0x3B) {
@@ -265,7 +266,8 @@ void emulate_io_inst(struct kvm_vcpu *vcpu, u64 padr, u64 ma) 


		/* Write high word.FIXME: this is a kludge!  */

		v.u.bits[1] &= 0x3ffff;

		mmio_access(vcpu, padr + 8, &v.u.bits[1], 8, ma, IOREQ_WRITE);

		mmio_access(vcpu, padr + 8, (u64 *)&v.u.bits[1],

			    8, ma, IOREQ_WRITE);

		data = v.u.bits[0];

		size = 3;

	} else if (inst.M10.major == 7 && inst.M10.x6 == 0x31) {

arch/ia64/kvm/vcpu.c

+3 −3
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ void setreg(unsigned long regnum, unsigned long val, 
u64 vcpu_get_gr(struct kvm_vcpu *vcpu, unsigned long reg)

{

	struct kvm_pt_regs *regs = vcpu_regs(vcpu);

	u64 val;

	unsigned long val;



	if (!reg)

		return 0;
@@ -469,7 +469,7 @@ u64 vcpu_get_gr(struct kvm_vcpu *vcpu, unsigned long reg) 
	return val;

}



void vcpu_set_gr(struct kvm_vcpu *vcpu, u64 reg, u64 value, int nat)

void vcpu_set_gr(struct kvm_vcpu *vcpu, unsigned long reg, u64 value, int nat)

{

	struct kvm_pt_regs *regs = vcpu_regs(vcpu);

	long sof = (regs->cr_ifs) & 0x7f;
@@ -1072,7 +1072,7 @@ void kvm_ttag(struct kvm_vcpu *vcpu, INST64 inst) 
	vcpu_set_gr(vcpu, inst.M46.r1, tag, 0);

}



int vcpu_tpa(struct kvm_vcpu *vcpu, u64 vadr, u64 *padr)

int vcpu_tpa(struct kvm_vcpu *vcpu, u64 vadr, unsigned long *padr)

{

	struct thash_data *data;

	union ia64_isr visr, pt_isr;

arch/ia64/kvm/vcpu.h

+7 −6
Original line number Diff line number Diff line
@@ -686,14 +686,15 @@ static inline int highest_inservice_irq(struct kvm_vcpu *vcpu) 
	return highest_bits((int *)&(VMX(vcpu, insvc[0])));

}



extern void vcpu_get_fpreg(struct kvm_vcpu *vcpu, u64 reg,

extern void vcpu_get_fpreg(struct kvm_vcpu *vcpu, unsigned long reg,

					struct ia64_fpreg *val);

extern void vcpu_set_fpreg(struct kvm_vcpu *vcpu, u64 reg,

extern void vcpu_set_fpreg(struct kvm_vcpu *vcpu, unsigned long reg,

					struct ia64_fpreg *val);

extern u64 vcpu_get_gr(struct kvm_vcpu *vcpu, u64 reg);

extern void vcpu_set_gr(struct kvm_vcpu *vcpu, u64 reg, u64 val, int nat);

extern u64 vcpu_get_psr(struct kvm_vcpu *vcpu);

extern void vcpu_set_psr(struct kvm_vcpu *vcpu, u64 val);

extern u64 vcpu_get_gr(struct kvm_vcpu *vcpu, unsigned long reg);

extern void vcpu_set_gr(struct kvm_vcpu *vcpu, unsigned long reg,

			u64 val, int nat);

extern unsigned long vcpu_get_psr(struct kvm_vcpu *vcpu);

extern void vcpu_set_psr(struct kvm_vcpu *vcpu, unsigned long val);

extern u64 vcpu_thash(struct kvm_vcpu *vcpu, u64 vadr);

extern void vcpu_bsw0(struct kvm_vcpu *vcpu);

extern void thash_vhpt_insert(struct kvm_vcpu *v, u64 pte,

arch/powerpc/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#define KVM_COALESCED_MMIO_PAGE_OFFSET 1



/* We don't currently support large pages. */

#define KVM_PAGES_PER_HPAGE (1<<31)

#define KVM_PAGES_PER_HPAGE (1UL << 31)



struct kvm;

struct kvm_run;

arch/s390/kvm/interrupt.c

+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ no_timer: 
	}

	__unset_cpu_idle(vcpu);

	__set_current_state(TASK_RUNNING);

	remove_wait_queue(&vcpu->wq, &wait);

	remove_wait_queue(&vcpu->arch.local_int.wq, &wait);

	spin_unlock_bh(&vcpu->arch.local_int.lock);

	spin_unlock(&vcpu->arch.local_int.float_int->lock);

	hrtimer_try_to_cancel(&vcpu->arch.ckc_timer);

CRA Git | Maintained and supported by SUSTech CRA and CCSE