Basic HRT startup for HVM, plus assorted cleanup

[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 626b98b..df1750b 100644 (file)
--- a/palacios/include/palacios/vmm_intr.h
+++ b/palacios/include/palacios/vmm_intr.h
@@ -28,13 +28,21 @@
 #include <palacios/vmm_lock.h>
 
 
-typedef enum {V3_INVALID_INTR, V3_EXTERNAL_IRQ, V3_VIRTUAL_IRQ, V3_NMI, V3_SOFTWARE_INTR} v3_intr_type_t;
+typedef enum {V3_INVALID_INTR=0, 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 {
+    uint32_t irq;
+
+    int (*ack)(struct guest_info * core, uint32_t irq, void * private_data);
+    void * private_data;
+};
+
+
 
 struct v3_irq_hook {
     int (*handler)(struct v3_vm_info * vm, struct v3_interrupt * intr, void * priv_data);
@@ -58,6 +66,9 @@ struct v3_intr_core_state {
     uint_t irq_started;
     uint_t irq_vector;
 
+    uint_t swintr_posted;
+    uint8_t swintr_vector;
+
     uint8_t virq_map[MAX_IRQ / 8];
 
     v3_lock_t irq_lock;
@@ -79,6 +90,14 @@ int v3_lower_virq(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);
 
+/* The irq structure is passed by value to avoid confusion and 
+ * the possibility that people will dynamically allocate memory for it 
+ */
+int v3_raise_acked_irq(struct v3_vm_info * vm, struct v3_irq irq);
+int v3_lower_acked_irq(struct v3_vm_info * vm, struct v3_irq irq);
+
+
+int v3_raise_swintr(struct guest_info * core, uint8_t vector);
 
 
 struct intr_ctrl_ops {
@@ -88,8 +107,8 @@ struct intr_ctrl_ops {
 };
 
 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);
+    int (*raise_intr)(struct v3_vm_info * vm, void * private_data, struct v3_irq * irq);
+    int (*lower_intr)(struct v3_vm_info * vm, void * private_data, struct v3_irq * irq);
 };
 
 void v3_clear_pending_intr(struct guest_info * core);
@@ -102,7 +121,7 @@ void v3_remove_intr_controller(struct guest_info * core, void * handle);
 void v3_remove_intr_router(struct v3_vm_info * vm, void * handle);
 
 v3_intr_type_t v3_intr_pending(struct guest_info * info);
-uint32_t v3_get_intr(struct guest_info * info);
+int v3_get_intr(struct guest_info * info);
 int v3_injecting_intr(struct guest_info * info, uint_t intr_num, v3_intr_type_t type);