#include <palacios/svm_handler.h>
#include <palacios/vmm.h>
#include <palacios/vm_guest_mem.h>
-#include <palacios/vmm_emulate.h>
+#include <palacios/vmm_decoder.h>
#include <palacios/vmm_ctrl_regs.h>
#include <palacios/svm_io.h>
+#include <palacios/svm_halt.h>
#include <palacios/vmm_intr.h>
// Disable printing io exits due to bochs debug messages
- if (!((exit_code == VMEXIT_IOIO) && ((ushort_t)(guest_ctrl->exit_info1 >> 16) == 0x402))) {
+ //if (!((exit_code == VMEXIT_IOIO) && ((ushort_t)(guest_ctrl->exit_info1 >> 16) == 0x402))) {
- PrintDebug("SVM Returned: Exit Code: %x \t\t(tsc=%ul)\n",exit_code, (uint_t)info->time_state.guest_tsc);
- }
+ PrintDebug("SVM Returned: Exit Code: 0x%x \t\t(tsc=%ul)\n",exit_code, (uint_t)info->time_state.guest_tsc);
+ // }
// PrintDebugVMCB((vmcb_t*)(info->vmm_data));
PrintDebug("PageFault at %x (error=%d)\n", fault_addr, *error_code);
- if (info->page_mode == SHADOW_PAGING) {
+ if (info->shdw_pg_mode == SHADOW_PAGING) {
if (handle_shadow_pagefault(info, fault_addr, *error_code) == -1) {
return -1;
}
}
} else if (exit_code == VMEXIT_INVLPG) {
- if (info->page_mode == SHADOW_PAGING) {
+ if (info->shdw_pg_mode == SHADOW_PAGING) {
PrintDebug("Invlpg\n");
if (handle_shadow_invlpg(info) == -1) {
return -1;
// handle_svm_intr(info);
+ } else if (exit_code == VMEXIT_SMI) {
+
+ // handle_svm_smi(info); // ignored for now
+
} else if (exit_code == VMEXIT_HLT) {
PrintDebug("Guest halted\n");
- return -1;
+ if (handle_svm_halt(info) == -1) {
+ return -1;
+ }
} else {
addr_t rip_addr;
char buf[15];
- if (guest_pa_to_host_pa(info, guest_state->rip, &host_addr) == -1) {
- PrintDebug("Could not translate guest_state->rip to host address\n");
+ if (info->mem_mode == PHYSICAL_MEM) {
+ if (guest_pa_to_host_pa(info, guest_state->rip, &host_addr) == -1) {
+ PrintDebug("Could not translate guest_state->rip to host address\n");
+ return -1;
+ }
+ } else if (info->mem_mode == VIRTUAL_MEM) {
+ if (guest_va_to_host_pa(info, guest_state->rip, &host_addr) == -1) {
+ PrintDebug("Could not translate guest_state->rip to host address\n");
+ return -1;
+ }
+ } else {
+ PrintDebug("Invalid memory mode\n");
return -1;
}
PrintDebug("Reading from 0x%x in guest\n", rip_addr);
- read_guest_pa_memory(info, rip_addr, 15, buf);
+ if (info->mem_mode == PHYSICAL_MEM) {
+ read_guest_pa_memory(info, rip_addr, 15, buf);
+ } else {
+ read_guest_va_memory(info, rip_addr, 15, buf);
+ }
PrintTraceMemDump(buf, 15);
case EXTERNAL_IRQ:
{
uint_t irq = get_intr_number(info);
- guest_ctrl->EVENTINJ.vector = irq;
- guest_ctrl->EVENTINJ.valid = 1;
- guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXTERNAL_INTR;
+ /*
+ guest_ctrl->EVENTINJ.vector = irq;
+ guest_ctrl->EVENTINJ.valid = 1;
+ guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXTERNAL_INTR;
+ */
+ guest_ctrl->guest_ctrl.V_IRQ = 1;
+ guest_ctrl->guest_ctrl.V_INTR_VECTOR = irq;
+ guest_ctrl->guest_ctrl.V_IGN_TPR = 1;
+ guest_ctrl->guest_ctrl.V_INTR_PRIO = 0xf;
+
+ PrintDebug("Injecting Interrupt %d (EIP=%x)\n", guest_ctrl->guest_ctrl.V_INTR_VECTOR, info->rip);
+
injecting_intr(info, irq, EXTERNAL_IRQ);
break;
if (info->intr_state.excp_error_code) {
guest_ctrl->EVENTINJ.error_code = info->intr_state.excp_error_code;
guest_ctrl->EVENTINJ.ev = 1;
+ PrintDebug("Injecting error code %x\n", guest_ctrl->EVENTINJ.error_code);
}
guest_ctrl->EVENTINJ.vector = excp;
+ guest_ctrl->EVENTINJ.valid = 1;
+ PrintDebug("Injecting Interrupt %d (EIP=%x)\n", guest_ctrl->EVENTINJ.vector, info->rip);
injecting_intr(info, excp, EXCEPTION);
break;
}
- case SOFTWARE:
+ case SOFTWARE_INTR:
guest_ctrl->EVENTINJ.type = SVM_INJECTION_SOFT_INTR;
break;
- case VIRTUAL:
+ case VIRTUAL_INTR:
guest_ctrl->EVENTINJ.type = SVM_INJECTION_VIRTUAL_INTR;
break;
return -1;
}
- PrintDebug("Injecting Interrupt %d (EIP=%x)\n", guest_ctrl->EVENTINJ.vector, info->rip);
}