X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_handler.c;fp=palacios%2Fsrc%2Fpalacios%2Fsvm_handler.c;h=a981c960019daf850b4c871ef0fe08bd62cfcb84;hp=3808ac2fca26cc803ea8734a5111842a323f6e19;hb=be2e1236b710115eb59f166a950f45710a15d2ef;hpb=333f5653d38e4f7b77425b0c18b2496f2b2f8660 diff --git a/palacios/src/palacios/svm_handler.c b/palacios/src/palacios/svm_handler.c index 3808ac2..a981c96 100644 --- a/palacios/src/palacios/svm_handler.c +++ b/palacios/src/palacios/svm_handler.c @@ -44,7 +44,6 @@ int v3_handle_svm_exit(struct guest_info * info) { guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data)); guest_state = GET_VMCB_SAVE_STATE_AREA((vmcb_t*)(info->vmm_data)); - // Update the high level state info->rip = guest_state->rip; info->vm_regs.rsp = guest_state->rsp; @@ -52,7 +51,6 @@ int v3_handle_svm_exit(struct guest_info * info) { info->cpl = guest_state->cpl; - info->ctrl_regs.cr0 = guest_state->cr0; info->ctrl_regs.cr2 = guest_state->cr2; info->ctrl_regs.cr3 = guest_state->cr3; @@ -67,10 +65,8 @@ int v3_handle_svm_exit(struct guest_info * 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; - // PrintDebug("SVM Exit: %s (rip=%p) (info1=%p)\n", vmexit_code_to_str(exit_code), // (void *)(addr_t)info->rip, (void *)(addr_t)guest_ctrl->exit_info1); @@ -101,12 +97,9 @@ 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))) { - - + if ((0) && (exit_code <= VMEXIT_EXCP14)) { uchar_t instr[32]; int ret; @@ -114,7 +107,7 @@ int v3_handle_svm_exit(struct guest_info * info) { //PrintDebug("RIP: %x\n", guest_state->rip); PrintDebug("\n\n\nRIP Linear: %p\n", (void *)get_addr_linear(info, info->rip, &(info->segments.cs))); - + v3_print_GPRs(info); v3_print_ctrl_regs(info); @@ -128,7 +121,6 @@ int v3_handle_svm_exit(struct guest_info * info) { } else { ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 32, instr); } - if (ret != 32) { @@ -146,7 +138,7 @@ int v3_handle_svm_exit(struct guest_info * info) { rdtscll(info->profiler.start_time); } - + //PrintDebug("SVM Returned: Exit Code: %x\n",exit_code); switch (exit_code) { @@ -176,7 +168,6 @@ int v3_handle_svm_exit(struct guest_info * info) { return -1; } } - } break; }