X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_types.h;h=e4f8ed40f73d209ee85706ea02d90038b0caccca;hb=d57b407f9d05a21303bc2c94cbd5142de130be48;hp=0dee998aac2f536d527f980c9a217be5b3164cc0;hpb=57de08049d9a345445d26741c5ee0f7f9e5c2fcc;p=palacios.git

diff --git a/palacios/include/palacios/vmm_types.h b/palacios/include/palacios/vmm_types.h
index 0dee998..e4f8ed4 100644
--- a/palacios/include/palacios/vmm_types.h
+++ b/palacios/include/palacios/vmm_types.h
@@ -21,19 +21,21 @@
 #define __VMM_TYPES_H
 
 #ifdef __V3VEE__
-#include <palacios/vmm_stddef.h>
+//#include <palacios/vmm_stddef.h>
 
 
 
 
 typedef enum {SHADOW_PAGING, NESTED_PAGING} v3_paging_mode_t;
-typedef enum {VM_RUNNING, VM_STOPPED, VM_SUSPENDED, VM_ERROR, VM_EMULATING} v3_vm_operating_mode_t;
-
+typedef enum {VM_INVALID, VM_RUNNING, VM_STOPPED, VM_PAUSED, VM_ERROR, VM_SIMULATING, VM_RESETTING } v3_vm_operating_mode_t;
+typedef enum {CORE_INVALID, CORE_RUNNING, CORE_STOPPED, CORE_RESETTING } v3_core_operating_mode_t;
 
 typedef enum {REAL, /*UNREAL,*/ PROTECTED, PROTECTED_PAE, LONG, LONG_32_COMPAT, LONG_16_COMPAT} v3_cpu_mode_t;
 typedef enum {PHYSICAL_MEM, VIRTUAL_MEM} v3_mem_mode_t;
 
 
+#define NULL ((void *)0)
+
 
 typedef signed char schar_t;
 typedef unsigned char uchar_t;
@@ -50,8 +52,8 @@ typedef unsigned long long ullong_t;
 typedef signed long slong_t;
 typedef unsigned long ulong_t;
 
-//typedef unsigned long size_t;
-       
+typedef unsigned long size_t;
+typedef long ssize_t;       
 
 #define false 0
 #define true 1
@@ -74,6 +76,10 @@ typedef char sint8_t;
 
 typedef ulong_t addr_t;
 typedef ullong_t v3_reg_t;
-#endif // ! __V3VEE__
+
+typedef uint8_t v3_xmm_reg_t[16];
+typedef uint8_t v3_fp_mmx_reg_t[10];
+
+#endif /* ! __V3VEE__ */
 
 #endif