X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_io.c;h=1ec4a60a7b37d1c326fddd76e29f4dcd1e517e9e;hb=4290e5f20a4ea5e5f32cb8228ac4d7446dc1021b;hp=4c85ec72d878b437718f4aa9fd7ce70f990fece2;hpb=29e825c5f095066bbb5ebbec5a5af1419d883264;p=palacios.git diff --git a/palacios/src/palacios/svm_io.c b/palacios/src/palacios/svm_io.c index 4c85ec7..1ec4a60 100644 --- a/palacios/src/palacios/svm_io.c +++ b/palacios/src/palacios/svm_io.c @@ -23,7 +23,7 @@ #include #include -#ifndef DEBUG_IO +#ifndef CONFIG_DEBUG_IO #undef PrintDebug #define PrintDebug(fmt, args...) #endif @@ -50,22 +50,21 @@ int v3_init_svm_io_map(struct guest_info * info) { info->io_map.arch_data = V3_VAddr(V3_AllocPages(3)); memset(info->io_map.arch_data, 0, PAGE_SIZE_4KB * 3); + + v3_refresh_io_map(info); + return 0; } // This should package up an IO request and call vmm_handle_io -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); - +int v3_handle_svm_io_in(struct guest_info * info, struct svm_io_info * io_info) { struct v3_io_hook * hook = v3_get_io_hook(info, io_info->port); int read_size = 0; if (hook == NULL) { - PrintError("Hook Not present for in on port %x\n", io_info->port); + PrintError("Hook Not present for in on port 0x%x\n", io_info->port); // error, we should not have exited on this port return -1; } @@ -83,12 +82,10 @@ int v3_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..... - PrintError("Read Failure for in on port %x\n", io_info->port); + PrintError("Read Failure for in on port 0x%x\n", io_info->port); return -1; } - info->rip = ctrl_area->exit_info2; - return 0; } @@ -99,12 +96,7 @@ int v3_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 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); - +int v3_handle_svm_io_ins(struct guest_info * info, struct svm_io_info * io_info) { struct v3_io_hook * hook = v3_get_io_hook(info, io_info->port); int read_size = 0; addr_t dst_addr = 0; @@ -118,7 +110,7 @@ int v3_handle_svm_io_ins(struct guest_info * info) { // direction can equal either 1 or -1 // We will multiply the final added offset by this value to go the correct direction int direction = 1; - struct rflags * flags = (struct rflags *)&(guest_state->rflags); + struct rflags * flags = (struct rflags *)&(info->ctrl_regs.rflags); if (flags->df) { direction = -1; @@ -126,7 +118,7 @@ int v3_handle_svm_io_ins(struct guest_info * info) { if (hook == NULL) { - PrintError("Hook Not present for ins on port %x\n", io_info->port); + PrintError("Hook Not present for ins on port 0x%x\n", io_info->port); // error, we should not have exited on this port return -1; } @@ -217,7 +209,7 @@ int v3_handle_svm_io_ins(struct guest_info * info) { if (hook->read(io_info->port, (char *)host_addr, read_size, hook->priv_data) != read_size) { // not sure how we handle errors..... - PrintError("Read Failure for ins on port %x\n", io_info->port); + PrintError("Read Failure for ins on port 0x%x\n", io_info->port); return -1; } @@ -230,22 +222,15 @@ int v3_handle_svm_io_ins(struct guest_info * info) { rep_num--; } - - info->rip = ctrl_area->exit_info2; - return 0; } -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); - +int v3_handle_svm_io_out(struct guest_info * info, struct svm_io_info * io_info) { struct v3_io_hook * hook = v3_get_io_hook(info, io_info->port); int write_size = 0; if (hook == NULL) { - PrintError("Hook Not present for out on port %x\n", io_info->port); + PrintError("Hook Not present for out on port 0x%x\n", io_info->port); // error, we should not have exited on this port return -1; } @@ -263,12 +248,10 @@ int v3_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..... - PrintError("Write Failure for out on port %x\n", io_info->port); + PrintError("Write Failure for out on port 0x%x\n", io_info->port); return -1; } - info->rip = ctrl_area->exit_info2; - return 0; } @@ -277,13 +260,8 @@ int v3_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 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); - +int v3_handle_svm_io_outs(struct guest_info * info, struct svm_io_info * io_info) { + struct v3_io_hook * hook = v3_get_io_hook(info, io_info->port); int write_size = 0; addr_t dst_addr = 0; @@ -296,7 +274,7 @@ int v3_handle_svm_io_outs(struct guest_info * info) { // direction can equal either 1 or -1 // We will multiply the final added offset by this value to go the correct direction int direction = 1; - struct rflags * flags = (struct rflags *)&(guest_state->rflags); + struct rflags * flags = (struct rflags *)&(info->ctrl_regs.rflags); if (flags->df) { direction = -1; @@ -304,7 +282,7 @@ int v3_handle_svm_io_outs(struct guest_info * info) { if (hook == NULL) { - PrintError("Hook Not present for outs on port %x\n", io_info->port); + PrintError("Hook Not present for outs on port 0x%x\n", io_info->port); // error, we should not have exited on this port return -1; } @@ -390,7 +368,7 @@ int v3_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..... - PrintError("Write Failure for outs on port %x\n", io_info->port); + PrintError("Write Failure for outs on port 0x%x\n", io_info->port); return -1; } @@ -403,9 +381,5 @@ int v3_handle_svm_io_outs(struct guest_info * info) { rep_num--; } - - info->rip = ctrl_area->exit_info2; - - return 0; }