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

diff --cc arch/x86/include/asm/kvm_host.h
Simple merge

diff --cc arch/x86/kvm/vmx.c
Simple merge

diff --cc arch/x86/kvm/x86.c
index 2d2c9bb0d6d60f096af7e8e6b6a7ff6bd1c410dd,6e03546faf2e438b8ca1801962538defd9b2c6da..ba1a968b829a9d2d3f5929635073bf248dbd6382
--- 1/arch/x86/kvm/x86.c
--- 2/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;