X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=7987957ee02d40c83f1571db073a4fdf5848a07a;hb=749653dd91e8d012f77c9745421f2b7cd0d3da93;hp=38cfb70a787049a921e793599977a5bc832df381;hpb=60ad6a41c6d0ee08ed689e8505eb0c3df0c2a289;p=palacios.git

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index 38cfb70..7987957 100644
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -37,6 +37,10 @@
 #include <palacios/vmm_swapping.h>
 #endif
 
+#ifdef V3_CONFIG_MULTIBOOT
+#include <palacios/vmm_multiboot.h>
+#endif
+
 #ifdef V3_CONFIG_HVM
 #include <palacios/vmm_hvm.h>
 #endif
@@ -360,6 +364,12 @@ static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) {
 	return -1;
     }
 
+#ifdef V3_CONFIG_MULTIBOOT
+    if (v3_init_multiboot_vm(vm,vm_cfg)) { 
+	PrintError(vm,VCORE_NONE,"Cannot initialize Multiboot for VM\n");
+	return -1;
+    }
+#endif
 #ifdef V3_CONFIG_HVM
     if (v3_init_hvm_vm(vm,vm_cfg)) { 
 	PrintError(vm,VCORE_NONE,"Cannot initialize HVM for VM\n");
@@ -434,6 +444,12 @@ static int pre_config_core(struct guest_info * info, v3_cfg_tree_t * core_cfg) {
 	return -1;
     }
 
+#ifdef V3_CONFIG_MULTIBOOT
+    if (v3_init_multiboot_core(info)) { 
+	PrintError(info->vm_info, info, "Error Initializing Multiboot Core\n");
+	return -1;
+    }
+#endif
 #ifdef V3_CONFIG_HVM
     if (v3_init_hvm_core(info)) { 
 	PrintError(info->vm_info, info, "Error Initializing HVM Core\n");