X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvm_guest.c;h=17b1be80636d7f570946432495b7fb93c82128e6;hb=ac31dc84e5e31187345ec6d66647b29975958a94;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..17b1be8 100644
--- a/palacios/src/palacios/vm_guest.c
+++ b/palacios/src/palacios/vm_guest.c
@@ -421,18 +421,19 @@ int v3_init_vm(struct v3_vm_info * vm) {
 	return -1;
     }
 
-#ifdef CONFIG_SYMBIOTIC
-    v3_init_sym_iface(vm);
-#endif
 
-    v3_init_dev_mgr(vm);
+    if (v3_init_shdw_impl(vm) == -1) {
+	PrintError("VM initialization error in shadow implementaion\n");
+	return -1;
+    }
+
 
 
-#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
@@ -475,7 +476,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 +487,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