X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=test%2Fgeekos_test_vm%2Fsrc%2Fgeekos%2Fmain.c;h=8dd05ab169833b36770b385d3d01c50600e40497;hb=cbbdb1c69dae70c0d8b836a3d9ff92e2aa67f1f9;hp=cc1f7228c1bf3abae4de5bea8529a87e0e5b7f09;hpb=ed8feff1d5dd6bf028cd5ba0960ec125505d7597;p=palacios.git

diff --git a/test/geekos_test_vm/src/geekos/main.c b/test/geekos_test_vm/src/geekos/main.c
index cc1f722..8dd05ab 100644
--- a/test/geekos_test_vm/src/geekos/main.c
+++ b/test/geekos_test_vm/src/geekos/main.c
@@ -17,7 +17,7 @@
 #include <geekos/crc32.h>
 #include <geekos/tss.h>
 #include <geekos/int.h>
-#include <geekos/kthread.h>
+#include <geekos/kthread.h> 
 #include <geekos/trap.h>
 #include <geekos/timer.h>
 #include <geekos/keyboard.h>
@@ -241,17 +241,15 @@ void Main(struct Boot_Info* bootInfo)
 {
   struct Kernel_Thread * key_thread;
   struct Kernel_Thread * spkr_thread;
-
-
-
   ulong_t doIBuzz = 0;
 
   Init_BSS();
+  Init_VMCons();
   Init_Screen();
   InitSerial();
-
-  Init_VMCons();
+  Print("Initializing Memory\n");
   Init_Mem(bootInfo);
+  Print("Memory Done\n");
   Init_CRC32();
   Init_TSS();
   Init_Interrupts();
@@ -267,10 +265,6 @@ void Main(struct Boot_Info* bootInfo)
 
 
 
-
-
-
-
   PrintBoth("\n\nHello, Welcome to this horrid output-only serial interface\n");
   PrintBoth("Eventually, this will let us control the VMM\n\n");
  
@@ -335,7 +329,7 @@ void Main(struct Boot_Info* bootInfo)
 
       
       //  Invalidate_PG((void *)0x2000);
-      
+       
       //  VM_Test(bootInfo, 32);  
       //VM_Test(bootInfo, 1536);
   }