X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_direct_paging.c;h=2e86dbe2dcce0987c44ea59ead044565eb6342fd;hb=c163873b7b96544683030cafba0e73a7ed988171;hp=821d7b369159ca09024fdf7a88f28077f5ad94d7;hpb=1fe82881720f7f9f64f789871f763aca93b47a7e;p=palacios.git

diff --git a/palacios/src/palacios/vmm_direct_paging.c b/palacios/src/palacios/vmm_direct_paging.c
index 821d7b3..2e86dbe 100644
--- a/palacios/src/palacios/vmm_direct_paging.c
+++ b/palacios/src/palacios/vmm_direct_paging.c
@@ -24,6 +24,13 @@
 #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));
@@ -37,11 +44,49 @@ static addr_t create_generic_pt_page() {
 #include "vmm_direct_paging_32pae.h"
 #include "vmm_direct_paging_64.h"
 
+int v3_init_passthrough_pts(struct guest_info * info) {
+    info->direct_map_pt = (addr_t)V3_PAddr((void *)create_generic_pt_page());
+    return 0;
+}
+
+int v3_reset_passthrough_pts(struct guest_info * info) {
+    v3_vm_cpu_mode_t mode = v3_get_cpu_mode(info);
 
-addr_t v3_create_direct_passthrough_pts(struct guest_info * info) {
-    return create_generic_pt_page();
+    // Delete the old direct map page tables
+    switch(mode) {
+	case REAL:
+	case PROTECTED:
+	    delete_page_tables_32((pde32_t *)V3_VAddr((void *)(info->direct_map_pt)));
+	    break;
+	case PROTECTED_PAE:
+	case LONG:
+	case LONG_32_COMPAT:
+	    // Long mode will only use 32PAE page tables...
+	    delete_page_tables_32pae((pdpe32pae_t *)V3_VAddr((void *)(info->direct_map_pt)));
+	    break;
+	default:
+	    PrintError("Unknown CPU Mode\n");
+	    break;
+    }
+	    
+    // create new direct map page table
+    v3_init_passthrough_pts(info);
+    
+    return 0;
+}
+
+
+int v3_activate_passthrough_pt(struct guest_info * info) {
+    // For now... But we need to change this....
+    // As soon as shadow paging becomes active the passthrough tables are hosed
+    // So this will cause chaos if it is called at that time
+
+    info->ctrl_regs.cr3 = *(addr_t*)&(info->direct_map_pt);
+    //PrintError("Activate Passthrough Page tables not implemented\n");
+    return 0;
 }
 
+
 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);
 
@@ -69,6 +114,9 @@ int v3_handle_nested_pagefault(struct guest_info * info, addr_t fault_addr, pf_e
     // 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:
@@ -88,3 +136,7 @@ int v3_handle_nested_pagefault(struct guest_info * info, addr_t fault_addr, pf_e
     return -1;
 }
 
+int v3_invalidate_passthrough_addr(struct guest_info * info, addr_t inv_addr) {
+
+    return -1;
+}