X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvm_guest.c;h=72f980cbdddf8b21de0acbd133932b45354d271b;hb=c30d1b88a60c3a8df426ce81553675bbe4afef52;hp=e0d55a5f5c0d4360c8122fff8a2806e8636cad80;hpb=95183ed0c20c9280fb109b668033c42e0b8e3d22;p=palacios.git diff --git a/palacios/src/palacios/vm_guest.c b/palacios/src/palacios/vm_guest.c index e0d55a5..72f980c 100644 --- a/palacios/src/palacios/vm_guest.c +++ b/palacios/src/palacios/vm_guest.c @@ -30,12 +30,7 @@ #include #include #include - -#ifdef CONFIG_SYSCALL_HIJACK -#include -#include -#endif - +#include v3_cpu_mode_t v3_get_vm_cpu_mode(struct guest_info * info) { @@ -326,6 +321,14 @@ void v3_print_guest_state(struct guest_info * info) { V3_Print("NumExits: %u\n", (uint32_t)info->num_exits); + V3_Print("IRQ STATE: started=%d, pending=%d\n", + info->intr_core_state.irq_started, + info->intr_core_state.irq_pending); + V3_Print("EXCP STATE: err_code_valid=%d, err_code=%x\n", + info->excp_state.excp_error_code_valid, + info->excp_state.excp_error_code); + + v3_print_segments(&(info->segments)); v3_print_ctrl_regs(info); @@ -492,14 +495,14 @@ static int info_hcall(struct guest_info * core, uint_t hcall_id, void * priv_dat v3_print_guest_state(core); // init SVM/VMX -#ifdef CONFIG_SVM +#ifdef V3_CONFIG_SVM if ((cpu_type == V3_SVM_CPU) || (cpu_type == V3_SVM_REV3_CPU)) { cpu_valid = 1; PrintDebugVMCB((vmcb_t *)(core->vmm_data)); } #endif -#ifdef CONFIG_VMX - if ((cpu_type == V3_VMX_CPU) || (cpu_type == V3_VMX_EPT_CPU)) { +#ifdef V3_CONFIG_VMX + if ((cpu_type == V3_VMX_CPU) || (cpu_type == V3_VMX_EPT_CPU) || (cpu_type == V3_VMX_EPT_UG_CPU)) { cpu_valid = 1; v3_print_vmcs(); } @@ -514,13 +517,13 @@ static int info_hcall(struct guest_info * core, uint_t hcall_id, void * priv_dat } -#ifdef CONFIG_SVM +#ifdef V3_CONFIG_SVM #include #include #include #endif -#ifdef CONFIG_VMX +#ifdef V3_CONFIG_VMX #include #include #include @@ -532,7 +535,7 @@ int v3_init_vm(struct v3_vm_info * vm) { -#ifdef CONFIG_TELEMETRY +#ifdef V3_CONFIG_TELEMETRY v3_init_telemetry(vm); #endif @@ -544,6 +547,8 @@ int v3_init_vm(struct v3_vm_info * vm) { v3_init_intr_routers(vm); v3_init_ext_manager(vm); + v3_init_barrier(vm); + // Initialize the memory map if (v3_init_mem_map(vm) == -1) { PrintError("Could not initialize shadow map\n"); @@ -561,7 +566,7 @@ int v3_init_vm(struct v3_vm_info * vm) { v3_init_time_vm(vm); -#ifdef CONFIG_SYMBIOTIC +#ifdef V3_CONFIG_SYMBIOTIC v3_init_symbiotic_vm(vm); #endif @@ -570,16 +575,17 @@ int v3_init_vm(struct v3_vm_info * vm) { // init SVM/VMX switch (cpu_type) { -#ifdef CONFIG_SVM +#ifdef V3_CONFIG_SVM case V3_SVM_CPU: case V3_SVM_REV3_CPU: v3_init_svm_io_map(vm); v3_init_svm_msr_map(vm); break; #endif -#ifdef CONFIG_VMX +#ifdef V3_CONFIG_VMX case V3_VMX_CPU: case V3_VMX_EPT_CPU: + case V3_VMX_EPT_UG_CPU: v3_init_vmx_io_map(vm); v3_init_vmx_msr_map(vm); break; @@ -604,22 +610,23 @@ int v3_free_vm_internal(struct v3_vm_info * vm) { -#ifdef CONFIG_SYMBIOTIC +#ifdef V3_CONFIG_SYMBIOTIC v3_deinit_symbiotic_vm(vm); #endif // init SVM/VMX switch (cpu_type) { -#ifdef CONFIG_SVM +#ifdef V3_CONFIG_SVM case V3_SVM_CPU: case V3_SVM_REV3_CPU: v3_deinit_svm_io_map(vm); v3_deinit_svm_msr_map(vm); break; #endif -#ifdef CONFIG_VMX +#ifdef V3_CONFIG_VMX case V3_VMX_CPU: case V3_VMX_EPT_CPU: + case V3_VMX_EPT_UG_CPU: v3_deinit_vmx_io_map(vm); v3_deinit_vmx_msr_map(vm); break; @@ -640,12 +647,14 @@ int v3_free_vm_internal(struct v3_vm_info * vm) { v3_deinit_intr_routers(vm); v3_deinit_host_events(vm); + v3_deinit_barrier(vm); + v3_deinit_cpuid_map(vm); v3_deinit_msr_map(vm); v3_deinit_io_map(vm); v3_deinit_hypercall_map(vm); -#ifdef CONFIG_TELEMETRY +#ifdef V3_CONFIG_TELEMETRY v3_deinit_telemetry(vm); #endif @@ -664,7 +673,7 @@ int v3_init_core(struct guest_info * core) { /* * Initialize the subsystem data strutures */ -#ifdef CONFIG_TELEMETRY +#ifdef V3_CONFIG_TELEMETRY v3_init_core_telemetry(core); #endif @@ -679,29 +688,15 @@ int v3_init_core(struct guest_info * core) { v3_init_decoder(core); -#ifdef CONFIG_SYMBIOTIC +#ifdef V3_CONFIG_SYMBIOTIC v3_init_symbiotic_core(core); #endif -// KCH -#ifdef CONFIG_SYSCALL_HIJACK - v3_init_exec_hooks(core); - v3_init_mpi_accel(core); - //v3_hook_swintr(core, 0x80, v3_syscall_handler, NULL); - /* hook a poll syscall */ - //v3_hook_syscall(core, 5, v3_sysopen_handler, NULL); - //v3_hook_syscall(core, 21, v3_sysmount_handler, NULL); - //char * args[2]; - //args[0] = "./envtest"; - //args[1] = "LD_PRELOAD=./libcwrap.so"; - //v3_hook_syscall(core, 11, v3_sysexecve_handler, (void*)args); -#endif - // init SVM/VMX switch (cpu_type) { -#ifdef CONFIG_SVM +#ifdef V3_CONFIG_SVM case V3_SVM_CPU: case V3_SVM_REV3_CPU: if (v3_init_svm_vmcb(core, vm->vm_class) == -1) { @@ -710,9 +705,10 @@ int v3_init_core(struct guest_info * core) { } break; #endif -#ifdef CONFIG_VMX +#ifdef V3_CONFIG_VMX case V3_VMX_CPU: case V3_VMX_EPT_CPU: + case V3_VMX_EPT_UG_CPU: if (v3_init_vmx_vmcs(core, vm->vm_class) == -1) { PrintError("Error in VMX initialization\n"); return -1; @@ -733,7 +729,7 @@ int v3_free_core(struct guest_info * core) { v3_cpu_arch_t cpu_type = v3_get_cpu_type(V3_Get_CPU()); -#ifdef CONFIG_SYMBIOTIC +#ifdef V3_CONFIG_SYMBIOTIC v3_deinit_symbiotic_core(core); #endif @@ -748,12 +744,12 @@ int v3_free_core(struct guest_info * core) { v3_free_passthrough_pts(core); -#ifdef CONFIG_TELEMETRY +#ifdef V3_CONFIG_TELEMETRY v3_deinit_core_telemetry(core); #endif switch (cpu_type) { -#ifdef CONFIG_SVM +#ifdef V3_CONFIG_SVM case V3_SVM_CPU: case V3_SVM_REV3_CPU: if (v3_deinit_svm_vmcb(core) == -1) { @@ -762,9 +758,10 @@ int v3_free_core(struct guest_info * core) { } break; #endif -#ifdef CONFIG_VMX +#ifdef V3_CONFIG_VMX case V3_VMX_CPU: case V3_VMX_EPT_CPU: + case V3_VMX_EPT_UG_CPU: if (v3_deinit_vmx_vmcs(core) == -1) { PrintError("Error in VMX initialization\n"); return -1;