X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_types.h;h=fc4fd5f824324f650cca226a41163f53352b2683;hb=4731ff7dc97e42853546b38b4d441d793e7a4ec8;hp=fd13ab73a7e948e27f462d2960e6e8eee2ee6a6f;hpb=62406cf6b87a27a62921ce09a0aa44780ea25c06;p=palacios.git

diff --git a/palacios/include/palacios/vmm_types.h b/palacios/include/palacios/vmm_types.h
index fd13ab7..fc4fd5f 100644
--- a/palacios/include/palacios/vmm_types.h
+++ b/palacios/include/palacios/vmm_types.h
@@ -21,17 +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 {PAGING_4KB, PAGING_2MB} v3_paging_size_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;
-
+typedef enum {INIT, SIPI, 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;
@@ -49,8 +53,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