X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvm_guest.c;h=17b1be80636d7f570946432495b7fb93c82128e6;hb=17f8752ad440dba7d414d0812e3680066dcb8c9e;hp=e62835c83a804563b1dc1a0b491a8d375ec99395;hpb=f0e3b9e0d33d90a41cb2c3bb800ab38929c744b5;p=palacios-OLD.git

diff --git a/palacios/src/palacios/vm_guest.c b/palacios/src/palacios/vm_guest.c
index e62835c..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);
@@ -485,6 +486,9 @@ int v3_init_core(struct guest_info * core) {
     v3_init_decoder(core);
 
 
+#ifdef CONFIG_SYMBIOTIC
+    v3_init_symbiotic_core(core);
+#endif
 
     // init SVM/VMX
 #ifdef CONFIG_SVM