X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=geekos%2Fsrc%2Fgeekos%2Fvm.c;h=32ee335a20b3c58417b69e0be6a8301e2217f88b;hb=9c7773b6ae7d051317d770a494794d669a8224eb;hp=da04444e4f1b7111bdd8ce306b96495840405350;hpb=746934f539c53c6fc687890c02ebf886c6873342;p=palacios.git diff --git a/geekos/src/geekos/vm.c b/geekos/src/geekos/vm.c index da04444..32ee335 100644 --- a/geekos/src/geekos/vm.c +++ b/geekos/src/geekos/vm.c @@ -104,7 +104,9 @@ 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 @@ -112,6 +114,7 @@ int RunVMM(struct Boot_Info * bootInfo) { #else vm_config.enable_profiling = 0; #endif + vm_config.enable_pci = 1; vm_config.vgabios = region_start; vm_config.vgabios_size = vgabios->length; @@ -121,7 +124,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; } @@ -134,11 +137,12 @@ 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); + + PrintBoth("Initializing guest\n"); + (v3_ops).init_guest(vm_info, &vm_config); + PrintBoth("Starting Guest\n"); //Clear_Screen();