#include <palacios/vmm_decoder.h>
#include <palacios/vm_guest_mem.h>
-#ifndef DEBUG_IO
+#ifndef CONFIG_DEBUG_IO
#undef PrintDebug
#define PrintDebug(fmt, args...)
#endif
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;
}
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;
}
/* 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;
// 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;
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;
}
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;
}
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;
}
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;
}
* 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;
// 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;
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;
}
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;
}
rep_num--;
}
-
- info->rip = ctrl_area->exit_info2;
-
-
return 0;
}