-extern uint_t Get_CR3();
-
-
-
extern void v3_stgi();
extern void v3_clgi();
extern int v3_svm_launch(vmcb_t * vmcb, struct v3_gprs * vm_regs);
-
+#include <palacios/vmm_ctrl_regs.h>
static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) {
vmcb_ctrl_t * ctrl_area = GET_VMCB_CTRL_AREA(vmcb);
ctrl_area->cr_reads.cr0 = 1;
ctrl_area->cr_writes.cr0 = 1;
+
+ /* Set up the efer to enable 64 bit page tables */
+ /*
+ {
+ struct efer_64 * efer = (struct efer_64 *)&(guest_state->efer);
+ struct cr4_32 * cr4 = (struct cr4_32 *)&(guest_state->cr4);
+ efer->lma = 1;
+ efer->lme = 1;
+
+ cr4->pae = 1;
+ }
+ */
+
guest_state->efer |= EFER_MSR_svm_enable;
+
+
+
guest_state->rflags = 0x00000002; // The reserved bit is always 1
ctrl_area->svm_instrs.VMRUN = 1;
ctrl_area->svm_instrs.VMMCALL = 1;
if (vm_info->shdw_pg_mode == SHADOW_PAGING) {
PrintDebug("Creating initial shadow page table\n");
- vm_info->direct_map_pt = (addr_t)V3_PAddr(create_passthrough_pde32_pts(vm_info));
- vm_info->shdw_pg_state.shadow_cr3 |= (vm_info->direct_map_pt & ~0xfff);
+
+
+ /* Testing 64 bit page tables for long paged real mode guests */
+ // vm_info->direct_map_pt = (addr_t)V3_PAddr(create_passthrough_pts_64(vm_info));
+ vm_info->direct_map_pt = (addr_t)V3_PAddr(create_passthrough_pts_32(vm_info));
+ /* End Test */
+
+ //vm_info->shdw_pg_state.shadow_cr3 |= (vm_info->direct_map_pt & ~0xfff);
+ vm_info->shdw_pg_state.shadow_cr3 = 0;
vm_info->shdw_pg_state.guest_cr0 = 0x0000000000000010LL;
PrintDebug("Created\n");
- guest_state->cr3 = vm_info->shdw_pg_state.shadow_cr3;
+ //guest_state->cr3 = vm_info->shdw_pg_state.shadow_cr3;
+
+ guest_state->cr3 = vm_info->direct_map_pt;
+
//PrintDebugPageTables((pde32_t*)(vm_info->shdw_pg_state.shadow_cr3.e_reg.low));
PrintDebug("NP_Enable at 0x%p\n", (void *)&(ctrl_area->NP_ENABLE));
// Set the Nested Page Table pointer
- vm_info->direct_map_pt = ((addr_t)create_passthrough_pde32_pts(vm_info) & ~0xfff);
+ vm_info->direct_map_pt = ((addr_t)create_passthrough_pts_32(vm_info) & ~0xfff);
ctrl_area->N_CR3 = vm_info->direct_map_pt;
// ctrl_area->N_CR3 = Get_CR3();
v3_clgi();
- PrintDebug("SVM Entry to rip=%p...\n", (void *)info->rip);
+ //PrintDebug("SVM Entry to rip=%p...\n", (void *)info->rip);
v3_get_msr(0xc0000101, &vm_cr_high, &vm_cr_low);
rdtscll(tmp_tsc);
v3_set_msr(0xc0000101, vm_cr_high, vm_cr_low);
- PrintDebug("SVM Returned\n");
+ //PrintDebug("SVM Returned\n");
#if PrintDebug
v3_update_time(info, tmp_tsc - info->time_state.cached_host_tsc);
num_exits++;
- PrintDebug("Turning on global interrupts\n");
+ //PrintDebug("Turning on global interrupts\n");
v3_stgi();
- PrintDebug("SVM Exit number %d\n", num_exits);
+ //PrintDebug("SVM Exit number %d\n", num_exits);
PrintDebug("SVM ERROR!!\n");
- PrintDebug("RIP: %p\n", (void *)guest_state->rip);
+ PrintDebug("RIP: %p\n", (void *)(addr_t)(guest_state->rip));
linear_addr = get_addr_linear(info, guest_state->rip, &(info->segments.cs));
if (vm_info.page_mode == SHADOW_PAGING) {
PrintDebug("Creating initial shadow page table\n");
- vm_info.shdw_pg_state.shadow_cr3 |= ((addr_t)create_passthrough_pde32_pts(&vm_info) & ~0xfff);
+ vm_info.shdw_pg_state.shadow_cr3 |= ((addr_t)create_passthrough_pts_32(&vm_info) & ~0xfff);
PrintDebug("Created\n");
guest_state->cr3 = vm_info.shdw_pg_state.shadow_cr3;