X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_intr.h;h=0aa703848b7279a6afc89e782c7bf094e28c2463;hb=6593ee3c311ec87304c7bed52a9e6034338679fb;hp=fb3f667d87ddd73b7237d61d2b808d8df0bfe767;hpb=fa7a42a55338e5fa49ec760b367225ca752df4fd;p=palacios.git

diff --git a/palacios/include/palacios/vmm_intr.h b/palacios/include/palacios/vmm_intr.h
index fb3f667..0aa7038 100644
--- a/palacios/include/palacios/vmm_intr.h
+++ b/palacios/include/palacios/vmm_intr.h
@@ -1,6 +1,28 @@
+/*
+ * 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>
 
@@ -29,8 +51,6 @@ typedef enum {INVALID_INTR, EXTERNAL_IRQ, NMI, EXCEPTION, SOFTWARE_INTR, VIRTUAL
 
 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
@@ -53,23 +73,33 @@ struct vm_intr {
 };
 
 
+
+void init_interrupt_state(struct guest_info * info);
+
+
 int v3_raise_irq(struct guest_info * info, int irq);
-int hook_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 (*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 raise_exception_with_error(struct guest_info * info, uint_t excp, uint_t error_code);
+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);
@@ -81,4 +111,23 @@ 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);
 */
+
+#endif // !__V3VEE__
+
+
+
+
+
+
+
+
+struct vmm_intr_state;
+
+int v3_hook_irq(uint_t irq,
+		void (*handler)(struct vmm_intr_state *state),
+		void  *opaque);
+
+int v3_hook_irq_for_guest_injection(struct guest_info *info, int irq);
+
+
 #endif