On Tue, Jul 06, 2021, Paolo Bonzini wrote:
> On 03/07/21 00:05, isaku.yamahata@xxxxxxxxx wrote:
> > diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
> > index d69d4dc7c071..d31cace67907 100644
> > --- a/arch/x86/kvm/vmx/vmx.c
> > +++ b/arch/x86/kvm/vmx/vmx.c
> > @@ -1467,15 +1467,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)
> >
>
> Is there any reason to add the __ version, since at this point kvm_x86_ops
> is already pointing to vt_get_interrupt_shadow?
Yeah, no idea what I was thinking, the whole thing can be moved as is, just need
to delete the prototype in vmx.h.
