X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvm_guest.c;h=ff5a35f46fd09f6433adcd72d8eec95e7fb10140;hb=8c5fc25ccb8bb8a5b4fa62e9ea2792dcfd31b636;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..ff5a35f 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) {
@@ -404,6 +404,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
@@ -436,13 +441,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)) {