almost done with the namespace protection via -D__V3VEE__ header wrappers

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

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index 306b103..737ec35 100644 (file)
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -1,3 +1,6 @@
+/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
+/* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
+
 #ifndef __VMM_H
 #define __VMM_H
 
@@ -121,7 +124,7 @@
 
 #define V3_Hook_Interrupt(irq, opaque)                         \
   ({                                                           \
-    int ret = 0;                                                       \
+    int ret = 0;                                               \
     extern struct vmm_os_hooks * os_hooks;                     \
     if ((os_hooks) && (os_hooks)->hook_interrupt) {            \
       ret = (os_hooks)->hook_interrupt(irq, opaque);           \
@@ -156,13 +159,6 @@ typedef enum v3_cpu_arch {V3_INVALID_CPU, V3_SVM_CPU, V3_SVM_REV3_CPU, V3_VMX_CP
 
 #endif //!__V3VEE__
 
-/*
-  #ifdef __V3VEE__
-  typedef struct guest_info v3_guest_t;
-  #else
-  typedef void v3_guest_t;
-  #endif
-*/
 
 
 //
@@ -178,10 +174,10 @@ struct vmm_intr_state {
 
   // This is the value given when the interrupt is hooked.
   // This will never be NULL
-  void *opaque;
+  void * opaque;
 };
 
-void deliver_interrupt_to_vmm(struct vmm_intr_state *state);
+void deliver_interrupt_to_vmm(struct vmm_intr_state * state);
 
 
 /* This will contain function pointers that provide OS services */
@@ -213,8 +209,6 @@ struct vmm_os_hooks {
 
 
 
-  // Filled in by initialization
-
 };