X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvm_guest.c;h=fe22f0b10441f8f63da69dab807aed5b49714ffc;hb=cd3edffa0e451af761b9dcee021ca06ebb301345;hp=e295c1af8bea4fc33e71c013817e71edc8500627;hpb=dc039f2009a773f8090c15cdacaa4b84b1780ee4;p=palacios.git

diff --git a/palacios/src/palacios/vm_guest.c b/palacios/src/palacios/vm_guest.c
index e295c1a..fe22f0b 100644
--- a/palacios/src/palacios/vm_guest.c
+++ b/palacios/src/palacios/vm_guest.c
@@ -28,7 +28,7 @@
 #include <palacios/vm_guest_mem.h>
 #include <palacios/vmm_lowlevel.h>
 #include <palacios/vmm_sprintf.h>
-
+#include <palacios/vmm_muxer.h>
 
 
 v3_cpu_mode_t v3_get_vm_cpu_mode(struct guest_info * info) {
@@ -198,7 +198,7 @@ int v3_translate_segment(struct guest_info * info, uint16_t selector, struct v3_
 	return -1;
     }
 
-    if (guest_va_to_host_va(info, gdt->base, &gdt_addr) == -1) {
+    if (v3_gva_to_hva(info, gdt->base, &gdt_addr) == -1) {
 	PrintError("Unable to translate GDT address\n");
 	return -1;
     }
@@ -278,6 +278,8 @@ void v3_print_guest_state(struct guest_info * info) {
     }
     v3_print_GPRs(info);
 
+    v3_print_mem_map(info->vm_info);
+
     v3_print_stack(info);
 }
 
@@ -294,12 +296,12 @@ void v3_print_stack(struct guest_info * info) {
     V3_Print("Stack  at %p:\n", (void *)linear_addr);
    
     if (info->mem_mode == PHYSICAL_MEM) {
-	if (guest_pa_to_host_va(info, linear_addr, &host_addr) == -1) {
+	if (v3_gpa_to_hva(info, linear_addr, &host_addr) == -1) {
 	    PrintError("Could not translate Stack address\n");
 	    return;
 	}
     } else if (info->mem_mode == VIRTUAL_MEM) {
-	if (guest_va_to_host_va(info, linear_addr, &host_addr) == -1) {
+	if (v3_gva_to_hva(info, linear_addr, &host_addr) == -1) {
 	    PrintError("Could not translate Virtual Stack address\n");
 	    return;
 	}
@@ -363,23 +365,25 @@ void v3_print_GPRs(struct guest_info * info) {
 #include <palacios/vmcb.h>
 static int info_hcall(struct guest_info * core, uint_t hcall_id, void * priv_data) {
     v3_cpu_arch_t cpu_type = v3_get_cpu_type(v3_get_cpu_id());
-    
+    int cpu_valid = 0;
+
     v3_print_guest_state(core);
     
-
     // init SVM/VMX
 #ifdef 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
-    else if ((cpu_type == V3_VMX_CPU) || (cpu_type == V3_VMX_EPT_CPU)) {
+    if ((cpu_type == V3_VMX_CPU) || (cpu_type == V3_VMX_EPT_CPU)) {
+	cpu_valid = 1;
 	v3_print_vmcs();
     }
 #endif
-    else {
-	PrintError("Invalid CPU Type\n");
+    if (!cpu_valid) {
+	PrintError("Invalid CPU Type 0x%x\n", cpu_type);
 	return -1;
     }
     
@@ -403,6 +407,11 @@ static int info_hcall(struct guest_info * core, uint_t hcall_id, void * priv_dat
 
 int v3_init_vm(struct v3_vm_info * vm) {
     v3_cpu_arch_t cpu_type = v3_get_cpu_type(v3_get_cpu_id());
+    int cpu_valid = 0;
+
+    if (v3_get_foreground_vm() == NULL) {
+	v3_set_foreground_vm(vm);
+    }
 
 #ifdef CONFIG_TELEMETRY
     v3_init_telemetry(vm);
@@ -421,18 +430,20 @@ int v3_init_vm(struct v3_vm_info * vm) {
 	return -1;
     }
 
-#ifdef CONFIG_SYMBIOTIC
-    v3_init_sym_iface(vm);
-#endif
+    v3_init_mem_hooks(vm);
+
+    if (v3_init_shdw_impl(vm) == -1) {
+	PrintError("VM initialization error in shadow implementaion\n");
+	return -1;
+    }
 
-    v3_init_dev_mgr(vm);
 
 
-#ifdef CONFIG_SYMBIOTIC_SWAP
-    PrintDebug("initializing symbiotic swap\n");
-    v3_init_sym_swap(vm);
+#ifdef CONFIG_SYMBIOTIC
+    v3_init_symbiotic_vm(vm);
 #endif
 
+    v3_init_dev_mgr(vm);
 
 
     // init SVM/VMX
@@ -440,24 +451,23 @@ int v3_init_vm(struct v3_vm_info * vm) {
     if ((cpu_type == V3_SVM_CPU) || (cpu_type == V3_SVM_REV3_CPU)) {
 	v3_init_svm_io_map(vm);
 	v3_init_svm_msr_map(vm);
-    }
+	cpu_valid = 1;
+    } 
 #endif
 #ifdef CONFIG_VMX
-    else if ((cpu_type == V3_VMX_CPU) || (cpu_type == V3_VMX_EPT_CPU)) {
+    if ((cpu_type == V3_VMX_CPU) || (cpu_type == V3_VMX_EPT_CPU)) {
 	v3_init_vmx_io_map(vm);
 	v3_init_vmx_msr_map(vm);
+	cpu_valid = 1;
     }
 #endif
-    else {
-	PrintError("Invalid CPU Type\n");
+    if (!cpu_valid) {
+	PrintError("Invalid CPU Type 0x%x\n", cpu_type);
 	return -1;
     }
     
-
-
     v3_register_hypercall(vm, GUEST_INFO_HCALL, info_hcall, NULL);
 
-
     V3_Print("GUEST_INFO_HCALL=%x\n", GUEST_INFO_HCALL);
 
     return 0;
@@ -465,6 +475,7 @@ int v3_init_vm(struct v3_vm_info * vm) {
 
 int v3_init_core(struct guest_info * core) {
     v3_cpu_arch_t cpu_type = v3_get_cpu_type(v3_get_cpu_id());
+    int cpu_valid = 0;
     struct v3_vm_info * vm = core->vm_info;
 
     /*
@@ -475,7 +486,7 @@ int v3_init_core(struct guest_info * core) {
 #endif
 
     if (core->shdw_pg_mode == SHADOW_PAGING) {
-	v3_init_shadow_page_state(core);
+	v3_init_shdw_pg_state(core);
     }
 
     v3_init_time(core);
@@ -486,7 +497,7 @@ int v3_init_core(struct guest_info * core) {
 
 
 #ifdef CONFIG_SYMBIOTIC
-    v3_init_sym_core(core);
+    v3_init_symbiotic_core(core);
 #endif
 
     // init SVM/VMX
@@ -496,18 +507,20 @@ int v3_init_core(struct guest_info * core) {
 	    PrintError("Error in SVM initialization\n");
 	    return -1;
 	}
+	cpu_valid = 1;
     }
 #endif
 #ifdef CONFIG_VMX
-    else if ((cpu_type == V3_VMX_CPU) || (cpu_type == V3_VMX_EPT_CPU)) {
+    if ((cpu_type == V3_VMX_CPU) || (cpu_type == V3_VMX_EPT_CPU)) {
 	if (v3_init_vmx_vmcs(core, vm->vm_class) == -1) {
 	    PrintError("Error in VMX initialization\n");
 	    return -1;
 	}
+	cpu_valid = 1;
     }
 #endif
-    else {
-	PrintError("Invalid CPU Type\n");
+    if (!cpu_valid) {
+	PrintError("Invalid CPU Type 0x%x\n", cpu_type);
 	return -1;
     }