#include <palacios/vm_guest.h>
-#ifndef DEBUG_NESTED_PAGING
+#ifndef V3_CONFIG_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));
+ 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;
return 0;
}
-int v3_reset_passthrough_pts(struct guest_info * info) {
- v3_cpu_mode_t mode = v3_get_vm_cpu_mode(info);
+
+int v3_free_passthrough_pts(struct guest_info * core) {
+ v3_cpu_mode_t mode = v3_get_vm_cpu_mode(core);
// 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)));
+ delete_page_tables_32((pde32_t *)V3_VAddr((void *)(core->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)));
+ delete_page_tables_32pae((pdpe32pae_t *)V3_VAddr((void *)(core->direct_map_pt)));
break;
default:
PrintError("Unknown CPU Mode\n");
+ return -1;
break;
}
-
+
+ return 0;
+}
+
+
+int v3_reset_passthrough_pts(struct guest_info * core) {
+
+ v3_free_passthrough_pts(core);
+
// create new direct map page table
- v3_init_passthrough_pts(info);
+ v3_init_passthrough_pts(core);
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
int v3_handle_nested_pagefault(struct guest_info * info, addr_t fault_addr, pf_error_t error_code) {
- v3_cpu_mode_t mode = v3_get_host_cpu_mode()
+ v3_cpu_mode_t mode = v3_get_host_cpu_mode();
- PrintDebug("Nested PageFault: fault_addr=%p, error_code=%u\n",(void*)fault_addr, *(uint_t *)&error_code);
+ PrintDebug("Nested PageFault: fault_addr=%p, error_code=%u\n", (void *)fault_addr, *(uint_t *)&error_code);
switch(mode) {
case REAL:
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: