lots of changes...

[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 28dae9e..56245ef 100644 (file)
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -1,10 +1,16 @@
 #ifndef __VM_GUEST_H
 #define __VM_GUEST_H
 
+
+
+
 #include <palacios/vmm_mem.h>
 #include <palacios/vmm_types.h>
 #include <palacios/vmm_io.h>
 #include <palacios/vmm_shadow_paging.h>
+#include <palacios/vmm_intr.h>
+#include <palacios/vmm_dev_mgr.h>
+#include <palacios/vmm_irq.h>
 
 
 typedef ullong_t gpr_t;
@@ -34,6 +40,15 @@ struct guest_gprs {
 
 
 struct shadow_page_state;
+struct shadow_map;
+
+
+struct vm_ctrl_ops {
+  int (*raise_irq)(struct guest_info * info, int irq, int error_code);
+};
+
+
+
 
 
 typedef enum {SHADOW_PAGING, NESTED_PAGING} vm_page_mode_t;
@@ -43,7 +58,7 @@ struct guest_info {
   ullong_t rip;
 
 
-  shadow_map_t mem_map;
+  struct shadow_map mem_map;
 
   
   vm_page_mode_t page_mode;
@@ -51,18 +66,28 @@ struct guest_info {
   // nested_paging_t nested_page_state;
 
 
+  // This structure is how we get interrupts for the guest
+  struct vm_intr intr_state;
+
+
+  // struct vmm_irq_map irq_map;
   vmm_io_map_t io_map;
   // device_map
 
+  struct vmm_dev_mgr  dev_mgr;
+
   vm_cpu_mode_t cpu_mode;
 
 
   struct guest_gprs vm_regs;
 
+  struct vm_ctrl_ops vm_ops;
+
   void * vmm_data;
 };
 
 
 
 
+
 #endif