X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_io.c;h=1aa76ae6133863b3f6091bcfaf1ce9c538f305e2;hb=2a9554f33cc3bdaab08d59ac54d6dd1f4472285d;hp=d9ce73c04dcb47df26116ba82b96fc1a99f9c24b;hpb=3e5e5a12e64630d7a37ed32b8d7e2d993c79f7e0;p=palacios.git

diff --git a/palacios/src/palacios/svm_io.c b/palacios/src/palacios/svm_io.c
index d9ce73c..1aa76ae 100644
--- a/palacios/src/palacios/svm_io.c
+++ b/palacios/src/palacios/svm_io.c
@@ -57,6 +57,11 @@ int v3_init_svm_io_map(struct v3_vm_info * vm) {
     return 0;
 }
 
+int v3_deinit_svm_io_map(struct v3_vm_info * vm) {
+    V3_FreePages(V3_PAddr(vm->io_map.arch_data), 3);
+    return 0;
+}
+
 
 
 // This should package up an IO request and call vmm_handle_io
@@ -126,7 +131,7 @@ int v3_handle_svm_io_ins(struct guest_info * core, struct svm_io_info * io_info)
 
 
 
-    if (guest_va_to_host_va(core, get_addr_linear(core, core->rip, &(core->segments.cs)), &inst_ptr) == -1) {
+    if (v3_gva_to_hva(core, get_addr_linear(core, core->rip, &(core->segments.cs)), &inst_ptr) == -1) {
 	PrintError("Can't access instruction\n");
 	return -1;
     }
@@ -202,7 +207,7 @@ int v3_handle_svm_io_ins(struct guest_info * core, struct svm_io_info * io_info)
     
 	//	PrintDebug("Writing 0x%p\n", (void *)dst_addr);
 
-	if (guest_va_to_host_va(core, dst_addr, &host_addr) == -1) {
+	if (v3_gva_to_hva(core, dst_addr, &host_addr) == -1) {
 	    // either page fault or gpf...
 	    PrintError("Could not convert Guest VA to host VA\n");
 	    return -1;
@@ -269,7 +274,7 @@ int v3_handle_svm_io_outs(struct guest_info * core, struct svm_io_info * io_info
     uint_t rep_num = 1;
     ullong_t mask = 0;
     addr_t inst_ptr;
-    struct v3_segment * theseg = &(core->segments.es); // default is ES
+    struct v3_segment * theseg = &(core->segments.ds); // default is DS
 
     // This is kind of hacky...
     // direction can equal either 1 or -1
@@ -325,7 +330,7 @@ int v3_handle_svm_io_outs(struct guest_info * core, struct svm_io_info * io_info
   
 
 
-    if (guest_va_to_host_va(core, get_addr_linear(core, core->rip, &(core->segments.cs)), &inst_ptr) == -1) {
+    if (v3_gva_to_hva(core, get_addr_linear(core, core->rip, &(core->segments.cs)), &inst_ptr) == -1) {
 	PrintError("Can't access instruction\n");
 	return -1;
     }
@@ -359,12 +364,13 @@ int v3_handle_svm_io_outs(struct guest_info * core, struct svm_io_info * io_info
     PrintDebug("OUTS size=%d for %d steps\n", write_size, rep_num);
 
     while (rep_num > 0) {
-	addr_t host_addr;
+	addr_t host_addr = 0;
 
 	dst_addr = get_addr_linear(core, (core->vm_regs.rsi & mask), theseg);
     
-	if (guest_va_to_host_va(core, dst_addr, &host_addr) == -1) {
-	    // either page fault or gpf...
+	if (v3_gva_to_hva(core, dst_addr, &host_addr) == -1) {
+	    PrintError("Could not translate outs dest addr, either page fault or gpf...\n");
+	    return -1;
 	}
 
 	if (hook->write(core, io_info->port, (char*)host_addr, write_size, hook->priv_data) != write_size) {