#include <palacios/vmm.h>
#include <palacios/vm_guest_mem.h>
#include <palacios/vmm_emulate.h>
-#include <palacios/svm_ctrl_regs.h>
+#include <palacios/vmm_ctrl_regs.h>
#include <palacios/svm_io.h>
#include <palacios/vmm_intr.h>
+
extern struct vmm_os_hooks * os_hooks;
info->vm_regs.rsp = guest_state->rsp;
+ info->ctrl_regs.cr0 = guest_state->cr0;
+ info->ctrl_regs.cr2 = guest_state->cr2;
+ info->ctrl_regs.cr3 = guest_state->cr3;
+ info->ctrl_regs.cr4 = guest_state->cr4;
+ info->ctrl_regs.cr8 = guest_ctrl->guest_ctrl.V_TPR;
+ info->ctrl_regs.rflags = guest_state->rflags;
+
+ get_vmcb_segments((vmcb_t*)(info->vmm_data), &(info->segments));
+
+
exit_code = guest_ctrl->exit_code;
PrintDebug("SVM Returned: Exit Code: %x\n",exit_code);
if (handle_cr0_read(info) == -1) {
return -1;
}
+ } else if (exit_code == VMEXIT_CR3_WRITE) {
+ PrintDebug("CR3 Write\n");
+
+ if (handle_cr3_write(info) == -1) {
+ return -1;
+ }
+ } else if (exit_code == VMEXIT_CR3_READ) {
+ PrintDebug("CR3 Read\n");
+
+ if (handle_cr3_read(info) == -1) {
+ return -1;
+ }
+
+ } else if (exit_code == VMEXIT_EXCP14) {
+ addr_t fault_addr = guest_ctrl->exit_info2;
+ pf_error_t * error_code = (pf_error_t *)&(guest_ctrl->exit_info1);
+
+ PrintDebug("PageFault at %x (error=%d)\n", fault_addr, *error_code);
+
+
+ if (handle_shadow_pagefault(info, fault_addr, *error_code) == -1) {
+ return -1;
+ }
/*
- } else if (( (exit_code == VMEXIT_CR3_READ) ||
- (exit_code == VMEXIT_CR3_WRITE) ||
- (exit_code == VMEXIT_INVLPG) ||
- (exit_code == VMEXIT_INVLPGA) ||
- (exit_code == VMEXIT_EXCP14)) &&
- (info->page_mode == SHADOW_PAGING)) {
- handle_shadow_paging(info);
+ } else if (( (exit_code == VMEXIT_CR3_READ) ||
+ (exit_code == VMEXIT_CR3_WRITE) ||
+ (exit_code == VMEXIT_INVLPG) ||
+ (exit_code == VMEXIT_INVLPGA) ||
+ (exit_code == VMEXIT_EXCP14)) &&
+ (info->page_mode == SHADOW_PAGING)) {
+ handle_shadow_paging(info);
*/
-
+
} else if (exit_code == VMEXIT_INTR) {
// handle_svm_intr(info);
char buf[15];
addr_t host_addr;
- if (info->cpu_mode == REAL) {
- rip_addr = get_addr_linear(info, guest_state->rip, guest_state->cs.selector);
- } else {
- rip_addr = get_addr_linear(info, guest_state->rip, guest_state->cs.base);
- }
+
+ rip_addr = get_addr_linear(info, guest_state->rip, &(info->segments.cs));
+
PrintDebug("SVM Returned:(VMCB=%x)\n", info->vmm_data);
}
+ guest_state->cr0 = info->ctrl_regs.cr0;
+ guest_state->cr2 = info->ctrl_regs.cr2;
+ guest_state->cr3 = info->ctrl_regs.cr3;
+ guest_state->cr4 = info->ctrl_regs.cr4;
+ guest_ctrl->guest_ctrl.V_TPR = info->ctrl_regs.cr8 & 0xff;
+ guest_state->rflags = info->ctrl_regs.rflags;
+
guest_state->rax = info->vm_regs.rax;
guest_state->rip = info->rip;
guest_state->rsp = info->vm_regs.rsp;
+
+ set_vmcb_segments((vmcb_t*)(info->vmm_data), &(info->segments));
+
if (exit_code == VMEXIT_INTR) {
PrintDebug("INTR ret IP = %x\n", guest_state->rip);
}