#include <palacios/vm_guest.h>
-#ifndef CONFIG_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(VM_NONE, VCORE_NONE,"Cannot allocate page\n");
+ return 0;
+ }
+
+ page = V3_VAddr(temp);
memset(page, 0, PAGE_SIZE);
return (addr_t)page;
delete_page_tables_32pae((pdpe32pae_t *)V3_VAddr((void *)(core->direct_map_pt)));
break;
default:
- PrintError("Unknown CPU Mode\n");
+ PrintError(core->vm_info, core, "Unknown CPU Mode\n");
return -1;
break;
}
// 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");
+ //PrintError(info->vm_info, info, "Activate Passthrough Page tables not implemented\n");
return 0;
}
return handle_passthrough_pagefault_32pae(info, fault_addr, error_code);
default:
- PrintError("Unknown CPU Mode\n");
+ PrintError(info->vm_info, info, "Unknown CPU Mode\n");
break;
}
return -1;
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(info->vm_info, info, "Nested PageFault: fault_addr=%p, error_code=%u\n", (void *)fault_addr, *(uint_t *)&error_code);
switch(mode) {
case REAL:
return handle_passthrough_pagefault_64(info, fault_addr, error_code);
default:
- PrintError("Unknown CPU Mode\n");
+ PrintError(info->vm_info, info, "Unknown CPU Mode\n");
break;
}
return -1;
return invalidate_addr_32pae(info, inv_addr);
default:
- PrintError("Unknown CPU Mode\n");
+ 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__
v3_cpu_mode_t mode = LONG;
+#else
+ v3_cpu_mode_t mode = PROTECTED;
+#endif
switch(mode) {
case REAL:
return invalidate_addr_64(info, inv_addr);
default:
- PrintError("Unknown CPU Mode\n");
+ PrintError(info->vm_info, info, "Unknown CPU Mode\n");
break;
}