X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=geekos%2Fsrc%2Fgeekos%2Fvm.c;h=32ee335a20b3c58417b69e0be6a8301e2217f88b;hb=fae3d4b2dab80486bc3e3617f65e603d26b45954;hp=7cb1acb9cae47b203d7c3bd6379ef3e6d5426261;hpb=9b1c6e98d2dc73f9569a28be0565090823cb1549;p=palacios.git diff --git a/geekos/src/geekos/vm.c b/geekos/src/geekos/vm.c index 7cb1acb..32ee335 100644 --- a/geekos/src/geekos/vm.c +++ b/geekos/src/geekos/vm.c @@ -106,7 +106,7 @@ int RunVMM(struct Boot_Info * bootInfo) { vm_config.rombios_size = rombios->length; vm_config.mem_size = 128 * 1024 * 1024; - + region_start += rombios->length; #ifdef PROFILE_VMM @@ -114,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; @@ -123,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; } @@ -136,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();