Signed-off-by: Sean Christopherson <sean.j.christopherson@xxxxxxxxx>
---
arch/x86/include/asm/kvm_emulate.h | 1 -
arch/x86/kvm/x86.c | 8 +-------
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h
index 51e474944d59..e69ad18f8bf9 100644
--- a/arch/x86/include/asm/kvm_emulate.h
+++ b/arch/x86/include/asm/kvm_emulate.h
@@ -223,7 +223,6 @@ struct x86_emulate_ops {
void (*set_nmi_mask)(struct x86_emulate_ctxt *ctxt, bool masked);
unsigned (*get_hflags)(struct x86_emulate_ctxt *ctxt);
- void (*set_hflags)(struct x86_emulate_ctxt *ctxt, unsigned hflags);
int (*leave_smm)(struct x86_emulate_ctxt *ctxt);
};
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index bef35c3a79bf..dd8bdd9d934f 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -5943,11 +5943,6 @@ static unsigned emulator_get_hflags(struct x86_emulate_ctxt *ctxt)
return emul_to_vcpu(ctxt)->arch.hflags;
}
-static void emulator_set_hflags(struct x86_emulate_ctxt *ctxt, unsigned emul_flags)
-{
- kvm_set_hflags(emul_to_vcpu(ctxt), emul_flags);
-}
-
static int emulator_leave_smm(struct x86_emulate_ctxt *ctxt)
{
return leave_smm(emul_to_vcpu(ctxt));
@@ -5989,7 +5984,6 @@ static const struct x86_emulate_ops emulate_ops = {
.get_cpuid = emulator_get_cpuid,
.set_nmi_mask = emulator_set_nmi_mask,
.get_hflags = emulator_get_hflags,
- .set_hflags = emulator_set_hflags,
.leave_smm = emulator_leave_smm,
};
@@ -7865,7 +7859,7 @@ static int leave_smm(struct kvm_vcpu *vcpu)
if ((ctxt->ops->get_hflags(ctxt) & X86EMUL_SMM_INSIDE_NMI_MASK) == 0)
ctxt->ops->set_nmi_mask(ctxt, false);
- ctxt->ops->set_hflags(ctxt, ctxt->ops->get_hflags(ctxt) &
+ kvm_set_hflags(vcpu, ctxt->ops->get_hflags(ctxt) &
~(X86EMUL_SMM_INSIDE_NMI_MASK | X86EMUL_SMM_MASK));
return X86EMUL_CONTINUE;
}
--
2.21.0
