X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_direct_paging.c;h=421c3aa244f78b9861e797722ecf860a8032e048;hb=3716aafce2de9e12ed62bee37968bfc0e0eaed44;hp=6040e81398cd0178434856dea2b085595f3cd7db;hpb=65ffa7d1ac6dfb3399ba2b217d27519e258ee00a;p=palacios.git

diff --git a/palacios/src/palacios/vmm_direct_paging.c b/palacios/src/palacios/vmm_direct_paging.c
index 6040e81..421c3aa 100644
--- a/palacios/src/palacios/vmm_direct_paging.c
+++ b/palacios/src/palacios/vmm_direct_paging.c
@@ -25,7 +25,7 @@
 #include <palacios/vm_guest.h>
 
 
-#ifndef CONFIG_DEBUG_NESTED_PAGING
+#ifndef V3_CONFIG_DEBUG_NESTED_PAGING
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -33,7 +33,15 @@
 
 static addr_t create_generic_pt_page() {
     void * page = 0;
-    page = V3_VAddr(V3_AllocPages(1));
+    void *temp;
+
+    temp = V3_AllocPages(1);
+    if (!temp) { 
+	PrintError("Cannot allocate page\n");
+	return 0;
+    }
+
+    page = V3_VAddr(temp);
     memset(page, 0, PAGE_SIZE);
 
     return (addr_t)page;
@@ -169,7 +177,12 @@ int v3_invalidate_passthrough_addr(struct guest_info * info, addr_t inv_addr) {
 
 
 int v3_invalidate_nested_addr(struct guest_info * info, addr_t inv_addr) {
+
+#ifdef __V3_64BIT__
     v3_cpu_mode_t mode = LONG;
+#else 
+    v3_cpu_mode_t mode = PROTECTED;
+#endif
 
     switch(mode) {
 	case REAL: