minor changes to organization

[palacios.git] / palacios / src / palacios / vmm_ctrl_regs.c

diff --git a/palacios/src/palacios/vmm_ctrl_regs.c b/palacios/src/palacios/vmm_ctrl_regs.c
index cc1fac6..4c84e2e 100644 (file)
--- a/palacios/src/palacios/vmm_ctrl_regs.c
+++ b/palacios/src/palacios/vmm_ctrl_regs.c
@@ -26,7 +26,7 @@
 #include <palacios/vmm_direct_paging.h>
 #include <palacios/svm.h>
 
-#ifndef CONFIG_DEBUG_CTRL_REGS
+#ifndef V3_CONFIG_DEBUG_CTRL_REGS
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -596,7 +596,7 @@ int v3_handle_star_read(struct guest_info * core, uint_t msr, struct v3_msr * ds
 
 int v3_handle_star_write(struct guest_info * core, uint_t msr, struct v3_msr src, void * priv_data) {
     
-#ifdef CONFIG_DEBUG_SYSCALL_HIJACK
+#ifdef V3_CONFIG_DEBUG_SYSCALL_HIJACK
     PrintDebug("STAR Write\n");
 #endif
     return 0;
@@ -605,7 +605,7 @@ int v3_handle_star_write(struct guest_info * core, uint_t msr, struct v3_msr src
 
 int v3_handle_lstar_read(struct guest_info * core, uint_t msr, struct v3_msr * dst, void * priv_data) {
 
-#ifdef CONFIG_DEBUG_SYSCALL_HIJACK
+#ifdef V3_CONFIG_DEBUG_SYSCALL_HIJACK
     PrintDebug("LSTAR Read\n");
 #endif
     return 0;
@@ -614,16 +614,19 @@ int v3_handle_lstar_read(struct guest_info * core, uint_t msr, struct v3_msr * d
 
 int v3_handle_lstar_write(struct guest_info * core, uint_t msr, struct v3_msr src, void * priv_data) {
     
-#ifdef CONFIG_DEBUG_SYSCALL_HIJACK
+#ifdef V3_CONFIG_DEBUG_SYSCALL_HIJACK
+    ulong_t entry = ((ulong_t)src.hi << 32) | (ulong_t)src.lo;
     PrintDebug("LSTAR Write\n");
+    PrintDebug("\tKernel syscall entry point: 0x%lx\n", entry);
 #endif
+    
     return 0;
 }
 
 
 int v3_handle_cstar_read(struct guest_info * core, uint_t msr, struct v3_msr * dst, void * priv_data) {
 
-#ifdef CONFIG_DEBUG_SYSCALL_HIJACK
+#ifdef V3_CONFIG_DEBUG_SYSCALL_HIJACK
     PrintDebug("CSTAR Read\n");
 #endif
     return 0;
@@ -632,12 +635,24 @@ int v3_handle_cstar_read(struct guest_info * core, uint_t msr, struct v3_msr * d
 
 int v3_handle_cstar_write(struct guest_info * core, uint_t msr, struct v3_msr src, void * priv_data) {
     
-#ifdef CONFIG_DEBUG_SYSCALL_HIJACK
+#ifdef V3_CONFIG_DEBUG_SYSCALL_HIJACK
     PrintDebug("CSTAR Write\n");
 #endif
     return 0;
 }
 
+int v3_handle_seeip_read(struct guest_info * core, uint_t msr, struct v3_msr * dst, void * priv_data) {
+    /* we don't care about reads */
+    return 0;
+}
+
+int v3_handle_seeip_write(struct guest_info * core, uint_t msr, struct v3_msr src, void * priv_data) {
+#ifdef V3_CONFIG_DEBUG_SYSALL_HIJACK
+    PrintDebug("SYSENTER_EIP Write\n");
+#endif
+    return 0;
+}
+
 
 int v3_handle_vm_cr_read(struct guest_info * core, uint_t msr, struct v3_msr * dst, void * priv_data) {
     /* tell the guest that the BIOS disabled SVM, that way it doesn't get