X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fvm.c;h=0b69b6abfec81f632ded6588d365f5ddeaabe432;hb=77cb02d9352065f780345e876eb104dd44237f66;hp=adef73204bce33c5eb799388508b7e4338253a3e;hpb=2b1f4ef19d766727f873476861c64339c8836a40;p=palacios.git

diff --git a/palacios/src/geekos/vm.c b/palacios/src/geekos/vm.c
index adef732..0b69b6a 100644
--- a/palacios/src/geekos/vm.c
+++ b/palacios/src/geekos/vm.c
@@ -5,20 +5,21 @@
 #include <geekos/vm.h>
 #include <geekos/screen.h>
 
+#include <devices/generic.h>
 #include <devices/nvram.h>
 #include <devices/timer.h>
 #include <devices/simple_pic.h>
 #include <devices/8259a.h>
+#include <devices/8254.h>
+#include <devices/keyboard.h>
 
 #include <palacios/vmm_intr.h>
 #include <palacios/vmm_dev_mgr.h>
+#include <palacios/vmm_time.h>
 
 #define SPEAKER_PORT 0x61
 
-
-
-
-inline void VM_Out_Byte(ushort_t port, uchar_t value)
+static inline void VM_Out_Byte(ushort_t port, uchar_t value)
 {
     __asm__ __volatile__ (
 	"outb %b0, %w1"
@@ -30,7 +31,7 @@ inline void VM_Out_Byte(ushort_t port, uchar_t value)
 /*
  * Read a byte from an I/O port.
  */
-inline uchar_t VM_In_Byte(ushort_t port)
+static inline uchar_t VM_In_Byte(ushort_t port)
 {
     uchar_t value;
 
@@ -45,6 +46,7 @@ inline uchar_t VM_In_Byte(ushort_t port)
 
 
 
+
 int IO_Read(ushort_t port, void * dst, uint_t length, void * priv_data) {
 
   if (length != 1) {
@@ -151,6 +153,17 @@ void BuzzVM()
 
 
 
+int passthrough_mem_read(addr_t guest_addr, void * dst, uint_t length, void * priv_data) {
+  memcpy(dst, (void*)guest_addr, length);
+  return length;
+}
+
+int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, void * priv_data) {
+  memcpy((void*)guest_addr, src, length);
+  return length;
+}
+
+
 
 /* We need a configuration mechanism, so we can wrap this completely inside the VMM code, 
  * with no pollution into the HOST OS
@@ -181,7 +194,7 @@ int RunVMM(struct Boot_Info * bootInfo) {
     os_hooks.paddr_to_vaddr = &Identity;
     os_hooks.hook_interrupt = &hook_irq_stub;
     os_hooks.ack_irq = &ack_irq;
- 
+    os_hooks.get_cpu_khz = &get_cpu_khz;
 
     Init_VMM(&os_hooks, &vmm_ops);
   
@@ -189,6 +202,7 @@ int RunVMM(struct Boot_Info * bootInfo) {
     /* MOVE THIS TO AN INIT GUEST ROUTINE */
     init_shadow_map(&(vm_info.mem_map));
     init_shadow_page_state(&(vm_info.shdw_pg_state));
+    v3_init_time(&(vm_info.time_state));
     vm_info.page_mode = SHADOW_PAGING;
 
     vm_info.cpu_mode = REAL;
@@ -278,8 +292,9 @@ int RunVMM(struct Boot_Info * bootInfo) {
       
       //     
       add_shadow_region_passthrough(&vm_info, 0x0, 0xa0000, (addr_t)Allocate_VMM_Pages(160));
-      add_shadow_region_passthrough(&vm_info, 0xa0000, 0xc0000, 0xa0000); 
       
+      add_shadow_region_passthrough(&vm_info, 0xa0000, 0xc0000, 0xa0000); 
+      //hook_guest_mem(&vm_info, 0xa0000, 0xc0000, passthrough_mem_read, passthrough_mem_write, NULL);
 
 
       // TEMP
@@ -303,7 +318,7 @@ int RunVMM(struct Boot_Info * bootInfo) {
       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), 0x05, &IO_Read, &IO_Write_to_Serial, NULL);
 
 
       hook_io_port(&(vm_info.io_map), 0x400, &IO_Read, &IO_Write_to_Serial, NULL);
@@ -312,20 +327,69 @@ int RunVMM(struct Boot_Info * bootInfo) {
       hook_io_port(&(vm_info.io_map), 0x403, &IO_Read, &IO_Write_to_Serial, NULL);
 
       {
+	
 	struct vm_device * nvram = create_nvram();
 	//struct vm_device * timer = create_timer();
 	struct vm_device * pic = create_pic();
+	struct vm_device * keyboard = create_keyboard();
+	struct vm_device * pit = create_pit();
+
+
+
+#if GENERIC
+	generic_port_range_type range[] = {
+          {0x00, 0x07},   // DMA 1 channels 0,1,2,3 (address, counter)
+          {0xc0, 0xc7},   // DMA 2 channels 4,5,6,7 (address, counter)
+          {0x87, 0x87},   // DMA 1 channel 0 page register
+          {0x83, 0x83},   // DMA 1 channel 1 page register
+          {0x81, 0x81},   // DMA 1 channel 2 page register
+          {0x82, 0x82},   // DMA 1 channel 3 page register
+          {0x8f, 0x8f},   // DMA 2 channel 4 page register
+          {0x8b, 0x8b},   // DMA 2 channel 5 page register
+          {0x89, 0x89},   // DMA 2 channel 6 page register
+          {0x8a, 0x8a},   // DMA 2 channel 7 page register
+	  {0x08, 0x0f},   // DMA 1 misc registers (csr, req, smask,mode,clearff,reset,enable,mmask)
+          {0xd0, 0xde},   // DMA 2 misc registers
+          {0x3f0, 0x3f2}, // Primary floppy controller (base,statusa/statusb,DOR)
+          {0x3f4, 0x3f5}, // Primary floppy controller (mainstat/datarate,data)
+          {0x3f7, 0x3f7}, // Primary floppy controller (DIR)
+          {0x370, 0x372}, // Secondary floppy controller (base,statusa/statusb,DOR)
+          {0x374, 0x375}, // Secondary floppy controller (mainstat/datarate,data)
+          {0x377, 0x377}, // Secondary floppy controller (DIR)
+          {0x378, 0x400}
+        };
+
+	struct vm_device * generic = create_generic(range,19,NULL,0,NULL,0);
+	
+#endif
 
 	attach_device(&(vm_info), nvram);
 	//attach_device(&(vm_info), timer);
 	attach_device(&(vm_info), pic);
+	attach_device(&(vm_info), pit);
+	attach_device(&(vm_info), keyboard);
+
+
+#if GENERIC
+	// Important that this be attached last!
+	attach_device(&(vm_info), generic);
+
+#endif
 
 	PrintDebugDevMgr(&(vm_info.dev_mgr));
       }
 
-      hook_irq(&vm_info, 6);
-      hook_irq(&vm_info, 14);
-      hook_irq(&vm_info, 15);
+      // 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;