X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_handler.c;h=a84d2e1a12f2b00f395c9696f6b137ad6eb127fd;hb=5614cff13837121053e831419f569b4e6e32bcd9;hp=2c6034ceed542defbfecb7614661758a8005570a;hpb=3e5e5a12e64630d7a37ed32b8d7e2d993c79f7e0;p=palacios.git

diff --git a/palacios/src/palacios/svm_handler.c b/palacios/src/palacios/svm_handler.c
index 2c6034c..a84d2e1 100644
--- a/palacios/src/palacios/svm_handler.c
+++ b/palacios/src/palacios/svm_handler.c
@@ -34,15 +34,20 @@
 #include <palacios/vmm_cpuid.h>
 #include <palacios/vmm_direct_paging.h>
 
+#ifndef V3_CONFIG_DEBUG_SVM
+#undef PrintDebug
+#define PrintDebug(fmt, args...)
+#endif
 
-#ifdef CONFIG_TELEMETRY
+#ifdef V3_CONFIG_TELEMETRY
 #include <palacios/vmm_telemetry.h>
 #endif
 
 
+
 int v3_handle_svm_exit(struct guest_info * info, addr_t exit_code, addr_t exit_info1, addr_t exit_info2) {
 
-#ifdef CONFIG_TELEMETRY
+#ifdef V3_CONFIG_TELEMETRY
     if (info->vm_info->enable_telemetry) {
 	v3_telemetry_start_exit(info);
     }
@@ -109,7 +114,7 @@ int v3_handle_svm_exit(struct guest_info * info, addr_t exit_code, addr_t exit_i
 
 	    break;
 	case VMEXIT_CR0_WRITE: 
-#ifdef CONFIG_DEBUG_CTRL_REGS
+#ifdef V3_CONFIG_DEBUG_CTRL_REGS
 	    PrintDebug("CR0 Write\n");
 #endif
 	    if (v3_handle_cr0_write(info) == -1) {
@@ -117,7 +122,7 @@ int v3_handle_svm_exit(struct guest_info * info, addr_t exit_code, addr_t exit_i
 	    }
 	    break;
 	case VMEXIT_CR0_READ: 
-#ifdef CONFIG_DEBUG_CTRL_REGS
+#ifdef V3_CONFIG_DEBUG_CTRL_REGS
 	    PrintDebug("CR0 Read\n");
 #endif
 	    if (v3_handle_cr0_read(info) == -1) {
@@ -125,7 +130,7 @@ int v3_handle_svm_exit(struct guest_info * info, addr_t exit_code, addr_t exit_i
 	    }
 	    break;
 	case VMEXIT_CR3_WRITE: 
-#ifdef CONFIG_DEBUG_CTRL_REGS
+#ifdef V3_CONFIG_DEBUG_CTRL_REGS
 	    PrintDebug("CR3 Write\n");
 #endif
 	    if (v3_handle_cr3_write(info) == -1) {
@@ -134,7 +139,7 @@ int v3_handle_svm_exit(struct guest_info * info, addr_t exit_code, addr_t exit_i
 
 	    break;
 	case  VMEXIT_CR3_READ: 
-#ifdef CONFIG_DEBUG_CTRL_REGS
+#ifdef V3_CONFIG_DEBUG_CTRL_REGS
 	    PrintDebug("CR3 Read\n");
 #endif
 	    if (v3_handle_cr3_read(info) == -1) {
@@ -142,7 +147,7 @@ int v3_handle_svm_exit(struct guest_info * info, addr_t exit_code, addr_t exit_i
 	    }
 	    break;
 	case VMEXIT_CR4_WRITE: 
-#ifdef CONFIG_DEBUG_CTRL_REGS
+#ifdef V3_CONFIG_DEBUG_CTRL_REGS
 	    PrintDebug("CR4 Write\n");
 #endif
 	    if (v3_handle_cr4_write(info) == -1) {
@@ -150,7 +155,7 @@ int v3_handle_svm_exit(struct guest_info * info, addr_t exit_code, addr_t exit_i
 	    }    
 	    break;
 	case  VMEXIT_CR4_READ: 
-#ifdef CONFIG_DEBUG_CTRL_REGS
+#ifdef V3_CONFIG_DEBUG_CTRL_REGS
 	    PrintDebug("CR4 Read\n");
 #endif
 	    if (v3_handle_cr4_read(info) == -1) {
@@ -160,7 +165,7 @@ int v3_handle_svm_exit(struct guest_info * info, addr_t exit_code, addr_t exit_i
 	case VMEXIT_EXCP14: {
 	    addr_t fault_addr = exit_info2;
 	    pf_error_t * error_code = (pf_error_t *)&(exit_info1);
-#ifdef CONFIG_DEBUG_SHADOW_PAGING
+#ifdef V3_CONFIG_DEBUG_SHADOW_PAGING
 	    PrintDebug("PageFault at %p (error=%d)\n", 
 		       (void *)fault_addr, *(uint_t *)error_code);
 #endif
@@ -190,7 +195,7 @@ int v3_handle_svm_exit(struct guest_info * info, addr_t exit_code, addr_t exit_i
 	    }
 	case VMEXIT_INVLPG: 
 	    if (info->shdw_pg_mode == SHADOW_PAGING) {
-#ifdef CONFIG_DEBUG_SHADOW_PAGING
+#ifdef V3_CONFIG_DEBUG_SHADOW_PAGING
 		PrintDebug("Invlpg\n");
 #endif
 		if (v3_handle_shadow_invlpg(info) == -1) {
@@ -212,7 +217,10 @@ int v3_handle_svm_exit(struct guest_info * info, addr_t exit_code, addr_t exit_i
 		return -1;
 	    }
 
-	    break;	    
+	    break;	
+	case VMEXIT_NMI:
+	    // handled by interrupt dispatcher
+	    break;
 	case VMEXIT_INTR:
 	    // handled by interrupt dispatch earlier
 	    break;
@@ -220,7 +228,7 @@ int v3_handle_svm_exit(struct guest_info * info, addr_t exit_code, addr_t exit_i
 	    //   handle_svm_smi(info); // ignored for now
 	    break;
 	case VMEXIT_HLT:
-#ifdef CONFIG_DEBUG_HALT
+#ifdef V3_CONFIG_DEBUG_HALT
 	    PrintDebug("Guest halted\n");
 #endif
 	    if (v3_handle_halt(info) == -1) {
@@ -234,16 +242,39 @@ int v3_handle_svm_exit(struct guest_info * info, addr_t exit_code, addr_t exit_i
 	    }
 	    break;
 	case VMEXIT_WBINVD:   
-#ifdef CONFIG_DEBUG_EMULATOR
+#ifdef V3_CONFIG_DEBUG_EMULATOR
 	    PrintDebug("WBINVD\n");
 #endif
 	    if (v3_handle_svm_wbinvd(info) == -1) { 
 		return -1;
 	    }
 	    break;
-	
+        case VMEXIT_RDTSC:
+#ifdef V3_CONFIG_DEBUG_TIME
+	    PrintDebug("RDTSC/RDTSCP\n");
+#endif 
+	    if (v3_handle_rdtsc(info) == -1) {
+		PrintError("Error Handling RDTSC instruction\n");
+		return -1;
+	    }
+	    break;
+        case VMEXIT_RDTSCP:
+#ifdef V3_CONFIG_DEBUG_TIME
+	    PrintDebug("RDTSCP\n");
+#endif 
+	    if (v3_handle_rdtscp(info) == -1) {
+		PrintError("Error Handling RDTSCP instruction\n");
+		return -1;
+	    }
+	    break;
+	case VMEXIT_SHUTDOWN:
+	    PrintDebug("Guest-initiated shutdown\n");
+
+	    info->vm_info->run_state = VM_STOPPED;
 
+	    // Force exit on other cores
 
+	    break;
 
 
 	    /* Exits Following this line are NOT HANDLED */
@@ -253,7 +284,7 @@ int v3_handle_svm_exit(struct guest_info * info, addr_t exit_code, addr_t exit_i
 
 	    addr_t rip_addr;
 	    
-	    PrintDebug("Unhandled SVM Exit: %s\n", vmexit_code_to_str(exit_code));
+	    PrintError("Unhandled SVM Exit: %s\n", vmexit_code_to_str(exit_code));
 	    
 	    rip_addr = get_addr_linear(info, info->rip, &(info->segments.cs));
 	    
@@ -281,7 +312,7 @@ int v3_handle_svm_exit(struct guest_info * info, addr_t exit_code, addr_t exit_i
     }
     // END OF SWITCH (EXIT_CODE)
 
-#ifdef CONFIG_TELEMETRY
+#ifdef V3_CONFIG_TELEMETRY
     if (info->vm_info->enable_telemetry) {
 	v3_telemetry_end_exit(info, exit_code);
     }