X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=d4bd23ae4727185ee79ea8e61ac0c54967e739f4;hp=ed54ab5b1dc61aba1d4ef491f4366d76343308aa;hb=e63be432894673d56526c4f1c2cb4fa64daf01d9;hpb=c3714b74821dffe63b2fdcf10d8fe614c5ac9bb1

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index ed54ab5..d4bd23a 100644
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -26,6 +26,7 @@
 #include <palacios/vmm_mem.h>
 #include <palacios/vmm_hypercall.h>
 #include <palacios/vmm_dev_mgr.h>
+#include <palacios/vmm_sym_iface.h>
 
 #ifdef CONFIG_SYMBIOTIC_SWAP
 #include <palacios/vmm_sym_swap.h>
@@ -90,25 +91,11 @@ int v3_pre_config_guest(struct guest_info * info, struct v3_vm_config * config_p
     }
 #endif
 
-    v3_init_time(info);
+    v3_init_hypercall_map(info);
     v3_init_io_map(info);
     v3_init_msr_map(info);
-    v3_init_interrupt_state(info);
-    v3_init_exception_state(info);
-    v3_init_dev_mgr(info);
     v3_init_host_events(info);
 
-
-    v3_init_decoder(info);
-    
-    v3_init_hypercall_map(info);
-
-#ifdef CONFIG_SYMBIOTIC_SWAP
-    v3_init_sym_swap(info);
-#endif
-
-
-
     // Initialize the memory map
     v3_init_shadow_map(info);
     
@@ -122,6 +109,18 @@ int v3_pre_config_guest(struct guest_info * info, struct v3_vm_config * config_p
 	info->shdw_pg_mode = SHADOW_PAGING;
     }
 
+    v3_init_sym_iface(info);
+
+    v3_init_time(info);
+    v3_init_interrupt_state(info);
+    v3_init_exception_state(info);
+    v3_init_dev_mgr(info);
+    v3_init_decoder(info);
+    
+#ifdef CONFIG_SYMBIOTIC_SWAP
+    PrintDebug("initializing symbiotic swap\n");
+    v3_init_sym_swap(info);
+#endif
 
 
     if (config_ptr->schedule_freq == 0) {
@@ -156,6 +155,9 @@ int v3_post_config_guest(struct guest_info * info, struct v3_vm_config * config_
 	return -1;
     }
 
+    v3_print_io_map(info);
+    v3_print_msr_map(info);
+
     info->run_state = VM_STOPPED;
 
     info->vm_regs.rdi = 0;