Remove preprocessor checks for CONFIG_HVM option, because expressions covered
by these checks are already guarded by cpu_has_vmx, which itself depends
on CONFIG_HVM option (via CONFIG_VMX).
No functional change intended.
Signed-off-by: Sergiy Kibrik <sergiy_kib...@epam.com>
---
xen/arch/x86/traps.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index d554c9d41e..7b8ee45edf 100644
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -676,7 +676,6 @@ void vcpu_show_execution_state(struct vcpu *v)
vcpu_pause(v); /* acceptably dangerous */
-#ifdef CONFIG_HVM
/*
* For VMX special care is needed: Reading some of the register state will
* require VMCS accesses. Engaging foreign VMCSes involves acquiring of a
@@ -689,7 +688,6 @@ void vcpu_show_execution_state(struct vcpu *v)
ASSERT(!in_irq());
vmx_vmcs_enter(v);
}
-#endif
/* Prevent interleaving of output. */
flags = console_lock_recursive_irqsave();
@@ -714,10 +712,8 @@ void vcpu_show_execution_state(struct vcpu *v)
console_unlock_recursive_irqrestore(flags);
}
-#ifdef CONFIG_HVM
if ( cpu_has_vmx && is_hvm_vcpu(v) )
vmx_vmcs_exit(v);
-#endif
vcpu_unpause(v);
}
--
2.25.1
