X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=geekos%2Fsrc%2Fgeekos%2Fvm.c;h=32ee335a20b3c58417b69e0be6a8301e2217f88b;hb=bbb2c127976c9cbb64af9e753a70f1bdc6310704;hp=c391c63a492fd1150bf23d59df1bc2ebacbc16b8;hpb=fc14d48378cdc90085786bccf4a5230261a0d315;p=palacios.git

diff --git a/geekos/src/geekos/vm.c b/geekos/src/geekos/vm.c
index c391c63..32ee335 100644
--- a/geekos/src/geekos/vm.c
+++ b/geekos/src/geekos/vm.c
@@ -104,9 +104,18 @@ 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.enable_pci = 1;
+
     vm_config.vgabios = region_start;
     vm_config.vgabios_size = vgabios->length;
   }
@@ -115,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;
   }
@@ -128,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();