Merge branch 'lwip_dev' into devel

[palacios.git] / palacios / src / palacios / vmm_intr.c

diff --git a/palacios/src/palacios/vmm_intr.c b/palacios/src/palacios/vmm_intr.c
index ebe9d12..51316bb 100644 (file)
--- a/palacios/src/palacios/vmm_intr.c
+++ b/palacios/src/palacios/vmm_intr.c
@@ -1,3 +1,23 @@
+/* 
+ * 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".
+ */
+
+
 #include <palacios/vmm_intr.h>
 #include <palacios/vmm.h>
 
@@ -6,9 +26,6 @@
 #ifndef DEBUG_INTERRUPTS
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
-#else 
-#undef PrintDebug
-#define PrintDebug(fmt, args...) PrintTrace("\nvmm_intr.c(%d) "_f, __LINE__, ## _a)
 #endif
 
 
@@ -149,13 +166,14 @@ int v3_lower_irq(struct guest_info * info, int irq) {
 
   PrintDebug("[v3_lower_irq]\n");
 
-  //  if ((info->intr_state.controller) && 
-  //  (info->intr_state.controller->raise_intr)) {
+  if ((info->intr_state.controller) && 
+      (info->intr_state.controller->raise_intr)) {
     info->intr_state.controller->lower_intr(info->intr_state.controller_state, irq);
-    //} else {
-    // PrintDebug("There is no registered Interrupt Controller... (NULL POINTER)\n");
-    // return -1;
-    //}
+  } else {
+    PrintDebug("There is no registered Interrupt Controller... (NULL POINTER)\n");
+    return -1;
+  }
+
   return 0;
 }
 
@@ -167,13 +185,14 @@ int v3_raise_irq(struct guest_info * info, int irq) {
 
   PrintDebug("[v3_raise_irq]\n");
 
-  //  if ((info->intr_state.controller) && 
-  //  (info->intr_state.controller->raise_intr)) {
+  if ((info->intr_state.controller) && 
+      (info->intr_state.controller->raise_intr)) {
     info->intr_state.controller->raise_intr(info->intr_state.controller_state, irq);
-    //} else {
-    // PrintDebug("There is no registered Interrupt Controller... (NULL POINTER)\n");
-    // return -1;
-    //}
+  } else {
+    PrintDebug("There is no registered Interrupt Controller... (NULL POINTER)\n");
+    return -1;
+  }
+
   return 0;
 }