KVM: emulate: Remove ctxt->intercept and ctxt->check_perm checks

The same information can be gleaned from ctxt->d and avoids having
to zero/NULL initialize intercept and check_perm

Signed-off-by: Bandan Das <bsd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 851315d93bf7..000fc7398832 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -4599,7 +4599,7 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt)
                                 fetch_possible_mmx_operand(ctxt, &ctxt->dst);
                 }
 
-                if (unlikely(ctxt->guest_mode) && ctxt->intercept) {
+                if (unlikely(ctxt->guest_mode) && (ctxt->d & Intercept)) {
                         rc = emulator_check_intercept(ctxt, ctxt->intercept,
                                                       X86_ICPT_PRE_EXCEPT);
                         if (rc != X86EMUL_CONTINUE)
@@ -4619,13 +4619,13 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt)
                 }
 
                 /* Do instruction specific permission checks */
-                if (ctxt->check_perm) {
+                if (ctxt->d & CheckPerm) {
                         rc = ctxt->check_perm(ctxt);
                         if (rc != X86EMUL_CONTINUE)
                                 goto done;
                 }
 
-                if (unlikely(ctxt->guest_mode) && ctxt->intercept) {
+                if (unlikely(ctxt->guest_mode) && (ctxt->d & Intercept)) {
                         rc = emulator_check_intercept(ctxt, ctxt->intercept,
                                                       X86_ICPT_POST_EXCEPT);
                         if (rc != X86EMUL_CONTINUE)
@@ -4671,7 +4671,7 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt)
 
 special_insn:
 
-        if (unlikely(ctxt->guest_mode) && ctxt->intercept) {
+        if (unlikely(ctxt->guest_mode) && (ctxt->d & Intercept)) {
                 rc = emulator_check_intercept(ctxt, ctxt->intercept,
                                               X86_ICPT_POST_MEMACCESS);
                 if (rc != X86EMUL_CONTINUE)