refactoring to the point of compilation

[palacios.git] / palacios / include / palacios / vmm_intr.h

diff --git a/palacios/include/palacios/vmm_intr.h b/palacios/include/palacios/vmm_intr.h
index 0781844..2a7c294 100644 (file)
--- a/palacios/include/palacios/vmm_intr.h
+++ b/palacios/include/palacios/vmm_intr.h
@@ -31,24 +31,29 @@
 typedef enum {V3_INVALID_INTR, V3_EXTERNAL_IRQ, V3_VIRTUAL_IRQ, V3_NMI, V3_SOFTWARE_INTR} v3_intr_type_t;
 
 struct guest_info;
+struct v3_vm_info;
 struct v3_interrupt;
 
 
 
 struct v3_irq_hook {
-    int (*handler)(struct guest_info * info, struct v3_interrupt * intr, void * priv_data);
+    int (*handler)(struct v3_vm_info * vm, struct v3_interrupt * intr, void * priv_data);
     void * priv_data;
 };
 
 #define MAX_IRQ 256
 
 
+struct v3_intr_routers {
+    struct list_head router_list;
 
+    v3_lock_t irq_lock;
 
-struct v3_intr_state {
-
-    struct list_head controller_list;
+    /* some way to get the [A]PIC intr */
+    struct v3_irq_hook * hooks[256];
+};
 
+struct v3_intr_core_state {
     uint_t irq_pending;
     uint_t irq_started;
     uint_t irq_vector;
@@ -57,42 +62,43 @@ struct v3_intr_state {
 
     v3_lock_t irq_lock;
 
-    /* some way to get the [A]PIC intr */
-    struct v3_irq_hook * hooks[256];
-  
+    struct list_head controller_list;
 };
 
 
 
-void v3_init_interrupt_state(struct guest_info * info);
-
+void v3_init_intr_controllers(struct guest_info * info);
+void v3_init_intr_routers(struct v3_vm_info * vm);
 
 int v3_raise_virq(struct guest_info * info, int irq);
 int v3_lower_virq(struct guest_info * info, int irq);
 
-int v3_raise_irq(struct guest_info * info, int irq);
-int v3_lower_irq(struct guest_info * info, int irq);
+int v3_raise_irq(struct v3_vm_info * vm, int irq);
+int v3_lower_irq(struct v3_vm_info * vm, int irq);
 
 
 
 struct intr_ctrl_ops {
     int (*intr_pending)(struct guest_info * info, void * private_data);
     int (*get_intr_number)(struct guest_info * info, void * private_data);
-    int (*raise_intr)(struct guest_info * info, void * private_data, int irq);
-    int (*lower_intr)(struct guest_info * info, void * private_data, int irq);
     int (*begin_irq)(struct guest_info * info, void * private_data, int irq);
 };
 
+struct intr_router_ops {
+    int (*raise_intr)(struct v3_vm_info * vm, void * private_data, int irq);
+    int (*lower_intr)(struct v3_vm_info * vm, void * private_data, int irq);
+};
 
 
-void v3_register_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, void * state);
+
+int v3_register_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, void * priv_data);
+int v3_register_intr_router(struct v3_vm_info * vm, struct intr_router_ops * ops, void * priv_data);
 
 v3_intr_type_t v3_intr_pending(struct guest_info * info);
 uint32_t v3_get_intr(struct guest_info * info);
+int v3_injecting_intr(struct guest_info * info, uint_t intr_num, v3_intr_type_t type);
 
-//intr_type_t v3_get_intr_type(struct guest_info * info);
 
-int v3_injecting_intr(struct guest_info * info, uint_t intr_num, v3_intr_type_t type);
 
 /*
   int start_irq(struct vm_intr * intr);
@@ -101,12 +107,12 @@ int v3_injecting_intr(struct guest_info * info, uint_t intr_num, v3_intr_type_t
 
 
 
-int v3_hook_irq(struct guest_info * info, 
+int v3_hook_irq(struct v3_vm_info * vm, 
                uint_t irq,
-               int (*handler)(struct guest_info * info, struct v3_interrupt * intr, void * priv_data),
+               int (*handler)(struct v3_vm_info * vm, struct v3_interrupt * intr, void * priv_data),
                void  * priv_data);
 
-int v3_hook_passthrough_irq(struct guest_info *info, uint_t irq);
+int v3_hook_passthrough_irq(struct v3_vm_info * vm, uint_t irq);