From: Paolo Bonzini <pbonzini@redhat.com>
Date: Tue, 13 Oct 2015 19:32:50 +0000 (+0200)
Subject: Merge branch 'kvm-master' into HEAD
X-Git-Tag: v4.4-rc1~28^2~60
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=58f800d5ace99c49e6418cb5757d868f2746acb4;p=platform%2Fkernel%2Flinux-exynos.git

Merge branch 'kvm-master' into HEAD

This merge brings in a couple important SMM fixes, which makes it
easier to test latest KVM with unrestricted_guest=0 and to test
the in-progress work on SMM support in the firmware.

Conflicts:
	arch/x86/kvm/x86.c
---

58f800d5ace99c49e6418cb5757d868f2746acb4
diff --cc arch/x86/kvm/x86.c
index 2d2c9bb,6e03546..ba1a968
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@@ -6539,13 -6467,10 +6545,12 @@@ static int vcpu_run(struct kvm_vcpu *vc
  	vcpu->srcu_idx = srcu_read_lock(&kvm->srcu);
  
  	for (;;) {
- 		if (vcpu->arch.mp_state == KVM_MP_STATE_RUNNABLE &&
- 		    !vcpu->arch.apf.halted) {
 -		if (kvm_vcpu_running(vcpu))
++		if (kvm_vcpu_running(vcpu)) {
  			r = vcpu_enter_guest(vcpu);
 -		else
 +		} else {
  			r = vcpu_block(kvm, vcpu);
 +		}
 +
  		if (r <= 0)
  			break;