X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fvmm_stubs.c;h=25f300be437539d5bc0aa8bd6b41c3edf32b471a;hb=c34c7a69079dd6165db965454104f20c7d873c20;hp=a9db9c66accd6b7181b7afc57304e8dec479f7e0;hpb=ebf600fd1dc3b43e8100be168452c6e03b8a2dda;p=palacios.git

diff --git a/palacios/src/geekos/vmm_stubs.c b/palacios/src/geekos/vmm_stubs.c
index a9db9c6..25f300b 100644
--- a/palacios/src/geekos/vmm_stubs.c
+++ b/palacios/src/geekos/vmm_stubs.c
@@ -1,18 +1,18 @@
 #include <geekos/vmm_stubs.h>
 #include <geekos/serial.h>
-
+#include <palacios/vm_guest.h>
 
 
 void * Identity(void *addr) { return addr; };
 
 void * Allocate_VMM_Pages(int num_pages) {
   void * start_page = Alloc_Page();
-  SerialPrint("Allocating Page: %x (%d of %d)\n",start_page, 1, num_pages); 
+  //SerialPrint("Allocating Page: %x (%d of %d)\n",start_page, 1, num_pages); 
   int i = 1;
 
   while (i < num_pages) {
     void * tmp_page = Alloc_Page();
-    SerialPrint("Allocating Page: %x (%d of %d)\n",tmp_page, i+1, num_pages); 
+    //SerialPrint("Allocating Page: %x (%d of %d)\n",tmp_page, i+1, num_pages); 
     
     if (tmp_page != start_page + (PAGE_SIZE * i)) {
       //we have to start over...;
@@ -21,7 +21,7 @@ void * Allocate_VMM_Pages(int num_pages) {
 	i--;
       }
       start_page = Alloc_Page();
-      SerialPrint("Allocating Page: %x (%d of %d)\n",start_page, 1, num_pages);
+      //SerialPrint("Allocating Page: %x (%d of %d)\n",start_page, 1, num_pages);
       i = 1;
       continue;
     }
@@ -36,11 +36,56 @@ void Free_VMM_Page(void * page) {
 }
 
 
-void * VMM_Malloc(uint_t size) {
-  return Malloc((ulong_t) size);
+void * VMM_Malloc(unsigned int size) {
+  return Malloc((unsigned long) size);
 }
 
 
 void VMM_Free(void * addr) {
   Free(addr);
 }
+
+
+
+struct guest_info * irq_map[256];
+
+static void pic_intr_handler(struct Interrupt_State * state) {
+  Begin_IRQ(state);
+  struct guest_info * info =   irq_map[state->intNum - 32];
+  SerialPrint("Interrupt %d\n", state->intNum);
+
+  if (info) {
+    SerialPrint("Calling handler(info=%x)->%x\n", info, info->vm_ops.raise_irq);
+    info->vm_ops.raise_irq(info, state->intNum - 32, state->errorCode);
+  } else {
+    SerialPrint("Interrupt handler error: NULL pointer found, no action taken\n");
+    End_IRQ(state);
+    return;
+  }
+
+  // End_IRQ(state);
+}
+
+
+int hook_irq_stub(struct guest_info * info, int irq) {
+  if (irq_map[irq]) {
+    return -1;
+  }
+
+  SerialPrint("Hooking IRQ: %d (vm=0x%x)\n", irq, info);
+  irq_map[irq] = info;
+  Install_IRQ(irq, pic_intr_handler);
+  Enable_IRQ(irq);
+  return 0;
+}
+
+
+int ack_irq(int irq) {
+  End_IRQ_num(irq);
+  return 0;
+}
+
+  
+void Init_Stubs() {
+  memset(irq_map, 0, sizeof(struct guest_info *) * 256);
+}