updated geekos to new interface

diff --git a/geekos/src/geekos/paging.c b/geekos/src/geekos/paging.c
index 5aab5b1..3384787 100644 (file)
--- a/geekos/src/geekos/paging.c
+++ b/geekos/src/geekos/paging.c
@@ -171,8 +171,10 @@ static void Print_Fault_Info(uint_t address, faultcode_t faultCode)
     Dump_Interrupt_State(state);
     //SerialPrint_VMCS_ALL();
     /* user faults just kill the process */
-    if (!faultCode.userModeFault) KASSERT(0);
-
+    if (!faultCode.userModeFault) {
+       PrintBoth("Invalid Fault at %p\n", address);
+       KASSERT(0);
+    }
     /* For now, just kill the thread/process. */
     Exit(-1);
 }
@@ -203,9 +205,9 @@ void Init_VM(struct Boot_Info *bootInfo)
     return ;
   }
 
-  SerialPrintLevel(100,"Paging is currently OFF - initializing the pages for a 1-1 map\n");
+  PrintBoth("initializing Direct mapped pages for %dKB of RAM\n", bootInfo->memSizeKB);
   
-  numpages=bootInfo->memSizeKB / (PAGE_SIZE/1024);
+  numpages = bootInfo->memSizeKB / (PAGE_SIZE / 1024);
   numpagetables = numpages / NUM_PAGE_TABLE_ENTRIES + ((numpages % NUM_PAGE_TABLE_ENTRIES) != 0 );
 
   SerialPrintLevel(100,"We need %d pages, and thus %d page tables, and one page directory\n",numpages, numpagetables);

diff --git a/geekos/src/geekos/vm.c b/geekos/src/geekos/vm.c
index a58f179..32ee335 100644 (file)
--- a/geekos/src/geekos/vm.c
+++ b/geekos/src/geekos/vm.c
@@ -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();