X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fmmu%2Fvmm_shdw_pg_kvm_64.h;h=fbf0a315063e6ac8fac6a4e2424febb730d3f8b2;hb=25aec1d035e5a740d8c1cb936d7633b6bb5751f1;hp=c1d92f4cb0bc6dbdde7cd9b6339f846380e04616;hpb=a09147e0a8dad8403a661d9e0fc06b18e8c4b4e3;p=palacios.git

diff --git a/palacios/src/palacios/mmu/vmm_shdw_pg_kvm_64.h b/palacios/src/palacios/mmu/vmm_shdw_pg_kvm_64.h
index c1d92f4..fbf0a31 100644
--- a/palacios/src/palacios/mmu/vmm_shdw_pg_kvm_64.h
+++ b/palacios/src/palacios/mmu/vmm_shdw_pg_kvm_64.h
@@ -1,6 +1,6 @@
 
 
-#ifdef CONFIG_SHADOW_CACHE
+#ifdef V3_CONFIG_SHADOW_CACHE
 
 #define PT64_NX_MASK (1ULL << 63)
 //#define SHOW_ALL 
@@ -115,7 +115,7 @@ static inline int fix_write_pf_64(struct guest_info *core, pte64_t *shadow_pte,
     }
 
     if (guest_pte->present == 0) {
-	memset((void*)shadow_pte, 0, sizeof(struct pte64));
+	memset((void*)shadow_pte, 0, sizeof(uint64_t));
 	PrintDebug("\tWritePf: Guest Not Present\n");
 	return 0;
     }
@@ -534,7 +534,7 @@ static int handle_pte_shadow_pagefault_64(struct guest_info * core, addr_t fault
 
     PrintDebug("Handling PTE fault\n");
 
-    struct v3_mem_region * shdw_reg =  v3_get_mem_region(core->vm_info, core->cpu_id, guest_pa);
+    struct v3_mem_region * shdw_reg =  v3_get_mem_region(core->vm_info, core->vcpu_id, guest_pa);
 
 
 
@@ -607,7 +607,7 @@ pte_noerror:
 	    int inherited_ar_user = ((inherited_ar & PT_USER_MASK) == PT_USER_MASK) ? 1 : 0;
 	    int inherited_ar_writable = ((inherited_ar & PT_WRITABLE_MASK) == PT_WRITABLE_MASK) ? 1 : 0;
 
-	    addr_t shadow_pa = v3_get_shadow_addr(shdw_reg, core->cpu_id, guest_pa);
+	    addr_t shadow_pa = v3_get_shadow_addr(shdw_reg, core->vcpu_id, guest_pa);
       
 	    shadow_pte->page_base_addr = PAGE_BASE_ADDR(shadow_pa);
       
@@ -722,7 +722,7 @@ static int handle_2MB_shadow_pagefault_64(struct guest_info * core,
     PrintDebug("Handling 2MB fault (guest_fault_pa=%p) (error_code=%x)\n", (void *)guest_fault_pa, *(uint_t*)&error_code);
     PrintDebug("ShadowPT=%p, LargeGuestPDE=%p\n", shadow_pt, large_guest_pde);
 
-    struct v3_mem_region * shdw_reg = v3_get_mem_region(core->vm_info, core->cpu_id, guest_fault_pa);
+    struct v3_mem_region * shdw_reg = v3_get_mem_region(core->vm_info, core->vcpu_id, guest_fault_pa);
 
     int fixed = 0;
     int write_pt = 0;
@@ -743,7 +743,7 @@ static int handle_2MB_shadow_pagefault_64(struct guest_info * core,
 
 	if ((shdw_reg->host_type == SHDW_REGION_ALLOCATED) || 
 	    (shdw_reg->host_type == SHDW_REGION_WRITE_HOOK)) {
-	    addr_t shadow_pa = v3_get_shadow_addr(shdw_reg, core->cpu_id, guest_fault_pa);
+	    addr_t shadow_pa = v3_get_shadow_addr(shdw_reg, core->vcpu_id, guest_fault_pa);
 
 	    shadow_pte->page_base_addr = PAGE_BASE_ADDR(shadow_pa);