X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_intr.h;h=919576a6a577b914fb1ec93b33af6e6c629f4660;hb=da3c25c59f558869da8c2d91b28e32d977f33ea9;hp=402d6f963a460a6a8297286da2bf4acf0710624b;hpb=cf1eee7c0aec2016e99acf03077a728f7617a985;p=palacios.git

diff --git a/palacios/include/palacios/vmm_intr.h b/palacios/include/palacios/vmm_intr.h
index 402d6f9..919576a 100644
--- a/palacios/include/palacios/vmm_intr.h
+++ b/palacios/include/palacios/vmm_intr.h
@@ -25,10 +25,19 @@
 #define SX_EXCEPTION          0x1e
 
 
-typedef enum {INVALID_INTR, EXTERNAL_IRQ, NMI, EXCEPTION, SOFTWARE, VIRTUAL} intr_type_t;
+typedef enum {INVALID_INTR, EXTERNAL_IRQ, NMI, EXCEPTION, SOFTWARE_INTR, VIRTUAL_INTR} intr_type_t;
 
 struct guest_info;
 
+
+
+
+/* We need a way to allow the APIC/PIC to decide when they are supposed to receive interrupts...
+ * Maybe a notification call when they have been turned on, to deliver irqs to them...
+ * We can rehook the guest raise_irq op, to the appropriate controller
+ */
+
+
 struct vm_intr {
 
   /* We need to rework the exception state, to handle stacking */
@@ -45,13 +54,24 @@ struct vm_intr {
 };
 
 
-int raise_irq(struct guest_info * info, int irq, int error_code);
+
+int v3_raise_irq(struct guest_info * info, int irq);
 int hook_irq(struct guest_info * info, int irq);
 
+
+struct vmm_intr_state;
+
+int hook_irq_new(uint_t irq,
+		 void (*handler)(struct vmm_intr_state *state),
+		 void  *opaque);
+
+int hook_irq_for_guest_injection(struct guest_info *info, int irq);
+
+
 struct intr_ctrl_ops {
   int (*intr_pending)(void * private_data);
   int (*get_intr_number)(void * private_data);
-  int (*raise_intr)(void * private_data, int irq, int error_code);
+  int (*raise_intr)(void * private_data, int irq);
   int (*begin_irq)(void * private_data, int irq);
 };