X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_io.c;h=5a6813356f038ff7b53f234ee9a4457068cf4eea;hb=cafbc1318c847b8c18e2036dc56be7af7acefa4e;hp=33022f02436fe9e9b725deb0d9508020e878136c;hpb=88a9fe78672db5f5672dc20a92253e508bd3b7e1;p=palacios-OLD.git

diff --git a/palacios/src/palacios/svm_io.c b/palacios/src/palacios/svm_io.c
index 33022f0..5a68133 100644
--- a/palacios/src/palacios/svm_io.c
+++ b/palacios/src/palacios/svm_io.c
@@ -1,9 +1,36 @@
+/* 
+ * This file is part of the Palacios Virtual Machine Monitor developed
+ * by the V3VEE Project with funding from the United States National 
+ * Science Foundation and the Department of Energy.  
+ *
+ * The V3VEE Project is a joint project between Northwestern University
+ * and the University of New Mexico.  You can find out more at 
+ * http://www.v3vee.org
+ *
+ * Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> 
+ * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
+ * All rights reserved.
+ *
+ * Author: Jack Lange <jarusl@cs.northwestern.edu>
+ *
+ * This is free software.  You are permitted to use,
+ * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
+ */
+
+
+
+
 #include <palacios/svm_io.h>
 #include <palacios/vmm_io.h>
 #include <palacios/vmm_ctrl_regs.h>
 #include <palacios/vmm_decoder.h>
 #include <palacios/vm_guest_mem.h>
 
+#ifndef DEBUG_IO
+#undef PrintDebug
+#define PrintDebug(fmt, args...)
+#endif
+
 
 // This should package up an IO request and call vmm_handle_io
 int handle_svm_io_in(struct guest_info * info) {
@@ -11,11 +38,11 @@ int handle_svm_io_in(struct guest_info * info) {
   //  vmcb_saved_state_t * guest_state = GET_VMCB_SAVE_STATE_AREA((vmcb_t*)(info->vmm_data));
   struct svm_io_info * io_info = (struct svm_io_info *)&(ctrl_area->exit_info1);
 
-  vmm_io_hook_t * hook = get_io_hook(&(info->io_map), io_info->port);
-  uint_t read_size = 0;
+  struct vmm_io_hook * hook = v3_get_io_hook(&(info->io_map), io_info->port);
+  int read_size = 0;
 
   if (hook == NULL) {
-    PrintDebug("Hook Not present for in on port %x\n", io_info->port);
+    PrintError("Hook Not present for in on port %x\n", io_info->port);
     // error, we should not have exited on this port
     return -1;
   }
@@ -33,7 +60,7 @@ int handle_svm_io_in(struct guest_info * info) {
 
   if (hook->read(io_info->port, &(info->vm_regs.rax), read_size, hook->priv_data) != read_size) {
     // not sure how we handle errors.....
-    PrintDebug("Read Failure for in on port %x\n", io_info->port);
+    PrintError("Read Failure for in on port %x\n", io_info->port);
     return -1;
   }
 
@@ -55,8 +82,8 @@ int handle_svm_io_ins(struct guest_info * info) {
   
   struct svm_io_info * io_info = (struct svm_io_info *)&(ctrl_area->exit_info1);
   
-  vmm_io_hook_t * hook = get_io_hook(&(info->io_map), io_info->port);
-  uint_t read_size = 0;
+  struct vmm_io_hook * hook = v3_get_io_hook(&(info->io_map), io_info->port);
+  int read_size = 0;
 
   addr_t dst_addr = 0;
   uint_t rep_num = 1;
@@ -75,7 +102,7 @@ int handle_svm_io_ins(struct guest_info * info) {
 
 
   if (hook == NULL) {
-   PrintDebug("Hook Not present for ins on port %x\n", io_info->port);
+   PrintError("Hook Not present for ins on port %x\n", io_info->port);
     // error, we should not have exited on this port
     return -1;
   }
@@ -85,7 +112,7 @@ int handle_svm_io_ins(struct guest_info * info) {
   addr_t inst_ptr;
 
   if (guest_va_to_host_pa(info,get_addr_linear(info,info->rip,&(info->segments.cs)),&inst_ptr)==-1) {
-    PrintDebug("Can't access instruction\n");
+    PrintError("Can't access instruction\n");
     return -1;
   }
 
@@ -125,7 +152,7 @@ int handle_svm_io_ins(struct guest_info * info) {
   } else if (io_info->sz32) {
     read_size = 4;
   } else {
-    PrintDebug("io_info Invalid Size\n");
+    PrintError("io_info Invalid Size\n");
     return -1;
   }
 
@@ -161,13 +188,13 @@ int handle_svm_io_ins(struct guest_info * info) {
 
     if (guest_va_to_host_va(info, dst_addr, &host_addr) == -1) {
       // either page fault or gpf...
-      PrintDebug("Could not convert Guest VA to host VA\n");
+      PrintError("Could not convert Guest VA to host VA\n");
       return -1;
     }
 
     if (hook->read(io_info->port, (char*)host_addr, read_size, hook->priv_data) != read_size) {
       // not sure how we handle errors.....
-      PrintDebug("Read Failure for ins on port %x\n", io_info->port);
+      PrintError("Read Failure for ins on port %x\n", io_info->port);
       return -1;
     }
 
@@ -190,11 +217,11 @@ int handle_svm_io_out(struct guest_info * info) {
   //  vmcb_saved_state_t * guest_state = GET_VMCB_SAVE_STATE_AREA((vmcb_t*)(info->vmm_data));
   struct svm_io_info * io_info = (struct svm_io_info *)&(ctrl_area->exit_info1);
 
-  vmm_io_hook_t * hook = get_io_hook(&(info->io_map), io_info->port);
-  uint_t write_size = 0;
+  struct vmm_io_hook * hook = v3_get_io_hook(&(info->io_map), io_info->port);
+  int write_size = 0;
 
   if (hook == NULL) {
-    PrintDebug("Hook Not present for out on port %x\n", io_info->port);
+    PrintError("Hook Not present for out on port %x\n", io_info->port);
     // error, we should not have exited on this port
     return -1;
   }
@@ -212,7 +239,7 @@ int handle_svm_io_out(struct guest_info * info) {
 
   if (hook->write(io_info->port, &(info->vm_regs.rax), write_size, hook->priv_data) != write_size) {
     // not sure how we handle errors.....
-    PrintDebug("Write Failure for out on port %x\n", io_info->port);
+    PrintError("Write Failure for out on port %x\n", io_info->port);
     return -1;
   }
 
@@ -233,8 +260,8 @@ int handle_svm_io_outs(struct guest_info * info) {
   
   struct svm_io_info * io_info = (struct svm_io_info *)&(ctrl_area->exit_info1);
   
-  vmm_io_hook_t * hook = get_io_hook(&(info->io_map), io_info->port);
-  uint_t write_size = 0;
+  struct vmm_io_hook * hook = v3_get_io_hook(&(info->io_map), io_info->port);
+  int write_size = 0;
 
   addr_t dst_addr = 0;
   uint_t rep_num = 1;
@@ -253,7 +280,7 @@ int handle_svm_io_outs(struct guest_info * info) {
 
 
   if (hook == NULL) {
-    PrintDebug("Hook Not present for outs on port %x\n", io_info->port);
+    PrintError("Hook Not present for outs on port %x\n", io_info->port);
     // error, we should not have exited on this port
     return -1;
   }
@@ -296,7 +323,7 @@ int handle_svm_io_outs(struct guest_info * info) {
   addr_t inst_ptr;
 
   if (guest_va_to_host_pa(info,get_addr_linear(info,info->rip,&(info->segments.cs)),&inst_ptr)==-1) {
-    PrintDebug("Can't access instruction\n");
+    PrintError("Can't access instruction\n");
     return -1;
   }
 
@@ -341,7 +368,7 @@ int handle_svm_io_outs(struct guest_info * info) {
 
     if (hook->write(io_info->port, (char*)host_addr, write_size, hook->priv_data) != write_size) {
       // not sure how we handle errors.....
-      PrintDebug("Write Failure for outs on port %x\n", io_info->port);
+      PrintError("Write Failure for outs on port %x\n", io_info->port);
       return -1;
     }