X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_intr.h;h=d4543fdf96cb2a94f11ddcbcf0fcd84699b00f6d;hb=b84c13ec0315404c6b6de8c1d3a7a65ac766a782;hp=2f3596dba59ef3bdbf8a8b7bb3f043278d34fa29;hpb=28b1d0ae6db40cb3e1f5a9b3596b625d2f2af0e4;p=palacios.git

diff --git a/palacios/include/palacios/vmm_intr.h b/palacios/include/palacios/vmm_intr.h
index 2f3596d..d4543fd 100644
--- a/palacios/include/palacios/vmm_intr.h
+++ b/palacios/include/palacios/vmm_intr.h
@@ -1,9 +1,32 @@
+/*
+ * This file is part of the Palacios Virtual Machine Monitor developed
+ * by the V3VEE Project with funding from the United States National 
+ * Science Foundation and the Department of Energy.  
+ *
+ * The V3VEE Project is a joint project between Northwestern University
+ * and the University of New Mexico.  You can find out more at 
+ * http://www.v3vee.org
+ *
+ * Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> 
+ * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
+ * All rights reserved.
+ *
+ * Author: Jack Lange <jarusl@cs.northwestern.edu>
+ *
+ * This is free software.  You are permitted to use,
+ * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
+ */
+
 #ifndef __VMM_INTR_H_
 #define __VMM_INTR_H_
 
+
+#ifdef __V3VEE__
+
 #include <palacios/vmm_intr.h>
 #include <palacios/vmm_types.h>
 
+
 #define DE_EXCEPTION          0x00  
 #define DB_EXCEPTION          0x01
 #define NMI_EXCEPTION         0x02
@@ -25,13 +48,29 @@
 #define SX_EXCEPTION          0x1e
 
 
-typedef enum {INVALID_INTR, EXTERNAL_IRQ, NMI, EXCEPTION, SOFTWARE, VIRTUAL} intr_types_t;
+typedef enum {INVALID_INTR, EXTERNAL_IRQ, NMI, EXCEPTION, SOFTWARE_INTR, VIRTUAL_INTR} intr_type_t;
 
 struct guest_info;
+struct v3_interrupt;
+
+/* 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 v3_irq_hook {
+  int (*handler)(struct guest_info * info, struct v3_interrupt * intr, void * priv_data);
+  void * priv_data;
+};
 
-struct vm_intr {
+
+struct v3_intr_state {
+
+  /* We need to rework the exception state, to handle stacking */
   uint_t excp_pending;
   uint_t excp_num;
+  uint_t excp_error_code_valid : 1;
   uint_t excp_error_code;
   
   struct intr_ctrl_ops * controller;
@@ -39,27 +78,63 @@ struct vm_intr {
 
   /* some way to get the [A]PIC intr */
 
+  struct v3_irq_hook * hooks[256];
+  
 };
 
 
-int raise_irq(struct guest_info * info, int irq, int error_code);
-int hook_irq(struct guest_info * info, int irq);
+
+void init_interrupt_state(struct guest_info * info);
+
+
+int v3_raise_irq(struct guest_info * info, int irq);
+
+/*Zheng 07/30/2008*/
+int v3_lower_irq(struct guest_info * info, int irq);
+
+
+/*Zheng 07/30/2008*/
 
 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 (*lower_intr)(void * private_data, int irq);
+  int (*begin_irq)(void * private_data, int irq);
 };
 
 
 
-void init_interrupt_state(struct guest_info * info);
+
 void set_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, void * state);
 
-int raise_exception(struct guest_info * info, uint_t excp);
+int v3_raise_exception(struct guest_info * info, uint_t excp);
+int v3_raise_exception_with_error(struct guest_info * info, uint_t excp, uint_t error_code);
+
+int intr_pending(struct guest_info * info);
+uint_t get_intr_number(struct guest_info * info);
+intr_type_t get_intr_type(struct guest_info * info);
+
+int injecting_intr(struct guest_info * info, uint_t intr_num, intr_type_t type);
+
+/*
+int start_irq(struct vm_intr * intr);
+int end_irq(struct vm_intr * intr, int irq);
+*/
+
+
+
+int v3_hook_irq(struct guest_info * info, 
+		uint_t irq,
+		int (*handler)(struct guest_info * info, struct v3_interrupt * intr, void * priv_data),
+		void  * priv_data);
+
+int v3_hook_passthrough_irq(struct guest_info *info, uint_t irq);
+
+
+
+#endif // !__V3VEE__
+
 
-int intr_pending(struct vm_intr * intr);
-uint_t get_intr_number(struct vm_intr * intr);
-intr_types_t get_intr_type(struct vm_intr * intr);
 
 #endif