Changes to interface with new irq hooking mechanism, plus

default config now includes direct injection of fd and ide irqs

diff --git a/palacios/src/geekos/vm.c b/palacios/src/geekos/vm.c
index 7170ecc..6c74852 100644 (file)
--- a/palacios/src/geekos/vm.c
+++ b/palacios/src/geekos/vm.c
@@ -213,6 +213,7 @@ int RunVMM(struct Boot_Info * bootInfo) {
     os_hooks.vaddr_to_paddr = &Identity;
     os_hooks.paddr_to_vaddr = &Identity;
     os_hooks.hook_interrupt = &hook_irq_stub;
+    os_hooks.hook_interrupt_new = &geekos_hook_interrupt_new;
     os_hooks.ack_irq = &ack_irq;
     os_hooks.get_cpu_khz = &get_cpu_khz;
 
@@ -375,10 +376,9 @@ int RunVMM(struct Boot_Info * bootInfo) {
 
 #if GENERIC
        generic_port_range_type range[] = {
-#if 0
+#if 1
           {0x00, 0x07, GENERIC_PRINT_AND_IGNORE},   // DMA 1 channels 0,1,2,3 (address, counter)
-          {0xc0, 0xc7, GENERIC_PRINT_AND_
-IGNORE},   // DMA 2 channels 4,5,6,7 (address, counter)
+          {0xc0, 0xc7, GENERIC_PRINT_AND_IGNORE},   // DMA 2 channels 4,5,6,7 (address, counter)
           {0x87, 0x87, GENERIC_PRINT_AND_IGNORE},   // DMA 1 channel 0 page register
           {0x83, 0x83, GENERIC_PRINT_AND_IGNORE},   // DMA 1 channel 1 page register
           {0x81, 0x81, GENERIC_PRINT_AND_IGNORE},   // DMA 1 channel 2 page register
@@ -391,7 +391,7 @@ IGNORE},   // DMA 2 channels 4,5,6,7 (address, counter)
           {0xd0, 0xde, GENERIC_PRINT_AND_IGNORE},   // DMA 2 misc registers
 #endif
 
-         
+         
          {0x3f8, 0x3f8+7, GENERIC_PRINT_AND_IGNORE},      // COM 1
          {0x2f8, 0x2f8+7, GENERIC_PRINT_AND_IGNORE},      // COM 2
          {0x3e8, 0x3e8+7, GENERIC_PRINT_AND_IGNORE},      // COM 3
@@ -449,15 +449,16 @@ IGNORE},   // DMA 2 channels 4,5,6,7 (address, counter)
       
 #if 1
       // give floppy controller to vm
-      hook_irq(&vm_info, 6);
+      hook_irq_for_guest_injection(&vm_info, 6);
 #endif
 
+#if 1
       //primary ide
-      hook_irq(&vm_info, 14);
+      hook_irq_for_guest_injection(&vm_info, 14);
 
       // secondary ide
-      hook_irq(&vm_info, 15);
-
+      hook_irq_for_guest_injection(&vm_info, 15);
+#endif
 
 
       vm_info.rip = 0xfff0;

diff --git a/palacios/src/geekos/vmm_stubs.c b/palacios/src/geekos/vmm_stubs.c
index 1e6a3a3..0dbe081 100644 (file)
--- a/palacios/src/geekos/vmm_stubs.c
+++ b/palacios/src/geekos/vmm_stubs.c
@@ -75,10 +75,51 @@ void VMM_Free(void * addr) {
   Free(addr);
 }
 
+//
+//
+// This is the interrupt state that the VMM's interrupt handlers need to see
+//
+struct vmm_intr_state {
+  uint_t irq;
+  uint_t error;
+
+  uint_t should_ack;  // Should the vmm ack this interrupt, or will
+                      // the host OS do it?
+
+  // This is the value given when the interrupt is hooked.
+  // This will never be NULL
+  void *opaque;
+};
+
+// This is the function the interface code should call to deliver
+// the interrupt to the vmm for handling
+extern void deliver_interrupt_to_vmm(struct vmm_intr_state *state);
 
 
 struct guest_info * irq_map[256];
 
+void *my_opaque[256];
+
+
+static void translate_intr_handler(struct Interrupt_State *state)
+{
+
+
+  struct vmm_intr_state mystate;
+
+  mystate.irq=state->intNum-32;
+  mystate.error=state->errorCode;
+  mystate.should_ack=0;
+  mystate.opaque=my_opaque[mystate.irq];
+
+  PrintBoth("translate_intr_handler: opaque=0x%x\n",mystate.opaque);
+
+  deliver_interrupt_to_vmm(&mystate);
+
+  End_IRQ(state);
+
+}
+
 static void pic_intr_handler(struct Interrupt_State * state) {
   Begin_IRQ(state);
   struct guest_info * info =   irq_map[state->intNum - 32];
@@ -95,7 +136,10 @@ static void pic_intr_handler(struct Interrupt_State * state) {
   // End_IRQ(state);
 }
 
-
+//
+//
+// I really don't know what the heck this is doing... PAD
+//
 int hook_irq_stub(struct guest_info * info, int irq) {
   if (irq_map[irq]) {
     return -1;
@@ -116,6 +160,23 @@ int hook_irq_stub(struct guest_info * info, int irq) {
 }
 
 
+int geekos_hook_interrupt_new(uint_t irq, void * opaque)
+{
+  if (my_opaque[irq]) { 
+    PrintBoth("Attempt to hook interrupt that is already hooked\n");
+    return -1;
+  } else {
+    PrintBoth("Hooked interrupt 0x%x with opaque 0x%x\n",irq,opaque);
+    my_opaque[irq]=opaque;
+  }
+
+  Disable_IRQ(irq);
+  Install_IRQ(irq,translate_intr_handler);
+  Enable_IRQ(irq);
+  return 0;
+}
+
+
 int ack_irq(int irq) {
   End_IRQ_num(irq);
   return 0;