Merge branch 'devel' of ssh://palacios@newskysaw/home/palacios/palacios into devel

[palacios.git] / test / geekos_test_vm / src / geekos / main.c

diff --git a/test/geekos_test_vm/src/geekos/main.c b/test/geekos_test_vm/src/geekos/main.c
index a163378..8dd05ab 100644 (file)
--- a/test/geekos_test_vm/src/geekos/main.c
+++ b/test/geekos_test_vm/src/geekos/main.c
@@ -241,18 +241,15 @@ void Main(struct Boot_Info* bootInfo)
 {
   struct Kernel_Thread * key_thread;
   struct Kernel_Thread * spkr_thread;
-
-
-  //  VMConsPutLineN("hello\n", 6);
-
   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();
@@ -268,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");