X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fvm.c;h=4375e436889821103db8035cc720e4e00064f5c0;hb=28b1d0ae6db40cb3e1f5a9b3596b625d2f2af0e4;hp=a8ef613541f6fd4ca4e3ff8c0c4be31366d0acee;hpb=570ad6257ed18fbbc840c17a600f12f2dc44b010;p=palacios.git

diff --git a/palacios/src/geekos/vm.c b/palacios/src/geekos/vm.c
index a8ef613..4375e43 100644
--- a/palacios/src/geekos/vm.c
+++ b/palacios/src/geekos/vm.c
@@ -6,6 +6,10 @@
 #include <geekos/screen.h>
 #include <palacios/vmm_dev_mgr.h>
 #include <devices/nvram.h>
+#include <devices/timer.h>
+#include <devices/simple_pic.h>
+#include <palacios/vmm_intr.h>
+
 
 #define SPEAKER_PORT 0x61
 
@@ -40,30 +44,26 @@ inline uchar_t VM_In_Byte(ushort_t port)
 
 
 int IO_Read(ushort_t port, void * dst, uint_t length, void * priv_data) {
-  uchar_t * iter = dst;
-  uint_t i;
 
-  for (i = 0; i < length; i++) {
-    *iter = VM_In_Byte(port);    
-    iter++;
+  if (length != 1) {
+    return 0;
   }
-  
-  return 0;
+
+  *(uchar_t*)dst = VM_In_Byte(port);    
+  return 1;
 }
 
 
 
 int IO_Write(ushort_t port, void * src, uint_t length, void * priv_data) {
-  uchar_t * iter = src;
-  uint_t i;
 
-
-  for (i = 0; i < length; i++) {
-    VM_Out_Byte(port, *iter);    
-    iter++;
+  if (length != 1) {
+    return 0;
   }
 
-  return 0;
+  VM_Out_Byte(port, *(uchar_t *)src);    
+
+  return 1;
 }
 
 
@@ -160,6 +160,8 @@ int RunVMM(struct Boot_Info * bootInfo) {
     addr_t rsp;
     addr_t rip;
 
+
+
     memset(&os_hooks, 0, sizeof(struct vmm_os_hooks));
     memset(&vmm_ops, 0, sizeof(struct vmm_ctrl_ops));
     memset(&vm_info, 0, sizeof(struct guest_info));
@@ -184,9 +186,11 @@ int RunVMM(struct Boot_Info * bootInfo) {
 
     vm_info.cpu_mode = REAL;
 
+    //init_irq_map(&(vm_info.irq_map));
     init_vmm_io_map(&(vm_info.io_map));
-    init_interrupt_state(&(vm_info.intr_state));
+    init_interrupt_state(&vm_info);
 
+    dev_mgr_init(&(vm_info.dev_mgr));
     
     if (0) {
       
@@ -271,6 +275,7 @@ int RunVMM(struct Boot_Info * bootInfo) {
 	PrintDebug("Error adding shadow region\n");
       }
 
+
       print_shadow_map(&(vm_info.mem_map));
 
       hook_io_port(&(vm_info.io_map), 0x61, &IO_Read, &IO_Write, NULL);
@@ -287,13 +292,23 @@ 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 = nvram_create();
-	attach_device(&(vm_info), nvram);
-	
+	//struct vm_device * nvram = create_nvram();
+	//struct vm_device * timer = create_timer();
+	struct vm_device * pic = create_pic();
+
+	//attach_device(&(vm_info), nvram);
+	//attach_device(&(vm_info), timer);
+	attach_device(&(vm_info), pic);
+
 	PrintDebugDevMgr(&(vm_info.dev_mgr));
 	
+
+
       }
 
+
+      hook_irq(&vm_info, 6);
+
       vm_info.rip = 0xfff0;
       vm_info.vm_regs.rsp = 0x0;
     }
@@ -305,5 +320,4 @@ int RunVMM(struct Boot_Info * bootInfo) {
     (vmm_ops).start_guest(&vm_info);
 
     return 0;
-
 }