X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=c3a97d80a7f3c0a6f2fd4806419f547d6f0db4a1;hb=82cceefa66b1f05d8f9d5bfcb2fb7214755e1904;hp=2aea24cc10aa2dae39faf7f26b1093219e653892;hpb=c373d9a80b116014c546e7761982fedf7419664b;p=palacios.git

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 2aea24c..c3a97d8 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -1,3 +1,22 @@
+/*
+ * 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
 
@@ -12,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;
 
@@ -82,16 +102,16 @@ struct shadow_page_state;
 struct shadow_map;
 struct vmm_io_map;
 struct emulation_state;
-
+struct v3_intr_state;
 
 struct vm_ctrl_ops {
   int (*raise_irq)(struct guest_info * info, int irq);
+  int (*lower_irq)(struct guest_info * info, int irq);
 };
 
 
 
 
-
 typedef enum {SHADOW_PAGING, NESTED_PAGING} vmm_paging_mode_t;
 typedef enum {VM_RUNNING, VM_STOPPED, VM_SUSPENDED, VM_ERROR, VM_EMULATING} vm_operating_mode_t;
 
@@ -117,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;
 
@@ -139,6 +161,10 @@ struct guest_info {
 
   vm_operating_mode_t run_state;
   void * vmm_data;
+
+  /* TEMP */
+  //ullong_t exit_tsc;
+
 };
 
 
@@ -150,7 +176,7 @@ void PrintV3Segments(struct guest_info * info);
 void PrintV3CtrlRegs(struct guest_info * info);
 void PrintV3GPRs(struct guest_info * info);
 
-#endif
+#endif // ! __V3VEE__