X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=ea2252d18a72b36974f603c29a1b05c694bd84dc;hb=62406cf6b87a27a62921ce09a0aa44780ea25c06;hp=9475597d5d37929387b026bdd9cbc320b1c38f03;hpb=6f089682a19a99474faf05f74b44f9f71f58b30b;p=palacios.releases.git

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 9475597..ea2252d 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -1,20 +1,39 @@
-#ifndef __VM_GUEST_H
-#define __VM_GUEST_H
+/*
+ * 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__
 
 #ifdef __V3VEE__
 
-
-#include <palacios/vmm_mem.h>
 #include <palacios/vmm_types.h>
+#include <palacios/vmm_mem.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_time.h>
+#include <palacios/vmm_emulator.h>
+#include <palacios/vmm_host_events.h>
+#include <palacios/vmm_msr.h>
 
 
-typedef ullong_t v3_reg_t;
-
 
 
 struct v3_gprs {
@@ -36,9 +55,20 @@ struct v3_ctrl_regs {
   v3_reg_t cr4;
   v3_reg_t cr8;
   v3_reg_t rflags;
+  v3_reg_t efer;
 };
 
 
+
+struct v3_dbg_regs {
+  v3_reg_t dr0;
+  v3_reg_t dr1;
+  v3_reg_t dr2;
+  v3_reg_t dr3;
+  v3_reg_t dr6;
+  v3_reg_t dr7;
+};
+
 struct v3_segment {
   ushort_t selector;
   uint_t limit;
@@ -70,19 +100,12 @@ struct v3_segments {
 struct shadow_page_state;
 struct shadow_map;
 struct vmm_io_map;
-
-
-struct vm_ctrl_ops {
-  int (*raise_irq)(struct guest_info * info, int irq);
-};
-
+struct emulation_state;
+struct v3_intr_state;
 
 
 
 
-typedef enum {SHADOW_PAGING, NESTED_PAGING} vmm_paging_mode_t;
-typedef enum {REAL, /*UNREAL,*/ PROTECTED, PROTECTED_PAE, LONG, LONG_32_COMPAT, LONG_16_COMPAT} vm_cpu_mode_t;
-typedef enum {PHYSICAL_MEM, VIRTUAL_MEM} vm_mem_mode_t;
 
 struct guest_info {
   ullong_t rip;
@@ -93,41 +116,53 @@ struct guest_info {
 
   struct vm_time time_state;
   
-  vmm_paging_mode_t shdw_pg_mode;
+  v3_paging_mode_t shdw_pg_mode;
   struct shadow_page_state shdw_pg_state;
   addr_t direct_map_pt;
   // nested_paging_t nested_page_state;
 
 
   // 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;
+
+  struct v3_msr_map msr_map;
   // device_map
 
   struct vmm_dev_mgr  dev_mgr;
 
-  vm_cpu_mode_t cpu_mode;
-  vm_mem_mode_t mem_mode;
+  struct v3_host_events host_event_hooks;
+
+  v3_vm_cpu_mode_t cpu_mode;
+  v3_vm_mem_mode_t mem_mode;
 
 
   struct v3_gprs vm_regs;
   struct v3_ctrl_regs ctrl_regs;
+  struct v3_dbg_regs dbg_regs;
   struct v3_segments segments;
 
-  struct vm_ctrl_ops vm_ops;
+  struct emulation_state emulator;
 
+  v3_vm_operating_mode_t run_state;
+  void * vmm_data;
 
+  /* TEMP */
+  //ullong_t exit_tsc;
 
-  void * vmm_data;
 };
 
 
-void PrintV3Segments(struct guest_info * info);
-void PrintV3CtrlRegs(struct guest_info * info);
-void PrintV3GPRs(struct guest_info * info);
+v3_vm_cpu_mode_t v3_get_cpu_mode(struct guest_info * info);
+v3_vm_mem_mode_t v3_get_mem_mode(struct guest_info * info);
 
-#endif
+
+void v3_print_segments(struct guest_info * info);
+void v3_print_ctrl_regs(struct guest_info * info);
+void v3_print_GPRs(struct guest_info * info);
+
+#endif // ! __V3VEE__