reorganized swapbypass to isolate it to a special shadow paging implementation, and...

[palacios.git] / palacios / src / palacios / vm_guest.c

diff --git a/palacios/src/palacios/vm_guest.c b/palacios/src/palacios/vm_guest.c
index e62835c..17b1be8 100644 (file)
--- 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