X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_io.c;h=3f71bc1aba7f769b907112de495a6da5b714611c;hb=0930d4dd369926196379a19abd04135f73df40c9;hp=99f83a712a7303b6ef4eff93eabfc98271ce1245;hpb=266af4b5b19da7bee8e7445288c7c1cb3ee194c7;p=palacios.git

diff --git a/palacios/src/palacios/svm_io.c b/palacios/src/palacios/svm_io.c
index 99f83a7..3f71bc1 100644
--- a/palacios/src/palacios/svm_io.c
+++ b/palacios/src/palacios/svm_io.c
@@ -29,6 +29,29 @@
 #endif
 
 
+static int update_map(struct guest_info * info, uint16_t port, int hook_read, int hook_write) {
+    uchar_t * bitmap = (uint8_t *)(info->io_map.arch_data);;
+    int major = port / 8;
+    int minor = port % 8;
+
+    if ((hook_read == 0) && (hook_write == 0)) {
+	*(bitmap + major) &= ~(0x1 << minor);
+    } else {
+	*(bitmap + major) |= (0x1 << minor);
+    }
+
+    return 0;
+}
+
+
+int v3_init_svm_io_map(struct guest_info * info) {
+    info->io_map.update_map = update_map;
+
+    info->io_map.arch_data = V3_VAddr(V3_AllocPages(3));
+    memset(info->io_map.arch_data, 0, PAGE_SIZE_4KB * 3);
+
+    return 0;
+}
 
 
 
@@ -42,7 +65,7 @@ int v3_handle_svm_io_in(struct guest_info * info) {
     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;
     }
@@ -60,7 +83,7 @@ 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;
     }
 
@@ -87,7 +110,7 @@ int v3_handle_svm_io_ins(struct guest_info * info) {
     addr_t dst_addr = 0;
     uint_t rep_num = 1;
     ullong_t mask = 0;
-    struct v3_segment *theseg = &(info->segments.es); // default is ES
+    struct v3_segment * theseg = &(info->segments.es); // default is ES
     addr_t inst_ptr;
 
 
@@ -103,7 +126,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;
     }
@@ -115,8 +138,8 @@ int v3_handle_svm_io_ins(struct guest_info * info) {
 	return -1;
     }
 
-    while (is_prefix_byte(*((char*)inst_ptr))) {
-	switch (*((char*)inst_ptr)) { 
+    while (is_prefix_byte(*((char *)inst_ptr))) {
+	switch (*((char *)inst_ptr)) {
 	    case PREFIX_CS_OVERRIDE:
 		theseg = &(info->segments.cs);
 		break;
@@ -173,8 +196,8 @@ int v3_handle_svm_io_ins(struct guest_info * info) {
     }
 
     if (io_info->rep) {
-	//    rep_num = info->vm_regs.rcx & mask;
-	rep_num = info->vm_regs.rcx;
+	rep_num = info->vm_regs.rcx & mask;
+	//rep_num = info->vm_regs.rcx;
     }
 
 
@@ -182,9 +205,9 @@ int v3_handle_svm_io_ins(struct guest_info * info) {
 
     while (rep_num > 0) {
 	addr_t host_addr;
-	dst_addr = get_addr_linear(info, info->vm_regs.rdi & mask, theseg);
+	dst_addr = get_addr_linear(info, (info->vm_regs.rdi & mask), theseg);
     
-	PrintDebug("Writing 0x%p\n", (void *)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...
@@ -192,17 +215,18 @@ int v3_handle_svm_io_ins(struct guest_info * info) {
 	    return -1;
 	}
 
-	if (hook->read(io_info->port, (char*)host_addr, read_size, hook->priv_data) != read_size) {
+	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;
 	}
 
-	info->vm_regs.rdi += read_size * direction;
+	info->vm_regs.rdi += (read_size * direction);
 
-	if (io_info->rep)
+	if (io_info->rep) {
 	    info->vm_regs.rcx--;
-    
+	}
+
 	rep_num--;
     }
 
@@ -221,7 +245,7 @@ int v3_handle_svm_io_out(struct guest_info * info) {
     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;
     }
@@ -239,7 +263,7 @@ 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;
     }
 
@@ -280,7 +304,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;
     }
@@ -322,13 +346,13 @@ int v3_handle_svm_io_outs(struct guest_info * info) {
   
 
 
-    if (guest_va_to_host_va(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;
     }
 
-    while (is_prefix_byte(*((char*)inst_ptr))) {
-	switch (*((char*)inst_ptr)) { 
+    while (is_prefix_byte(*((char *)inst_ptr))) {
+	switch (*((char *)inst_ptr)) {
 	    case PREFIX_CS_OVERRIDE:
 		theseg = &(info->segments.cs);
 		break;
@@ -366,7 +390,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;
 	}