X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_types.h;h=1a17997e64954676ca2e0b94becf62d5c373e754;hb=5614cff13837121053e831419f569b4e6e32bcd9;hp=1c2f9582a6487b3149bb26a4593b7e31a3cc6a77;hpb=207e3b36648e4019ad8505c75ae6ef0778464a26;p=palacios.git

diff --git a/palacios/include/palacios/vmm_types.h b/palacios/include/palacios/vmm_types.h
index 1c2f958..1a17997 100644
--- a/palacios/include/palacios/vmm_types.h
+++ b/palacios/include/palacios/vmm_types.h
@@ -21,18 +21,20 @@
 #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 {CORE_RUNNING, CORE_STOPPED} 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;
 
-typedef enum {REAL, /*UNREAL,*/ PROTECTED, PROTECTED_PAE, LONG, LONG_32_COMPAT, LONG_16_COMPAT} v3_vm_cpu_mode_t;
-typedef enum {PHYSICAL_MEM, VIRTUAL_MEM} v3_vm_mem_mode_t;
 
+#define NULL ((void *)0)
 
 
 typedef signed char schar_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,6 @@ typedef char sint8_t;
 
 typedef ulong_t addr_t;
 typedef ullong_t v3_reg_t;
-#endif // ! __V3VEE__
+#endif /* ! __V3VEE__ */
 
 #endif