[RFC PATCH 61/67] KVM: VMX: Move .get_interrupt_shadow() implementation to common VMX code

[isaku . yamahata]

From: Sean Christopherson <sean.j.christopher...@intel.com>

Signed-off-by: Sean Christopherson <sean.j.christopher...@intel.com>
---
 arch/x86/kvm/vmx/common.h | 14 ++++++++++++++
 arch/x86/kvm/vmx/vmx.c    | 10 +---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/arch/x86/kvm/vmx/common.h b/arch/x86/kvm/vmx/common.h
index ad106364c51f..8519423bfd88 100644
--- a/arch/x86/kvm/vmx/common.h
+++ b/arch/x86/kvm/vmx/common.h
@@ -122,6 +122,20 @@ static inline int __vmx_handle_ept_violation(struct 
kvm_vcpu *vcpu, gpa_t gpa,
        return kvm_mmu_page_fault(vcpu, gpa, error_code, NULL, 0);
 }
 
+static inline u32 __vmx_get_interrupt_shadow(struct kvm_vcpu *vcpu)
+{
+       u32 interruptibility;
+       int ret = 0;
+
+       interruptibility = vmread32(vcpu, GUEST_INTERRUPTIBILITY_INFO);
+       if (interruptibility & GUEST_INTR_STATE_STI)
+               ret |= KVM_X86_SHADOW_INT_STI;
+       if (interruptibility & GUEST_INTR_STATE_MOV_SS)
+               ret |= KVM_X86_SHADOW_INT_MOV_SS;
+
+       return ret;
+}
+
 static inline u32 vmx_encode_ar_bytes(struct kvm_segment *var)
 {
        u32 ar;
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 93b319eacdfa..9c15df71700d 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -1461,15 +1461,7 @@ void vmx_set_rflags(struct kvm_vcpu *vcpu, unsigned long 
rflags)
 
 u32 vmx_get_interrupt_shadow(struct kvm_vcpu *vcpu)
 {
-       u32 interruptibility = vmcs_read32(GUEST_INTERRUPTIBILITY_INFO);
-       int ret = 0;
-
-       if (interruptibility & GUEST_INTR_STATE_STI)
-               ret |= KVM_X86_SHADOW_INT_STI;
-       if (interruptibility & GUEST_INTR_STATE_MOV_SS)
-               ret |= KVM_X86_SHADOW_INT_MOV_SS;
-
-       return ret;
+       return __vmx_get_interrupt_shadow(vcpu);
 }
 
 void vmx_set_interrupt_shadow(struct kvm_vcpu *vcpu, int mask)
-- 
2.17.1