Commit 1b40a895 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
  KVM: IOAPIC: Fix level-triggered irq injection hang
  x86: KVM guest: Add memory clobber to hypercalls
parents 97f8571e 35baff25

include/asm-x86/kvm_para.h

+10 −5
Original line number Diff line number Diff line
@@ -71,7 +71,8 @@ static inline long kvm_hypercall0(unsigned int nr) 
	long ret;

	asm volatile(KVM_HYPERCALL

		     : "=a"(ret)

		     : "a"(nr));

		     : "a"(nr)

		     : "memory");

	return ret;

}
@@ -80,7 +81,8 @@ static inline long kvm_hypercall1(unsigned int nr, unsigned long p1) 
	long ret;

	asm volatile(KVM_HYPERCALL

		     : "=a"(ret)

		     : "a"(nr), "b"(p1));

		     : "a"(nr), "b"(p1)

		     : "memory");

	return ret;

}
@@ -90,7 +92,8 @@ static inline long kvm_hypercall2(unsigned int nr, unsigned long p1, 
	long ret;

	asm volatile(KVM_HYPERCALL

		     : "=a"(ret)

		     : "a"(nr), "b"(p1), "c"(p2));

		     : "a"(nr), "b"(p1), "c"(p2)

		     : "memory");

	return ret;

}
@@ -100,7 +103,8 @@ static inline long kvm_hypercall3(unsigned int nr, unsigned long p1, 
	long ret;

	asm volatile(KVM_HYPERCALL

		     : "=a"(ret)

		     : "a"(nr), "b"(p1), "c"(p2), "d"(p3));

		     : "a"(nr), "b"(p1), "c"(p2), "d"(p3)

		     : "memory");

	return ret;

}
@@ -111,7 +115,8 @@ static inline long kvm_hypercall4(unsigned int nr, unsigned long p1, 
	long ret;

	asm volatile(KVM_HYPERCALL

		     : "=a"(ret)

		     : "a"(nr), "b"(p1), "c"(p2), "d"(p3), "S"(p4));

		     : "a"(nr), "b"(p1), "c"(p2), "d"(p3), "S"(p4)

		     : "memory");

	return ret;

}

virt/kvm/ioapic.c

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ static void __kvm_ioapic_update_eoi(struct kvm_ioapic *ioapic, int gsi) 


	ent->fields.remote_irr = 0;

	if (!ent->fields.mask && (ioapic->irr & (1 << gsi)))

		ioapic_deliver(ioapic, gsi);

		ioapic_service(ioapic, gsi);

}



void kvm_ioapic_update_eoi(struct kvm *kvm, int vector)