X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvm_guest.c;h=7dbbf2dcb8f36493624609215c8f8f37ddf6d245;hb=ef944e47f418cfbf344757e3fbab5e40927966fe;hp=d0a8fb83259ca5c6c216a7862bba85b9a8b5af93;hpb=ee1279646a778613b23a42350b903ebb57c068f8;p=palacios.git

diff --git a/palacios/src/palacios/vm_guest.c b/palacios/src/palacios/vm_guest.c
index d0a8fb8..7dbbf2d 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;
 	}
@@ -374,7 +376,7 @@ static int info_hcall(struct guest_info * core, uint_t hcall_id, void * priv_dat
     }
 #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_print_vmcs();
     }
 #endif
@@ -404,6 +406,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());
 
+
+    if (v3_get_foreground_vm() == NULL) {
+	v3_set_foreground_vm(vm);
+    }
+
 #ifdef CONFIG_TELEMETRY
     v3_init_telemetry(vm);
 #endif
@@ -421,6 +428,7 @@ int v3_init_vm(struct v3_vm_info * vm) {
 	return -1;
     }
 
+    v3_init_mem_hooks(vm);
 
     if (v3_init_shdw_impl(vm) == -1) {
 	PrintError("VM initialization error in shadow implementaion\n");
@@ -436,13 +444,6 @@ int v3_init_vm(struct v3_vm_info * vm) {
     v3_init_dev_mgr(vm);
 
 
-#ifdef CONFIG_SYMBIOTIC_SWAP
-    PrintDebug("initializing symbiotic swap\n");
-    v3_init_sym_swap(vm);
-#endif
-
-
-
     // init SVM/VMX
 #ifdef CONFIG_SVM
     if ((cpu_type == V3_SVM_CPU) || (cpu_type == V3_SVM_REV3_CPU)) {
@@ -451,7 +452,7 @@ int v3_init_vm(struct v3_vm_info * vm) {
     }
 #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);
     }
@@ -507,7 +508,7 @@ int v3_init_core(struct guest_info * core) {
     }
 #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;