X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fmain.c;h=41ece4db92de318eb20ca03cf9151bc90c8215dc;hb=01e2bfdc462dbbe8d62b71c7e99e198c27844f0f;hp=f7d614a321b38fba29b1aebedab69f069548249a;hpb=129ce047d500708a0c9fc9b873b981eb9409aff5;p=palacios.git

diff --git a/palacios/src/geekos/main.c b/palacios/src/geekos/main.c
index f7d614a..41ece4d 100644
--- a/palacios/src/geekos/main.c
+++ b/palacios/src/geekos/main.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2001,2003,2004 David H. Hovemeyer <daveho@cs.umd.edu>
  * Copyright (c) 2003, Jeffrey K. Hollingsworth <hollings@cs.umd.edu>
  * Copyright (c) 2004, Iulian Neamtiu <neamtiu@cs.umd.edu>
- * $Revision: 1.7 $
+ * $Revision: 1.11 $
  * 
  * This is free software.  You are permitted to use,
  * redistribute, and modify it as specified in the file "COPYING".
@@ -27,8 +27,8 @@
 #include <geekos/paging.h>
 #include <geekos/ide.h>
 
-#include <geekos/vmx.h>
-#include <geekos/vmcs.h>
+#include <geekos/debug.h>
+#include <geekos/vmm.h>
 
 #include <geekos/gdt.h>
 
@@ -206,7 +206,7 @@ extern char BSS_START, BSS_END;
 
 extern char end;
 
-
+/*
 void VM_Thread(ulong_t arg) 
 {
   int ret;
@@ -245,7 +245,7 @@ void VM_Thread(ulong_t arg)
   while (1) {}
     
 }
-
+*/
 
 int AllocateAndMapPagesForRange(uint_t start, uint_t length, pte_t template_pte)
 {
@@ -277,20 +277,16 @@ void Main(struct Boot_Info* bootInfo)
 {
   struct Kernel_Thread * key_thread;
   struct Kernel_Thread * spkr_thread;
-  struct Kernel_Thread * vm_thread;
-  struct VMDescriptor    vm;
+  // struct Kernel_Thread * vm_thread;
+  // struct VMDescriptor    vm;
 
   ulong_t doIBuzz = 0;
 
-
-
-  
-
   Init_BSS();
   Init_Screen();
 
 
-  InitSerial();
+  Init_Serial();
   Init_Mem(bootInfo);
   Init_CRC32();
   Init_TSS();
@@ -306,8 +302,6 @@ void Main(struct Boot_Info* bootInfo)
 
   Print("Done; stalling\n");
 
-  //  while(1);
-
 
   
 #if 0
@@ -326,22 +320,13 @@ void Main(struct Boot_Info* bootInfo)
 
 
 
-
-  SerialPrint("\n\nHello, Welcome to this horrid output-only serial interface\n");
-  SerialPrint("Eventually, this will let us control the VMM\n\n");
- 
-  SerialPrint("\n\n===>");
-  
   
-  SerialPrintLevel(100,"Initializing VMX\n");
-  PrintBoth("Initializing VMX\n");
-  VmxOnRegion * vmxRegion = InitVMX();
+  struct vmm_os_hooks os_hooks;
+  os_hooks.print_debug = &PrintBoth;
+  os_hooks.print_info = &Print;
+  os_hooks.print_trace = &SerialPrint;
 
-  if (vmxRegion==NULL) { 
-    PrintBoth("VMX Cannot be turned on.  Halted.\n");
-    while (1) {} 
-  }
-  
+  Init_VMM(&os_hooks);
 
   
   SerialPrintLevel(1000,"Launching Noisemaker and keyboard listener threads\n");
@@ -350,48 +335,16 @@ void Main(struct Boot_Info* bootInfo)
   spkr_thread = Start_Kernel_Thread(Buzzer, (ulong_t)&doIBuzz, PRIORITY_NORMAL, false);
 
 
-// Enable this to run the simple buzzer VM
-#if 0
 
-  // Put the entry around 0x10000, where the geekos kernel used to live
-  vm.entry_ip=(uint_t)0x10000;
-  vm.exit_eip=0;
-  // Put the stack as the last thing in the VM partition
-  vm.guest_esp=(uint_t)START_OF_VM+VM_SIZE-1;
-
-  
-  memcpy(vm.entry_ip,MYBUZZVM_START,MYBUZZVM_LEN);
- 
-  SerialPrintLevel(1000,"VM-Launching MyBuzzVM after copy to 0x10000\n");
 
-  vm_thread = Start_Kernel_Thread(VM_Thread, (ulong_t)&vm,PRIORITY_NORMAL,false);
 
-#else 
 
-#if 0
-
-  // write the hello VM down to where we would usually put
-  // vmxassist, and see if it can talk to us
-  vm.entry_ip=(uint_t)START_OF_VM+0xd000000;
-  vm.exit_eip=0;
-  // Put the stack as the last thing in the VM partition
-  vm.guest_esp=(uint_t)START_OF_VM+VM_SIZE-1;
-
-  
-  memcpy((void*)(vm.entry_ip),Hello,200);  // 200 should be plenty
- 
-  SerialPrintLevel(1000,"VM-Launching HelloVM after copy to 0xd000000\n");
-
-  vm_thread = Start_Kernel_Thread(VM_Thread, (ulong_t)&vm,PRIORITY_NORMAL,false);
-
-#else
   // Try to launch a real VM
 
-  // First we will copy down VMXAssist, then we'll launch that
-  // and see if it can handle the system bios
 
   // We now map pages of physical memory into where we are going
   // to slap the vmxassist, bios, and vgabios code
+  /*
   pte_t template_pte;
 
   template_pte.present=1;
@@ -407,7 +360,7 @@ void Main(struct Boot_Info* bootInfo)
 #define SEGLEN (1024*64)
 
   AllocateAndMapPagesForRange(START_OF_VM+0x100000, VM_KERNEL_LENGTH / 512, template_pte);
-
+*/
   // Now we should be copying into actual memory
 
   //SerialPrintLevel(1000,"Copying VM code from %x to %x (%d bytes)\n", VM_KERNEL_START, START_OF_VM+0x100000,VM_KERNEL_LENGTH);
@@ -415,20 +368,30 @@ void Main(struct Boot_Info* bootInfo)
 
   //SerialPrintLevel(1000, "VM copied\n");
 
+  /*
   // jump into vmxassist
-  vm.entry_ip=(uint_t)0x100000;
+  vm.entry_ip=(uint_t)0x00107fd0;
   vm.exit_eip=0;
   // Put the stack at 512K
-  vm.guest_esp=(uint_t)START_OF_VM+1024*512;
+  vm.guest_esp=(uint_t)4096 + 8192 - 4;
+  *(unsigned int *)(vm.guest_esp) = 1024 * 1024;
+  vm.guest_esp -= 4;
+  *(unsigned int *)(vm.guest_esp) = 8;
+  vm.guest_esp -= 4;
+  *(unsigned int *)(vm.guest_esp) = vm.guest_esp + 4;;
+  vm.guest_esp -= 4;
+  *(unsigned int *)(vm.guest_esp) = vm.entry_ip;
+  //  vm.guest_esp -= 4;
 
-
-  vm_thread = Start_Kernel_Thread(VM_Thread, (ulong_t)&vm,PRIORITY_NORMAL,false);
+ 
+  SerialMemDump((unsigned char *)vm.entry_ip, 512);
+  */
+ 
+  // vm_thread = Start_Kernel_Thread(VM_Thread, (ulong_t)&vm,PRIORITY_NORMAL,false);
 
   
   SerialPrintLevel(1000,"Next: setup GDT\n");
 
-#endif
-#endif
 
 
   TODO("Write a Virtual Machine Monitor");