added host event hooks interface

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

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 224bc33..c3a97d8 100644 (file)
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -1,5 +1,21 @@
-/* Northwestern University */
-/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
+/*
+ * 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 __VM_GUEST_H
 #define __VM_GUEST_H
@@ -15,6 +31,7 @@
 #include <palacios/vmm_dev_mgr.h>
 #include <palacios/vmm_time.h>
 #include <palacios/vmm_emulator.h>
+#include <palacios/vmm_host_events.h>
 
 typedef ullong_t v3_reg_t;
 
@@ -85,8 +102,8 @@ struct shadow_page_state;
 struct shadow_map;
 struct vmm_io_map;
 struct emulation_state;
+struct v3_intr_state;
 
-/*Zheng 07/30/2008*/
 struct vm_ctrl_ops {
   int (*raise_irq)(struct guest_info * info, int irq);
   int (*lower_irq)(struct guest_info * info, int irq);
@@ -120,13 +137,15 @@ struct guest_info {
 
 
   // This structure is how we get interrupts for the guest
-  struct vm_intr intr_state;
+  struct v3_intr_state intr_state;
 
   struct vmm_io_map io_map;
   // device_map
 
   struct vmm_dev_mgr  dev_mgr;
 
+  struct v3_host_events host_event_hooks;
+
   vm_cpu_mode_t cpu_mode;
   vm_mem_mode_t mem_mode;
 
@@ -157,7 +176,7 @@ void PrintV3Segments(struct guest_info * info);
 void PrintV3CtrlRegs(struct guest_info * info);
 void PrintV3GPRs(struct guest_info * info);
 
-#endif
+#endif // ! __V3VEE__