X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fvm.c;h=fe50c29c7fae9b5eeb2d007a22cf095ab0f57c6d;hb=d16ef42bba84c7fe88352e5dc23e5e70a5207e29;hp=6ceda0a4724c623dc329d03b66259827201b3dce;hpb=09149700a57ced21de742451c9302320ca4eebc2;p=palacios.git

diff --git a/palacios/src/geekos/vm.c b/palacios/src/geekos/vm.c
index 6ceda0a..fe50c29 100644
--- a/palacios/src/geekos/vm.c
+++ b/palacios/src/geekos/vm.c
@@ -4,13 +4,15 @@
 #include <geekos/serial.h>
 #include <geekos/vm.h>
 #include <geekos/screen.h>
-#include <palacios/vmm_dev_mgr.h>
+
 #include <devices/nvram.h>
 #include <devices/timer.h>
 #include <devices/simple_pic.h>
 #include <devices/8259a.h>
-#include <palacios/vmm_intr.h>
+#include <devices/keyboard.h>
 
+#include <palacios/vmm_intr.h>
+#include <palacios/vmm_dev_mgr.h>
 
 #define SPEAKER_PORT 0x61
 
@@ -151,7 +153,9 @@ void BuzzVM()
 
 
 
-
+/* We need a configuration mechanism, so we can wrap this completely inside the VMM code, 
+ * with no pollution into the HOST OS
+ */
 
 int RunVMM(struct Boot_Info * bootInfo) {
 
@@ -179,9 +183,11 @@ int RunVMM(struct Boot_Info * bootInfo) {
     os_hooks.hook_interrupt = &hook_irq_stub;
     os_hooks.ack_irq = &ack_irq;
  
-    //   DumpGDT();
+
     Init_VMM(&os_hooks, &vmm_ops);
   
+
+    /* MOVE THIS TO AN INIT GUEST ROUTINE */
     init_shadow_map(&(vm_info.mem_map));
     init_shadow_page_state(&(vm_info.shdw_pg_state));
     vm_info.page_mode = SHADOW_PAGING;
@@ -193,6 +199,7 @@ int RunVMM(struct Boot_Info * bootInfo) {
     init_interrupt_state(&vm_info);
 
     dev_mgr_init(&(vm_info.dev_mgr));
+    /* ** */
     
     if (0) {
       
@@ -239,33 +246,33 @@ int RunVMM(struct Boot_Info * bootInfo) {
       void * region_start;
 
  
-      PrintDebug("Guest Size: %lu\n", bootInfo->guest_size);
+      PrintBoth("Guest Size: %lu\n", bootInfo->guest_size);
 
       struct guest_mem_layout * layout = (struct guest_mem_layout *)0x100000;
 
       if (layout->magic != MAGIC_CODE) {
-	PrintDebug("Layout Magic Mismatch (0x%x)\n", layout->magic);
+	PrintBoth("Layout Magic Mismatch (0x%x)\n", layout->magic);
       }
 
-      PrintDebug("%d layout regions\n", layout->num_regions);
+      PrintBoth("%d layout regions\n", layout->num_regions);
 
       region_start = (void *)&(layout->regions[layout->num_regions]);
 
-      PrintDebug("region start = 0x%x\n", region_start);
+      PrintBoth("region start = 0x%x\n", region_start);
 
       for (i = 0; i < layout->num_regions; i++) {
 	struct layout_region * reg = &(layout->regions[i]);
 	uint_t num_pages = (reg->length / PAGE_SIZE) + ((reg->length % PAGE_SIZE) ? 1 : 0);
 	void * guest_mem = Allocate_VMM_Pages(num_pages);
 
-	PrintDebug("Layout Region %d bytes\n", reg->length);
+	PrintBoth("Layout Region %d bytes\n", reg->length);
 	memcpy(guest_mem, region_start, reg->length);
 	
 	SerialMemDump((unsigned char *)(guest_mem), 16);
 
 	add_shadow_region_passthrough(&vm_info, reg->final_addr, reg->final_addr + (num_pages * PAGE_SIZE), (addr_t)guest_mem);
 
-	PrintDebug("Adding Shadow Region (0x%x-0x%x) -> 0x%x\n", reg->final_addr, reg->final_addr + (num_pages * PAGE_SIZE), guest_mem);
+	PrintBoth("Adding Shadow Region (0x%x-0x%x) -> 0x%x\n", reg->final_addr, reg->final_addr + (num_pages * PAGE_SIZE), guest_mem);
 
 	region_start += reg->length;
       }
@@ -275,10 +282,14 @@ int RunVMM(struct Boot_Info * bootInfo) {
       add_shadow_region_passthrough(&vm_info, 0xa0000, 0xc0000, 0xa0000); 
       
 
+
+      // TEMP
+      //add_shadow_region_passthrough(&vm_info, 0xc0000, 0xc8000, 0xc0000);
+
       if (1) {
 	add_shadow_region_passthrough(&vm_info, 0xc7000, 0xc8000, (addr_t)Allocate_VMM_Pages(1));
 	if (add_shadow_region_passthrough(&vm_info, 0xc8000, 0xf0000, (addr_t)Allocate_VMM_Pages(40)) == -1) {
-	  PrintDebug("Error adding shadow region\n");
+	  PrintBoth("Error adding shadow region\n");
 	}
       } else {
 	add_shadow_region_passthrough(&vm_info, 0xc0000, 0xc8000, 0xc0000);
@@ -286,37 +297,48 @@ int RunVMM(struct Boot_Info * bootInfo) {
       }
 
 
+      //add_shadow_region_passthrough(&vm_info, 0x100000, 0x2000000, (addr_t)Allocate_VMM_Pages(8192));
+      add_shadow_region_passthrough(&vm_info, 0x100000, 0x1000000, (addr_t)Allocate_VMM_Pages(4096));
+
+
       print_shadow_map(&(vm_info.mem_map));
 
       hook_io_port(&(vm_info.io_map), 0x61, &IO_Read, &IO_Write, NULL);
       hook_io_port(&(vm_info.io_map), 0x05, &IO_Read, &IO_Write_to_Serial, NULL);
 
-      /*
-	hook_io_port(&(vm_info.io_map), 0x20, &IO_Read, &IO_Write_to_Serial, NULL);
-	hook_io_port(&(vm_info.io_map), 0x21, &IO_Read, &IO_Write_to_Serial, NULL);
-	hook_io_port(&(vm_info.io_map), 0xa0, &IO_Read, &IO_Write_to_Serial, NULL);
-	hook_io_port(&(vm_info.io_map), 0xa1, &IO_Read, &IO_Write_to_Serial, NULL);
-      */
+
       hook_io_port(&(vm_info.io_map), 0x400, &IO_Read, &IO_Write_to_Serial, NULL);
       hook_io_port(&(vm_info.io_map), 0x401, &IO_Read, &IO_Write_to_Serial, NULL);
       hook_io_port(&(vm_info.io_map), 0x402, &IO_Read, &IO_BOCHS_debug, NULL);
       hook_io_port(&(vm_info.io_map), 0x403, &IO_Read, &IO_Write_to_Serial, NULL);
 
       {
-	//struct vm_device * nvram = create_nvram();
+	struct vm_device * nvram = create_nvram();
 	//struct vm_device * timer = create_timer();
 	struct vm_device * pic = create_pic();
+	struct vm_device * keyboard = create_keyboard();
 
-	//attach_device(&(vm_info), nvram);
+	attach_device(&(vm_info), nvram);
 	//attach_device(&(vm_info), timer);
 	attach_device(&(vm_info), pic);
+	attach_device(&(vm_info), keyboard);
 
 	PrintDebugDevMgr(&(vm_info.dev_mgr));
       }
 
-
+      // give keyboard interrupts to vm
+      //hook_irq(&vm_info, 1);
+      
+      // give floppy controller to vm
       hook_irq(&vm_info, 6);
 
+      // primary ide
+      hook_irq(&vm_info, 14);
+
+      // secondary ide
+      hook_irq(&vm_info, 15);
+
+
       vm_info.rip = 0xfff0;
       vm_info.vm_regs.rsp = 0x0;
     }