X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_io.c;h=d4af89f4842beb8cddeb368e3984afe068dd4704;hb=2ff2b6c0456f332f5dfbaffdf943c07765709173;hp=40c1b769be0cd3b7121c8e39ed9a95996dc45f9f;hpb=6c28cc8753bb0e1b17b5c6c2ee296eb60e09079c;p=palacios.git diff --git a/palacios/src/palacios/svm_io.c b/palacios/src/palacios/svm_io.c index 40c1b76..d4af89f 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 + * Copyright (c) 2008, The V3VEE Project + * All rights reserved. + * + * Author: Jack Lange + * + * This is free software. You are permitted to use, + * redistribute, and modify it as specified in the file "V3VEE_LICENSE". + */ + + + + #include #include #include @@ -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); struct vmm_io_hook * hook = v3_get_io_hook(&(info->io_map), io_info->port); - uint_t read_size = 0; + 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); struct vmm_io_hook * hook = v3_get_io_hook(&(info->io_map), io_info->port); - uint_t read_size = 0; + int read_size = 0; addr_t dst_addr = 0; uint_t rep_num = 1; @@ -89,7 +114,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) { + if (guest_va_to_host_va(info, get_addr_linear(info, info->rip, &(info->segments.cs)), &inst_ptr) == -1) { PrintError("Can't access instruction\n"); return -1; } @@ -145,7 +170,8 @@ int handle_svm_io_ins(struct guest_info * info) { // This value should be set depending on the host register size... mask = get_gpr_mask(info); - PrintDebug("INS io_info invalid address size, mask=0x%x, io_info=0x%x\n",mask,*((uint_t*)(io_info))); + PrintDebug("INS io_info invalid address size, mask=0x%p, io_info=0x%p\n", + (void *)mask, (void *)(io_info)); // PrintDebug("INS Aborted... Check implementation\n"); //return -1; } @@ -162,7 +188,7 @@ int handle_svm_io_ins(struct guest_info * info) { addr_t host_addr; dst_addr = get_addr_linear(info, info->vm_regs.rdi & mask, theseg); - PrintDebug("Writing 0x%x\n", dst_addr); + PrintDebug("Writing 0x%p\n", (void *)dst_addr); if (guest_va_to_host_va(info, dst_addr, &host_addr) == -1) { // either page fault or gpf... @@ -190,13 +216,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); struct vmm_io_hook * hook = v3_get_io_hook(&(info->io_map), io_info->port); - uint_t write_size = 0; + int write_size = 0; if (hook == NULL) { PrintError("Hook Not present for out on port %x\n", io_info->port); @@ -231,7 +257,7 @@ 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)); @@ -239,7 +265,7 @@ int handle_svm_io_outs(struct guest_info * info) { struct svm_io_info * io_info = (struct svm_io_info *)&(ctrl_area->exit_info1); struct vmm_io_hook * hook = v3_get_io_hook(&(info->io_map), io_info->port); - uint_t write_size = 0; + int write_size = 0; addr_t dst_addr = 0; uint_t rep_num = 1; @@ -284,7 +310,8 @@ int handle_svm_io_outs(struct guest_info * info) { // This value should be set depending on the host register size... mask = get_gpr_mask(info); - PrintDebug("OUTS io_info invalid address size, mask=0x%, io_info=0x%x\n",mask,*((uint_t*)(io_info))); + PrintDebug("OUTS io_info invalid address size, mask=0%p, io_info=0x%p\n", + (void *)mask, (void *)io_info); // PrintDebug("INS Aborted... Check implementation\n"); //return -1; // should never happen @@ -300,7 +327,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) { + if (guest_va_to_host_va(info,get_addr_linear(info,info->rip,&(info->segments.cs)),&inst_ptr)==-1) { PrintError("Can't access instruction\n"); return -1; }