* 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.5 $
+ * $Revision: 1.14 $
*
* This is free software. You are permitted to use,
* redistribute, and modify it as specified in the file "COPYING".
#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>
#include <geekos/vmm_sizes.h>
+#include <geekos/vmm_stubs.h>
/*
static inline unsigned int cpuid_ecx(unsigned int op)
int j;
unsigned char init;
-
+
+ SerialPrint("Starting To Buzz\n");
+
init=MyIn_Byte(SPEAKER_PORT);
while (1) {
-extern uint_t VMCS_STORE();
-extern uint_t VMCS_READ();
-
void Buzzer(ulong_t arg) {
+
+
void Hello(ulong_t arg)
{
char *b="hello ";
extern char end;
-
+/*
void VM_Thread(ulong_t arg)
{
int ret;
while (1) {}
}
+*/
+
int AllocateAndMapPagesForRange(uint_t start, uint_t length, pte_t template_pte)
{
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;
-
- while(1);
-
-
Init_BSS();
Init_Screen();
- InitSerial();
+ Init_Serial();
Init_Mem(bootInfo);
Init_CRC32();
Init_TSS();
Print("Done; stalling\n");
- // while(1);
-
#if 0
*/
#endif
-#if 1
- SerialPrint("Dumping GUEST KERNEL CODE (first 512*10 bytes @ 0x100000)\n");
- SerialMemDump((unsigned char *)0x100000, 512*10);
+#if 0
+ SerialPrint("Dumping GUEST KERNEL CODE (first 512*2 bytes @ 0x100000)\n");
+ SerialMemDump((unsigned char *)0x100000, 512*2);
#endif
- while(1);
-
- 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===>");
-
+ {
+ struct vmm_os_hooks os_hooks;
+ struct vmm_ctrl_ops vmm_ops;
+ guest_info_t vm_info;
+ memset(&os_hooks, 0, sizeof(struct vmm_os_hooks));
+ memset(&vmm_ops, 0, sizeof(struct vmm_ctrl_ops));
+ memset(&vm_info, 0, sizeof(guest_info_t));
+
+ os_hooks.print_debug = &PrintBoth;
+ os_hooks.print_info = &Print;
+ os_hooks.print_trace = &SerialPrint;
+ os_hooks.Allocate_Pages = &Allocate_VMM_Pages;
+ os_hooks.Free_Page = &Free_VMM_Page;
+
+ Init_VMM(&os_hooks, &vmm_ops);
- SerialPrintLevel(100,"Initializing VMX\n");
- PrintBoth("Initializing VMX\n");
- VmxOnRegion * vmxRegion = InitVMX();
- if (vmxRegion==NULL) {
- PrintBoth("VMX Cannot be turned on. Halted.\n");
- while (1) {}
+
+ vm_info.rip = (ullong_t)(void*)&BuzzVM;
+ vm_info.rsp = (ulong_t)Alloc_Page();
+
+ SerialPrint("Initializing Guest\n");
+ (vmm_ops).init_guest(&vm_info);
+ SerialPrint("Starting Guest\n");
+ (vmm_ops).start_guest(&vm_info);
+
}
-
-
+
SerialPrintLevel(1000,"Launching Noisemaker and keyboard listener threads\n");
key_thread = Start_Kernel_Thread(Keyboard_Listener, (ulong_t)&doIBuzz, PRIORITY_NORMAL, false);
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;
#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);
- memcpy((char*)(START_OF_VM+0x100000),(char*)VM_KERNEL_START,VM_KERNEL_LENGTH);
+ //SerialPrintLevel(1000,"Copying VM code from %x to %x (%d bytes)\n", VM_KERNEL_START, START_OF_VM+0x100000,VM_KERNEL_LENGTH);
+ //memcpy((char*)(START_OF_VM+0x100000),(char*)VM_KERNEL_START,VM_KERNEL_LENGTH);
//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;
- SerialPrintLevel(1000,"VM-Launching to vmxassist for boot\n");
-
- 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");
