X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_symspy.c;h=caf1a8c953afd28fb16acdf42d173379eb31dd55;hb=603f73496c7025fc3929f209fd4185627370751c;hp=53f3e89caf4bd49608bf3856db68b09f7340a9af;hpb=ee1279646a778613b23a42350b903ebb57c068f8;p=palacios.releases.git

diff --git a/palacios/src/palacios/vmm_symspy.c b/palacios/src/palacios/vmm_symspy.c
index 53f3e89..caf1a8c 100644
--- a/palacios/src/palacios/vmm_symspy.c
+++ b/palacios/src/palacios/vmm_symspy.c
@@ -56,7 +56,7 @@ static int symspy_msr_write(struct guest_info * core, uint_t msr, struct v3_msr
 
 	if (global_state->active == 1) {
 	    // unmap page
-	    struct v3_shadow_region * old_reg = v3_get_shadow_region(core->vm_info, core->cpu_id, 
+	    struct v3_mem_region * old_reg = v3_get_mem_region(core->vm_info, core->vcpu_id, 
 								     (addr_t)global_state->global_guest_pa);
 
 	    if (old_reg == NULL) {
@@ -65,7 +65,7 @@ static int symspy_msr_write(struct guest_info * core, uint_t msr, struct v3_msr
 		return -1;
 	    }
 
-	    v3_delete_shadow_region(core->vm_info, old_reg);
+	    v3_delete_mem_region(core->vm_info, old_reg);
 	}
 
 	global_state->global_guest_pa = src.value;
@@ -84,7 +84,7 @@ static int symspy_msr_write(struct guest_info * core, uint_t msr, struct v3_msr
 
 	if (local_state->active == 1) {
 	    // unmap page
-	    struct v3_shadow_region * old_reg = v3_get_shadow_region(core->vm_info, core->cpu_id,
+	    struct v3_mem_region * old_reg = v3_get_mem_region(core->vm_info, core->vcpu_id,
 								     (addr_t)local_state->local_guest_pa);
 
 	    if (old_reg == NULL) {
@@ -93,7 +93,7 @@ static int symspy_msr_write(struct guest_info * core, uint_t msr, struct v3_msr
 		return -1;
 	    }
 
-	    v3_delete_shadow_region(core->vm_info, old_reg);
+	    v3_delete_mem_region(core->vm_info, old_reg);
 	}
 
 	local_state->local_guest_pa = src.value;
@@ -102,7 +102,7 @@ static int symspy_msr_write(struct guest_info * core, uint_t msr, struct v3_msr
 	local_state->active = 1;
 
 	// map page
-	v3_add_shadow_mem(core->vm_info, core->cpu_id, (addr_t)local_state->local_guest_pa, 
+	v3_add_shadow_mem(core->vm_info, core->vcpu_id, (addr_t)local_state->local_guest_pa, 
 			  (addr_t)(local_state->local_guest_pa + PAGE_SIZE_4KB - 1), 
 			  local_state->local_page_pa);
     } else {
@@ -136,7 +136,7 @@ int v3_init_symspy_core(struct guest_info * core, struct v3_symspy_local_state *
     state->local_page = (struct v3_symspy_local_page *)V3_VAddr((void *)state->local_page_pa);
     memset(state->local_page, 0, PAGE_SIZE_4KB);
 
-    snprintf((uint8_t *)&(state->local_page->magic), 8, "V3V.%d", core->cpu_id);
+    snprintf((uint8_t *)&(state->local_page->magic), 8, "V3V.%d", core->vcpu_id);
 
     return 0;
 }
@@ -180,3 +180,12 @@ int v3_sym_unmap_pci_passthrough(struct v3_vm_info * vm, uint_t bus, uint_t dev,
 
     return 0;
 }
+
+
+struct v3_symspy_global_page * v3_sym_get_symspy_vm(struct v3_vm_info * vm) {
+    return vm->sym_vm_state.symspy_state.sym_page;
+}
+
+struct v3_symspy_local_page * v3_sym_get_symspy_core(struct guest_info * core) {
+    return core->sym_core_state.symspy_state.local_page;
+}