X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_direct_paging.c;h=9884620f5dbbd9be98e77032209bc640968854a9;hb=ff30ed5923877636b2b51bed0349f9b440625137;hp=df873bc07ce643352cd4ffa1c9c0118e3bfaf0c8;hpb=a568601e28c34c590815d1d2a16e85fbca352ebd;p=palacios.git

diff --git a/palacios/src/palacios/vmm_direct_paging.c b/palacios/src/palacios/vmm_direct_paging.c
index df873bc..9884620 100644
--- a/palacios/src/palacios/vmm_direct_paging.c
+++ b/palacios/src/palacios/vmm_direct_paging.c
@@ -24,39 +24,77 @@
 #include <palacios/vm_guest_mem.h>
 #include <palacios/vm_guest.h>
 
+
+#ifndef DEBUG_NESTED_PAGING
+#undef PrintDebug
+#define PrintDebug(fmt, args...)
+#endif
+
+
 static addr_t create_generic_pt_page() {
-  void * page = 0;
-  page = V3_VAddr(V3_AllocPages(1));
-  memset(page, 0, PAGE_SIZE);
+    void * page = 0;
+    page = V3_VAddr(V3_AllocPages(1));
+    memset(page, 0, PAGE_SIZE);
 
-  return (addr_t)page;
+    return (addr_t)page;
 }
 
 // Inline handler functions for each cpu mode
 #include "vmm_direct_paging_32.h"
 #include "vmm_direct_paging_32pae.h"
+#include "vmm_direct_paging_64.h"
 
 
 addr_t v3_create_direct_passthrough_pts(struct guest_info * info) {
-  return create_generic_pt_page();
+    return create_generic_pt_page();
 }
 
 int v3_handle_passthrough_pagefault(struct guest_info * info, addr_t fault_addr, pf_error_t error_code) {
-  v3_vm_cpu_mode_t mode = v3_get_cpu_mode(info);
-
-  switch(mode) {
-    case REAL:
-    case PROTECTED:
-      return handle_passthrough_pagefault_32(info, fault_addr, error_code);
-    case PROTECTED_PAE:
-      return handle_passthrough_pagefault_32pae(info, fault_addr, error_code);
-    case LONG:
-      break;
-    case LONG_32_COMPAT:
-      break;
-    default:
-      PrintError("Unknown CPU Mode\n");
-      break;
-  }
-  return -1;
+    v3_vm_cpu_mode_t mode = v3_get_cpu_mode(info);
+
+    switch(mode) {
+	case REAL:
+	case PROTECTED:
+	    return handle_passthrough_pagefault_32(info, fault_addr, error_code);
+
+	case PROTECTED_PAE:
+	case LONG:
+	case LONG_32_COMPAT:
+	    // Long mode will only use 32PAE page tables...
+	    return handle_passthrough_pagefault_32pae(info, fault_addr, error_code);
+
+	default:
+	    PrintError("Unknown CPU Mode\n");
+	    break;
+    }
+    return -1;
+}
+
+
+
+int v3_handle_nested_pagefault(struct guest_info * info, addr_t fault_addr, pf_error_t error_code) {
+    // THIS IS VERY BAD
+    v3_vm_cpu_mode_t mode = LONG;
+
+
+    PrintDebug("Nested PageFault: fault_addr=%p, error_code=%u\n",(void*)fault_addr, *(uint_t *)&error_code);
+
+    switch(mode) {
+	case REAL:
+	case PROTECTED:
+	    return handle_passthrough_pagefault_32(info, fault_addr, error_code);
+
+	case PROTECTED_PAE:
+	    return handle_passthrough_pagefault_32pae(info, fault_addr, error_code);
+
+	case LONG:
+	case LONG_32_COMPAT:
+	    return handle_passthrough_pagefault_64(info, fault_addr, error_code);	    
+	
+	default:
+	    PrintError("Unknown CPU Mode\n");
+	    break;
+    }
+    return -1;
 }
+