virtio-blk now handles config requests for non-declared config info

[palacios.git] / palacios / src / palacios / vmm_direct_paging.c

diff --git a/palacios/src/palacios/vmm_direct_paging.c b/palacios/src/palacios/vmm_direct_paging.c
index 11c6b69..5f5be4c 100644 (file)
--- a/palacios/src/palacios/vmm_direct_paging.c
+++ b/palacios/src/palacios/vmm_direct_paging.c
@@ -31,11 +31,12 @@
 #endif
 
 
-static addr_t create_generic_pt_page() {
+static addr_t create_generic_pt_page(struct guest_info *core) {
     void * page = 0;
     void *temp;
 
-    temp = V3_AllocPages(1);
+    temp = V3_AllocPagesExtended(1, PAGE_SIZE_4KB, -1, 
+                                core->shdw_pg_mode==SHADOW_PAGING ? V3_ALLOC_PAGES_CONSTRAINT_4GB : 0);
     if (!temp) { 
        PrintError(VM_NONE, VCORE_NONE,"Cannot allocate page\n");
        return 0;
@@ -53,7 +54,7 @@ static addr_t create_generic_pt_page() {
 #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());
+    info->direct_map_pt = (addr_t)V3_PAddr((void *)create_generic_pt_page(info));
     return 0;
 }
 
@@ -176,6 +177,28 @@ int v3_invalidate_passthrough_addr(struct guest_info * info, addr_t inv_addr) {
 }
 
 
+int v3_invalidate_passthrough_addr_range(struct guest_info * info, 
+                                        addr_t inv_addr_start, addr_t inv_addr_end) {
+    v3_cpu_mode_t mode = v3_get_vm_cpu_mode(info);
+
+    switch(mode) {
+       case REAL:
+       case PROTECTED:
+           return invalidate_addr_32_range(info, inv_addr_start, inv_addr_end);
+
+       case PROTECTED_PAE:
+       case LONG:
+       case LONG_32_COMPAT:
+           // Long mode will only use 32PAE page tables...
+           return invalidate_addr_32pae_range(info, inv_addr_start, inv_addr_end);
+
+       default:
+           PrintError(info->vm_info, info, "Unknown CPU Mode\n");
+           break;
+    }
+    return -1;
+}
+
 int v3_invalidate_nested_addr(struct guest_info * info, addr_t inv_addr) {
 
 #ifdef __V3_64BIT__
@@ -203,3 +226,32 @@ int v3_invalidate_nested_addr(struct guest_info * info, addr_t inv_addr) {
 
     return -1;
 }
+
+int v3_invalidate_nested_addr_range(struct guest_info * info, 
+                                   addr_t inv_addr_start, addr_t inv_addr_end) {
+
+#ifdef __V3_64BIT__
+    v3_cpu_mode_t mode = LONG;
+#else 
+    v3_cpu_mode_t mode = PROTECTED;
+#endif
+
+    switch(mode) {
+       case REAL:
+       case PROTECTED:
+           return invalidate_addr_32_range(info, inv_addr_start, inv_addr_end);
+
+       case PROTECTED_PAE:
+           return invalidate_addr_32pae_range(info, inv_addr_start, inv_addr_end);
+
+       case LONG:
+       case LONG_32_COMPAT:
+           return invalidate_addr_64_range(info, inv_addr_start, inv_addr_end);            
+       
+       default:
+           PrintError(info->vm_info, info, "Unknown CPU Mode\n");
+           break;
+    }
+
+    return -1;
+}