X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_io.c;h=cad3fbe7c512796b05a7a8bfa54c6c92e59b5860;hb=e95bdc48b03086dd78b9dde7d3299312fa31c89c;hp=efc5294129ca2d4c1dd1d028509303080ede189b;hpb=bc2c46a12649344d973e2201271c05390ce924bf;p=palacios.git

diff --git a/palacios/src/palacios/svm_io.c b/palacios/src/palacios/svm_io.c
index efc5294..cad3fbe 100644
--- a/palacios/src/palacios/svm_io.c
+++ b/palacios/src/palacios/svm_io.c
@@ -1,3 +1,25 @@
+/* 
+ * 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>
@@ -10,14 +32,17 @@
 #endif
 
 
+
+
+
 // This should package up an IO request and call vmm_handle_io
-int handle_svm_io_in(struct guest_info * info) {
+int v3_handle_svm_io_in(struct guest_info * info) {
   vmcb_ctrl_t * ctrl_area = GET_VMCB_CTRL_AREA((vmcb_t *)(info->vmm_data));
   //  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 = v3_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) {
     PrintError("Hook Not present for in on port %x\n", io_info->port);
@@ -54,14 +79,14 @@ int handle_svm_io_in(struct guest_info * info) {
 /* We might not handle wrap around of the RDI register correctly...
  * In that if we do wrap around the effect will manifest in the higher bits of the register
  */
-int handle_svm_io_ins(struct guest_info * info) {
+int v3_handle_svm_io_ins(struct guest_info * info) {
   vmcb_ctrl_t * ctrl_area = GET_VMCB_CTRL_AREA((vmcb_t *)(info->vmm_data));
   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 = v3_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;
@@ -190,13 +215,13 @@ int handle_svm_io_ins(struct guest_info * info) {
   return 0;
 }
 
-int handle_svm_io_out(struct guest_info * info) {
+int v3_handle_svm_io_out(struct guest_info * info) {
   vmcb_ctrl_t * ctrl_area = GET_VMCB_CTRL_AREA((vmcb_t *)(info->vmm_data));
   //  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 = v3_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) {
     PrintError("Hook Not present for out on port %x\n", io_info->port);
@@ -231,15 +256,15 @@ int handle_svm_io_out(struct guest_info * info) {
  * In that if we do wrap around the effect will manifest in the higher bits of the register
  */
 
-int handle_svm_io_outs(struct guest_info * info) {
+int v3_handle_svm_io_outs(struct guest_info * info) {
   vmcb_ctrl_t * ctrl_area = GET_VMCB_CTRL_AREA((vmcb_t *)(info->vmm_data));
   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 = v3_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;