// Parse host-os defined options into an easily-accessed format.
v3_parse_options(options);
+#ifdef V3_CONFIG_MULTIBOOT
+ v3_init_multiboot();
+#endif
+
#ifdef V3_CONFIG_HVM
v3_init_hvm();
#endif
v3_deinit_hvm();
#endif
+#ifdef V3_CONFIG_MULTIBOOT
+ v3_deinit_multiboot();
+#endif
+
v3_deinit_options();
return -1;
}
+#if V3_CONFIG_MULTIBOOT
+ if (v3_setup_multiboot_vm_for_boot(vm)) {
+ PrintError(vm, VCORE_NONE, "Multiboot setup for boot failed\n");
+ return -1;
+ }
+#endif
#if V3_CONFIG_HVM
if (v3_setup_hvm_vm_for_boot(vm)) {
PrintError(vm, VCORE_NONE, "HVM setup for boot failed\n");
new_hpa = V3_AllocPagesExtended(num_pages,
PAGE_SIZE_4KB,
new_node,
- 0); // no constraints given new shadow pager impl
+ 0, 0); // no constraints given new shadow pager impl
if (!new_hpa) {
PrintError(vm, VCORE_NONE, "Cannot allocate memory for new base region...\n");