X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=geekos%2Fsrc%2Fgeekos%2Fvm.c;h=e69aae4239ed250182c6ba2059598014a77cb00e;hb=a6bb8353586a69e1a7da521f1098815860bec513;hp=39144b03cc87dc88dca1e3a6c3f8042cca77fc70;hpb=18aca3554039ac4b38e4e7991eacf41960d81e51;p=palacios.git diff --git a/geekos/src/geekos/vm.c b/geekos/src/geekos/vm.c index 39144b0..e69aae4 100644 --- a/geekos/src/geekos/vm.c +++ b/geekos/src/geekos/vm.c @@ -104,11 +104,17 @@ int RunVMM(struct Boot_Info * bootInfo) { vm_config.rombios = region_start; vm_config.rombios_size = rombios->length; - + + vm_config.mem_size = 128 * 1024 * 1024; + region_start += rombios->length; +#ifdef PROFILE_VMM + vm_config.enable_profiling = 1; +#else vm_config.enable_profiling = 0; - +#endif + vm_config.vgabios = region_start; vm_config.vgabios_size = vgabios->length; } @@ -117,7 +123,7 @@ int RunVMM(struct Boot_Info * bootInfo) { if (g_ramdiskImage != NULL) { - vm_config.use_ramdisk = 1; + vm_config.use_ram_cd = 1; vm_config.ramdisk = g_ramdiskImage; vm_config.ramdisk_size = s_ramdiskSize; } @@ -130,11 +136,9 @@ int RunVMM(struct Boot_Info * bootInfo) { PrintBoth("Allocated Guest\n"); - (v3_ops).config_guest(vm_info, &vm_config); - PrintBoth("Configured guest\n"); + (v3_ops).init_guest(vm_info, &vm_config); - (v3_ops).init_guest(vm_info); PrintBoth("Starting Guest\n"); //Clear_Screen();