X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest_mem.h;h=7c0dbcf76bb5cc64a3d53f417e5dc0b7f93ca472;hb=60ad6a41c6d0ee08ed689e8505eb0c3df0c2a289;hp=b4a8c988a35d08c8e7815313b9f0f9976c8f0f09;hpb=e70e95962c26832628d586e07f9cd1a2e1852d72;p=palacios.git

diff --git a/palacios/include/palacios/vm_guest_mem.h b/palacios/include/palacios/vm_guest_mem.h
index b4a8c98..7c0dbcf 100644
--- a/palacios/include/palacios/vm_guest_mem.h
+++ b/palacios/include/palacios/vm_guest_mem.h
@@ -36,15 +36,15 @@
 
 /* Fundamental converters */
 // Call out to OS
-int host_va_to_host_pa(addr_t host_va, addr_t * host_pa);
-int host_pa_to_host_va(addr_t host_pa, addr_t * host_va);
+int v3_hva_to_hpa(addr_t host_va, addr_t * host_pa);
+int v3_hpa_to_hva(addr_t host_pa, addr_t * host_va);
 
 // guest_pa -> (shadow map) -> host_pa
-int guest_pa_to_host_pa(struct guest_info * guest_info, addr_t guest_pa, addr_t * host_pa);
+int v3_gpa_to_hpa(struct guest_info * guest_info, addr_t guest_pa, addr_t * host_pa);
 
 /* !! Currently not implemented !! */
 // host_pa -> (shadow_map) -> guest_pa
-int host_pa_to_guest_pa(struct guest_info * guest_info, addr_t host_pa, addr_t * guest_pa);
+int v3_hpa_to_gpa(struct guest_info * guest_info, addr_t host_pa, addr_t * guest_pa);
 
 
 /**********************************/
@@ -54,18 +54,18 @@ int host_pa_to_guest_pa(struct guest_info * guest_info, addr_t host_pa, addr_t *
 
 /* !! Currently not implemented !! */
 // host_va -> host_pa -> guest_pa
-int host_va_to_guest_pa(struct guest_info * guest_info, addr_t host_va, addr_t * guest_pa);
+int v3_hva_to_gpa(struct guest_info * guest_info, addr_t host_va, addr_t * guest_pa);
 
 
 // guest_pa -> host_pa -> host_va
-int guest_pa_to_host_va(struct guest_info * guest_info, addr_t guest_pa, addr_t * host_va);
+int v3_gpa_to_hva(struct guest_info * guest_info, addr_t guest_pa, addr_t * host_va);
 
 
 // Look up the address in the guests page tables.. This can cause multiple calls that translate
 //     ------------------------------------------------
 //     |                                              |
 //     -->   guest_pa -> host_pa -> host_va ->   (read table) --> guest_pa
-int guest_va_to_guest_pa(struct guest_info * guest_info, addr_t guest_va, addr_t * guest_pa);
+int v3_gva_to_gpa(struct guest_info * guest_info, addr_t guest_va, addr_t * guest_pa);
 
 
 
@@ -74,7 +74,7 @@ int guest_va_to_guest_pa(struct guest_info * guest_info, addr_t guest_va, addr_t
 //     ------------------------------------------------
 //     |                                              |
 //     -->   guest_pa -> host_pa -> host_va ->   (read table) --> guest_va
-int guest_pa_to_guest_va(struct guest_info * guest_info, addr_t guest_pa, addr_t * guest_va);
+int v3_gpa_to_gva(struct guest_info * guest_info, addr_t guest_pa, addr_t * guest_va);
 
 
 
@@ -82,20 +82,20 @@ int guest_pa_to_guest_va(struct guest_info * guest_info, addr_t guest_pa, addr_t
 /* GROUP 2                        */
 /**********************************/
 // guest_va -> guest_pa -> host_pa
-int guest_va_to_host_pa(struct guest_info * guest_info, addr_t guest_va, addr_t * host_pa);
+int v3_gva_to_hpa(struct guest_info * guest_info, addr_t guest_va, addr_t * host_pa);
 
 
 /* !! Currently not implemented !! */
 // host_pa -> guest_pa -> guest_va
-int host_pa_to_guest_va(struct guest_info * guest_info, addr_t host_pa, addr_t * guest_va);
+int v3_hpa_to_gva(struct guest_info * guest_info, addr_t host_pa, addr_t * guest_va);
 
 // guest_va -> guest_pa -> host_pa -> host_va
-int guest_va_to_host_va(struct guest_info * guest_info, addr_t guest_va, addr_t * host_va);
+int v3_gva_to_hva(struct guest_info * guest_info, addr_t guest_va, addr_t * host_va);
 
 
 /* !! Currently not implemented !! */
 // host_va -> host_pa -> guest_pa -> guest_va
-int host_va_to_guest_va(struct guest_info * guest_info, addr_t host_va, addr_t  * guest_va);
+int v3_hva_to_gva(struct guest_info * guest_info, addr_t host_va, addr_t  * guest_va);
 
 
 
@@ -105,10 +105,10 @@ int host_va_to_guest_va(struct guest_info * guest_info, addr_t host_va, addr_t
 
 
 
-int read_guest_va_memory(struct guest_info * guest_info, addr_t guest_va, int count, char * dest);
-int read_guest_pa_memory(struct guest_info * guest_info, addr_t guest_pa, int count, char * dest);
-int write_guest_pa_memory(struct guest_info * guest_info, addr_t guest_pa, int count, char * src);
-// TODO int write_guest_va_memory(struct guest_info * guest_info, addr_t guest_va, int count, char * src);
+int v3_read_gva_memory(struct guest_info * guest_info, addr_t guest_va, int count, uint8_t * dest);
+int v3_read_gpa_memory(struct guest_info * guest_info, addr_t guest_pa, int count, uint8_t * dest);
+int v3_write_gpa_memory(struct guest_info * guest_info, addr_t guest_pa, int count, uint8_t * src);
+int v3_write_gva_memory(struct guest_info * guest_info, addr_t guest_va, int count, uint8_t * src);
 
 
 #endif // ! __V3VEE__