#include <palacios/vmm_profiler.h>
+#include <palacios/vmm_direct_paging.h>
extern void v3_stgi();
extern void v3_clgi();
+//extern int v3_svm_launch(vmcb_t * vmcb, struct v3_gprs * vm_regs, uint64_t * fs, uint64_t * gs);
extern int v3_svm_launch(vmcb_t * vmcb, struct v3_gprs * vm_regs);
ushort_t port = iter->port;
uchar_t * bitmap = (uchar_t *)io_port_bitmap;
- PrintDebug("%d: Hooking Port %d\n", i, port);
+ //PrintDebug("%d: Hooking Port %d\n", i, port);
bitmap += (port / 8);
// PrintDebug("Setting Bit for port 0x%x\n", port);
/* 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));
+ vm_info->direct_map_pt = (addr_t)V3_PAddr(v3_create_direct_passthrough_pts(vm_info));
/* End Test */
vm_info->shdw_pg_state.guest_cr0 = 0x0000000000000010LL;
}
+ /* Safety locations for fs/gs */
+ vm_info->fs = 0;
+ vm_info->gs = 0;
+
+
}
#define MSR_CSTAR 0xc0000083
#define MSR_SF_MASK 0xc0000084
#define MSR_GS_BASE 0xc0000101
+#define MSR_KERNGS_BASE 0xc0000102
+
struct v3_msr host_cstar;
struct v3_msr host_star;
struct v3_msr host_lstar;
struct v3_msr host_syscall_mask;
struct v3_msr host_gs_base;
+ struct v3_msr host_kerngs_base;
v3_enable_ints();
v3_clgi();
v3_get_msr(MSR_CSTAR, &(host_cstar.hi), &(host_cstar.lo));
v3_get_msr(MSR_SF_MASK, &(host_syscall_mask.hi), &(host_syscall_mask.lo));
v3_get_msr(MSR_GS_BASE, &(host_gs_base.hi), &(host_gs_base.lo));
+ v3_get_msr(MSR_KERNGS_BASE, &(host_kerngs_base.hi), &(host_kerngs_base.lo));
- rdtscll(info->time_state.cached_host_tsc);
+ rdtscll(info->time_state.cached_host_tsc);
guest_ctrl->TSC_OFFSET = info->time_state.guest_tsc - info->time_state.cached_host_tsc;
+ //v3_svm_launch((vmcb_t*)V3_PAddr(info->vmm_data), &(info->vm_regs), &(info->fs), &(info->gs));
v3_svm_launch((vmcb_t*)V3_PAddr(info->vmm_data), &(info->vm_regs));
+
rdtscll(tmp_tsc);
v3_set_msr(MSR_STAR, host_star.hi, host_star.lo);
v3_set_msr(MSR_CSTAR, host_cstar.hi, host_cstar.lo);
v3_set_msr(MSR_SF_MASK, host_syscall_mask.hi, host_syscall_mask.lo);
v3_set_msr(MSR_GS_BASE, host_gs_base.hi, host_gs_base.lo);
+ v3_set_msr(MSR_KERNGS_BASE, host_kerngs_base.hi, host_kerngs_base.lo);
//PrintDebug("SVM Returned\n");