X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_handler.c;h=7d6b61b1a8faec4b6a2b2a8492b57af9016ff0b8;hb=39849abeb743c4e6b669a790c307979fa8d51884;hp=bddacf273e6edb8f2db1e903df635397603b20b2;hpb=2be845dc1d8fc407dab4254a8fac03395ffc1ec2;p=palacios.git

diff --git a/palacios/src/palacios/svm_handler.c b/palacios/src/palacios/svm_handler.c
index bddacf2..7d6b61b 100644
--- a/palacios/src/palacios/svm_handler.c
+++ b/palacios/src/palacios/svm_handler.c
@@ -64,8 +64,8 @@ int v3_handle_svm_exit(struct guest_info * info) {
     info->ctrl_regs.efer = guest_state->efer;
     
     get_vmcb_segments((vmcb_t*)(info->vmm_data), &(info->segments));
-    info->cpu_mode = v3_get_cpu_mode(info);
-    info->mem_mode = v3_get_mem_mode(info);
+    info->cpu_mode = v3_get_vm_cpu_mode(info);
+    info->mem_mode = v3_get_vm_mem_mode(info);
 
 
     exit_code = guest_ctrl->exit_code;
@@ -78,7 +78,7 @@ int v3_handle_svm_exit(struct guest_info * info) {
 #endif
 	if (!guest_ctrl->exit_int_info.valid) {
 	    info->intr_state.irq_pending = 0;
-	    // PrintDebug("Injecting Interrupt %d\n", info->intr_state.irq_vector);
+	    // PrintDebug("Injected Interrupt %d\n", info->intr_state.irq_vector);
 	    v3_injecting_intr(info, info->intr_state.irq_vector, EXTERNAL_IRQ);
 	} else {
 #ifdef DEBUG_INTERRUPTS
@@ -93,8 +93,6 @@ int v3_handle_svm_exit(struct guest_info * info) {
     // Disable printing io exits due to bochs debug messages
     //if (!((exit_code == VMEXIT_IOIO) && ((ushort_t)(guest_ctrl->exit_info1 >> 16) == 0x402))) {
     
-    
-    //  PrintDebug("SVM Returned: Exit Code: 0x%x \t\t(tsc=%ul)\n",exit_code, (uint_t)info->time_state.guest_tsc); 
   
     if ((0) && (exit_code <= VMEXIT_EXCP14)) {
 	uchar_t instr[32];
@@ -141,7 +139,7 @@ int v3_handle_svm_exit(struct guest_info * info) {
     switch (exit_code) {
 	case VMEXIT_IOIO: {
 	    struct svm_io_info * io_info = (struct svm_io_info *)&(guest_ctrl->exit_info1);
-		
+
 	    if (io_info->type == 0) {
 		if (io_info->str) {