X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fvmm_stubs.c;h=28f1126170a0fcd360bb2ee8c0af941703eb5a89;hb=624a05de781c51ed5d34a6db2583f884918a9594;hp=fb52584ac6516525f927789e8d507fba28011faf;hpb=701de97007c8b6776998eeab78469a4304f6b871;p=palacios.git

diff --git a/palacios/src/geekos/vmm_stubs.c b/palacios/src/geekos/vmm_stubs.c
index fb52584..28f1126 100644
--- a/palacios/src/geekos/vmm_stubs.c
+++ b/palacios/src/geekos/vmm_stubs.c
@@ -1,9 +1,34 @@
 #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) {
-  return Alloc_Page();
+  void * start_page = Alloc_Page();
+  //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); 
+    
+    if (tmp_page != start_page + (PAGE_SIZE * i)) {
+      //we have to start over...;
+      while (i >= 0) {
+	Free_Page(start_page + (PAGE_SIZE * i));
+	i--;
+      }
+      start_page = Alloc_Page();
+      //SerialPrint("Allocating Page: %x (%d of %d)\n",start_page, 1, num_pages);
+      i = 1;
+      continue;
+    }
+    i++;
+  }
+
+  return start_page;
 }
 
 void Free_VMM_Page(void * page) {
@@ -11,11 +36,57 @@ 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 (IRQ=%d)\n", state->intNum, state->intNum - 32);
+
+  if (info) {
+    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;
+  volatile void *foo = pic_intr_handler;
+  foo=0;
+  //  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);
+}