[Xen-devel] [PATCH v1 2/2] hvm/svm: Enable EMUL_UNIMPLEMENTED events on svm

[Alexandru Isaila <aisaila@xxxxxxxxxxxxxxx>]

Signed-off-by: Alexandru Isaila <aisaila@xxxxxxxxxxxxxxx>
---
 xen/include/asm-x86/monitor.h | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/xen/include/asm-x86/monitor.h b/xen/include/asm-x86/monitor.h
index c5a86d1..7ef2aa2 100644
--- a/xen/include/asm-x86/monitor.h
+++ b/xen/include/asm-x86/monitor.h
@@ -83,16 +83,13 @@ static inline uint32_t arch_monitor_get_capabilities(struct 
domain *d)
                     (1U << XEN_DOMCTL_MONITOR_EVENT_INTERRUPT) |
                     (1U << XEN_DOMCTL_MONITOR_EVENT_CPUID) |
                     (1U << XEN_DOMCTL_MONITOR_EVENT_DEBUG_EXCEPTION) |
-                    (1U << XEN_DOMCTL_MONITOR_EVENT_WRITE_CTRLREG));
+                    (1U << XEN_DOMCTL_MONITOR_EVENT_WRITE_CTRLREG) |
+                    (1U << XEN_DOMCTL_MONITOR_EVENT_EMUL_UNIMPLEMENTED));
 
-    if ( cpu_has_vmx )
-    {
-        capabilities |= (1U << XEN_DOMCTL_MONITOR_EVENT_EMUL_UNIMPLEMENTED);
 
-        /* Since we know this is on VMX, we can just call the hvm func */
-        if ( hvm_is_singlestep_supported() )
-            capabilities |= (1U << XEN_DOMCTL_MONITOR_EVENT_SINGLESTEP);
-    }
+     /* Check if we are on VMX and then we can just call the hvm func */
+    if ( cpu_has_vmx && hvm_is_singlestep_supported() )
+        capabilities |= (1U << XEN_DOMCTL_MONITOR_EVENT_SINGLESTEP);
 
     if ( hvm_funcs.set_descriptor_access_exiting )
         capabilities |= (1U << XEN_DOMCTL_MONITOR_EVENT_DESC_ACCESS);
-- 
2.7.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel