updated to use pa_to_va address conversion

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

diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index e59e96a..28eadc7 100644 (file)
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@ -38,25 +38,19 @@
 
 
 
-
-extern uint_t launch_svm(vmcb_t * vmcb_addr);
-extern void safe_svm_launch(vmcb_t * vmcb_addr, struct v3_gprs * gprs);
-
-extern void STGI();
-extern void CLGI();
-
 extern uint_t Get_CR3();
 
 
 
-
-
+extern void v3_stgi();
+extern void v3_clgi();
+extern int v3_svm_launch(vmcb_t * vmcb, struct v3_gprs * vm_regs);
 
 
 
 
 static vmcb_t * Allocate_VMCB() {
-  vmcb_t * vmcb_page = (vmcb_t *)V3_AllocPages(1);
+  vmcb_t * vmcb_page = (vmcb_t *)V3_VAddr(V3_AllocPages(1));
 
   memset(vmcb_page, 0, 4096);
 
@@ -170,10 +164,10 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) {
     struct vmm_io_hook * iter;
     addr_t io_port_bitmap;
     
-    io_port_bitmap = (addr_t)V3_AllocPages(3);
+    io_port_bitmap = (addr_t)V3_VAddr(V3_AllocPages(3));
     memset((uchar_t*)io_port_bitmap, 0, PAGE_SIZE * 3);
     
-    ctrl_area->IOPM_BASE_PA = io_port_bitmap;
+    ctrl_area->IOPM_BASE_PA = (addr_t)V3_PAddr((void *)io_port_bitmap);
 
     //PrintDebug("Setting up IO Map at 0x%x\n", io_port_bitmap);
 
@@ -306,14 +300,14 @@ static int start_svm_guest(struct guest_info *info) {
 
 
     v3_enable_ints();
-    CLGI();
+    v3_clgi();
 
     //    PrintDebug("SVM Entry to rip=%x...\n", info->rip);
 
     rdtscll(info->time_state.cached_host_tsc);
     guest_ctrl->TSC_OFFSET = info->time_state.guest_tsc - info->time_state.cached_host_tsc;
 
-    safe_svm_launch((vmcb_t*)(info->vmm_data), &(info->vm_regs));
+    v3_svm_launch((vmcb_t*)V3_PAddr(info->vmm_data), &(info->vm_regs));
 
     rdtscll(tmp_tsc);
     //PrintDebug("SVM Returned\n");
@@ -322,7 +316,7 @@ static int start_svm_guest(struct guest_info *info) {
     v3_update_time(info, tmp_tsc - info->time_state.cached_host_tsc);
     num_exits++;
 
-    STGI();
+    v3_stgi();
 
     if ((num_exits % 25) == 0) {
       PrintDebug("SVM Exit number %d\n", num_exits);
@@ -378,7 +372,7 @@ int v3_is_svm_capable() {
 #if 1
   // Dinda
   uint_t vm_cr_low = 0, vm_cr_high = 0;
-  uint_t eax = 0, ebx = 0, ecx = 0, edx = 0;
+  addr_t eax = 0, ebx = 0, ecx = 0, edx = 0;
 
   v3_cpuid(CPUID_FEATURE_IDS, &eax, &ebx, &ecx, &edx);
   
@@ -426,7 +420,7 @@ int v3_is_svm_capable() {
 
 #else
   uint_t eax = 0, ebx = 0, ecx = 0, edx = 0;
-  uint_t vm_cr_low = 0, vm_cr_high = 0;
+  addr_t vm_cr_low = 0, vm_cr_high = 0;
 
   v3_cpuid(CPUID_FEATURE_IDS, &eax, &ebx, &ecx, &edx);
 
@@ -468,7 +462,7 @@ int v3_is_svm_capable() {
 }
 
 static int has_svm_nested_paging() {
-  uint_t eax = 0, ebx = 0, ecx = 0, edx = 0;
+  addr_t eax = 0, ebx = 0, ecx = 0, edx = 0;
 
   v3_cpuid(CPUID_SVM_REV_AND_FEATURE_IDS, &eax, &ebx, &ecx, &edx);